diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 969a890..39b256e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ X-editable changelog
 
 Version 1.1.2 wip
 ----------------------------   
+[bug #34] inputclass span* broken with fluid layout. Changed to input-*. (vitalets) 
 [enh] utils now added to $.fn.editableutils instead of $.fn.editableform.utils (vitalets)
 [enh] input types now added to $.fn.editabletypes instead of $.fn.editableform.types (vitalets)
 [enh] playground and tests now use requirejs (vitalets)  
@@ -65,4 +66,4 @@ Here list of differences to help you to upgrade your application:
 [change] date and dateui specific options can be set only via 'datepicker' option in first level of config (previously it was possible to set some options directly in config, e.g. weekStart).
 [change] if 'url' option defined as function - it is used as submit method instead of ajax (previously it was dynamically return url string and ajax occured anyway)
 
-Also all known bugs of bootstrap-editable were closed.
\ No newline at end of file
+Also all known bugs of bootstrap-editable were closed.
diff --git a/README.md b/README.md
index 30b4d1d..51b0d3f 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ A few steps how to start contributing:
 **x-editable**  
  | -- **lib** (repo related to <code>dev</code> and <code>master</code> branches)  
  | -- **gh-pages** (repo related to <code>gh-pages</code> branch for docs & demo)  
- | -- **playground** (simple node-server and html page for testing, [playground.zip](https://github.com/downloads/vitalets/x-editable/playground.zip))      
+ | -- **playground** (simple node-server and html page for testing, [playground.zip](https://github.com/downloads/vitalets/x-editable/playground.zip), **updated in 1.1.2!**)      
 
 To make it easy follow this script ( _assuming you have [nodejs](http://nodejs.org) installed_ ).
 Please replace <code>&lt;your-github-name&gt;</code> with your name:
diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css
index aad21fd..c7bc226 100644
--- a/src/editable-form/editable-form.css
+++ b/src/editable-form/editable-form.css
@@ -82,6 +82,10 @@
     margin: 0;
 }
 
+.editable-checklist label {
+    white-space: nowrap; 
+}
+
 .editable-clear {
    clear: both;
    font-size: 0.9em;
diff --git a/src/inputs-ext/address/address.js b/src/inputs-ext/address/address.js
index 615619b..31b862e 100644
--- a/src/inputs-ext/address/address.js
+++ b/src/inputs-ext/address/address.js
@@ -95,9 +95,9 @@ $(function(){
     });
 
     Address.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
-        tpl: '<div><label><span>City: </span><input type="text" name="city" class="span2"></label></div>'+
-             '<div><label><span>Street: </span><input type="text" name="street" class="span2"></label></div>'+
-             '<div><label><span>Building: </span><input type="text" name="building" class="span1"></label></div>',
+        tpl: '<div><label><span>City: </span><input type="text" name="city" class="input-small"></label></div>'+
+             '<div><label><span>Street: </span><input type="text" name="street" class="input-small"></label></div>'+
+             '<div><label><span>Building: </span><input type="text" name="building" class="input-mini"></label></div>',
              
         inputclass: 'editable-address'
     });
diff --git a/src/inputs/abstract.js b/src/inputs/abstract.js
index ff041d3..326a543 100644
--- a/src/inputs/abstract.js
+++ b/src/inputs/abstract.js
@@ -151,12 +151,12 @@ To create your own input you should inherit from this class.
         tpl: '',
         /**
         CSS class automatically applied to input
-
+        
         @property inputclass 
         @type string
-        @default span2
+        @default input-medium
         **/         
-        inputclass: 'span2',
+        inputclass: 'input-medium',
         /**
         Name attribute of input
 
diff --git a/src/inputs/checklist.js b/src/inputs/checklist.js
index 603a666..d36d603 100644
--- a/src/inputs/checklist.js
+++ b/src/inputs/checklist.js
@@ -133,9 +133,9 @@ $(function(){
         /**
         @property inputclass 
         @type string
-        @default span2 editable-checklist
+        @default editable-checklist
         **/         
-        inputclass: 'span2 editable-checklist',        
+        inputclass: 'editable-checklist',        
         
         /**
         Separator of values in string when sending to server
diff --git a/src/inputs/textarea.js b/src/inputs/textarea.js
index 2cbfa17..0a8918e 100644
--- a/src/inputs/textarea.js
+++ b/src/inputs/textarea.js
@@ -74,9 +74,9 @@ $(function(){
         tpl:'<textarea></textarea>',
         /**
         @property inputclass 
-        @default span3
+        @default input-large
         **/          
-        inputclass:'span3',
+        inputclass: 'input-large',
         /**
         Placeholder attribute of input. Shown when input is empty.