diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css
index f7acde3..049eb56 100644
--- a/src/editable-form/editable-form.css
+++ b/src/editable-form/editable-form.css
@@ -66,6 +66,14 @@
     float: left;
 }
 
+
+/* checklist vertical alignment */
+.editable-checklist label input[type="checkbox"], 
+.editable-checklist label span {
+    vertical-align: middle;
+    margin: 0;
+}
+
 .editable-clear {
    clear: both;
    font-size: 0.9em;
diff --git a/src/inputs/checklist.js b/src/inputs/checklist.js
index 4bd634a..ffdc7c9 100644
--- a/src/inputs/checklist.js
+++ b/src/inputs/checklist.js
@@ -36,12 +36,12 @@ $(function(){
             }
 
             for(var i=0; i<this.sourceData.length; i++) {
-                $label = $('<label>').text(' '+this.sourceData[i].text)
-                                     .prepend($('<input>', {
+                $label = $('<label>').append($('<input>', {
                                            type: 'checkbox',
                                            value: this.sourceData[i].value, 
                                            name: this.options.name
-                                     }));
+                                     }))
+                                     .append($('<span>').text(' '+this.sourceData[i].text));
                 
                 $('<div>').append($label).appendTo(this.$input);
             }
@@ -109,6 +109,13 @@ $(function(){
         **/         
         tpl:'<div></div>',
         
+        /**
+        @property inputclass 
+        @type string
+        @default span2 editable-checklist
+        **/         
+        inputclass: 'span2 editable-checklist',        
+        
         /**
         Separator of values in string when sending to server