diff --git a/addon/components/fm-checkbox.js b/addon/components/fm-checkbox.js
index 69e2014..83b4a80 100644
--- a/addon/components/fm-checkbox.js
+++ b/addon/components/fm-checkbox.js
@@ -10,5 +10,6 @@ export default Ember.Component.extend({
     if(!Ember.isEmpty(this.get('errors'))) {
       return this.get('fmConfig.errorClass');
     }
-  })
+  }),
+  inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass')
 });
diff --git a/addon/components/fm-field.js b/addon/components/fm-field.js
index 3080d78..eee11f4 100644
--- a/addon/components/fm-field.js
+++ b/addon/components/fm-field.js
@@ -11,6 +11,7 @@ export default Ember.Component.extend({
   labelClass: Ember.computed.reads('fmConfig.labelClass'),
   textareaClass: Ember.computed.reads('fmConfig.textareaClass'),
   wrapperClass: Ember.computed.reads('fmConfig.wrapperClass'),
+  inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass'),
 
   init: function() {
     if(!this.get('optionValuePath')) {
diff --git a/addon/components/fm-radio-group.js b/addon/components/fm-radio-group.js
index 11f7cb0..6c059ff 100644
--- a/addon/components/fm-radio-group.js
+++ b/addon/components/fm-radio-group.js
@@ -11,5 +11,6 @@ export default Ember.Component.extend({
     }
   }),
   radioGroupWrapperClass: Ember.computed.reads('fmConfig.radioGroupWrapperClass'),
-  labelClass: Ember.computed.reads('fmConfig.labelClass')
+  labelClass: Ember.computed.reads('fmConfig.labelClass'),
+  inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass')
 });
diff --git a/addon/components/fm-submit.js b/addon/components/fm-submit.js
index 04aa347..c9fb8f5 100644
--- a/addon/components/fm-submit.js
+++ b/addon/components/fm-submit.js
@@ -8,6 +8,7 @@ export default Ember.Component.extend({
   init: function() {
     this._super(this);
   },
+  inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass')
   submitButtonClass: Ember.computed.reads('fmConfig.submitButtonClass'),
   wrapperClass: Ember.computed.reads('fmConfig.wrapperClass'),
   tagName: 'div'
diff --git a/addon/services/fm-config.js b/addon/services/fm-config.js
index ff042e4..19a5240 100644
--- a/addon/services/fm-config.js
+++ b/addon/services/fm-config.js
@@ -6,6 +6,7 @@ export default Ember.Service.extend({
   wrapperClass: 'form-group',
   labelClass: 'control-label',
   inputClass: 'form-control',
+  inputWrapperClass: '',
   textareaClass: 'form-control',
   selectClass: 'form-control',
   formClass: 'form-vertical',
diff --git a/addon/templates/components/ember-form-master-2000/fm-checkbox.hbs b/addon/templates/components/ember-form-master-2000/fm-checkbox.hbs
index 5c847c6..cb9562d 100644
--- a/addon/templates/components/ember-form-master-2000/fm-checkbox.hbs
+++ b/addon/templates/components/ember-form-master-2000/fm-checkbox.hbs
@@ -1,15 +1,17 @@
-<div class='checkbox'>
+<div class={{inputWrapperClass}}>
+  <div class='checkbox'>
 
-  <label>
-    {{input
-      type='checkbox'
-      checked=checked
-      disabled=disabled
-      name=name
-      tabindex=tabindex}}
-    {{label}}
-  </label>
+    <label>
+      {{input
+        type='checkbox'
+        checked=checked
+        disabled=disabled
+        name=name
+        tabindex=tabindex}}
+      {{label}}
+    </label>
 
-  {{fm-errortext errors=errors}}
+    {{fm-errortext errors=errors}}
 
-</div>
\ No newline at end of file
+  </div>
+</div>
diff --git a/addon/templates/components/ember-form-master-2000/fm-field.hbs b/addon/templates/components/ember-form-master-2000/fm-field.hbs
index b6be122..7b622d6 100644
--- a/addon/templates/components/ember-form-master-2000/fm-field.hbs
+++ b/addon/templates/components/ember-form-master-2000/fm-field.hbs
@@ -2,43 +2,45 @@
   <label for="{{forAttribute}}" class="{{labelClass}}">{{{label}}}</label>
 {{/if}}
 
-{{#if isBasicInput}}
-  {{fm-input
-    type=type
-    value=value
-    classNameBindings='errorClass inputClass'
-    maxlength=maxlength
-    placeholder=placeholder}}
-{{/if}}
+<div class={{inputWrapperClass}}>
+  {{#if isBasicInput}}
+    {{fm-input
+      type=type
+      value=value
+      classNameBindings='errorClass inputClass'
+      maxlength=maxlength
+      placeholder=placeholder}}
+  {{/if}}
 
-{{#if isSelect}}
-  {{fm-select
-    content=content
-    optionValuePath=optionValuePath
-    optionLabelPath=optionLabelPath
-    prompt=prompt
-    value=value
-    action=(action 'selectAction')
-  }}
-{{/if}}
+  {{#if isSelect}}
+    {{fm-select
+      content=content
+      optionValuePath=optionValuePath
+      optionLabelPath=optionLabelPath
+      prompt=prompt
+      value=value
+      action=(action 'selectAction')
+    }}
+  {{/if}}
 
-{{#if isTextarea}}
-  {{fm-textarea
-    value=value
-    classNameBindings='errorClass textareaClass'
-    placeholder=placeholder
-    rows=rows
-    cols=cols
-    maxlength=maxlength
-    spellcheck=spellcheck
-    disabled=disabled
-  }}
-{{/if}}
+  {{#if isTextarea}}
+    {{fm-textarea
+      value=value
+      classNameBindings='errorClass textareaClass'
+      placeholder=placeholder
+      rows=rows
+      cols=cols
+      maxlength=maxlength
+      spellcheck=spellcheck
+      disabled=disabled
+    }}
+  {{/if}}
 
-{{#if errors}}
-  {{fm-errortext errors=errors}}
-{{/if}}
+  {{#if errors}}
+    {{fm-errortext errors=errors}}
+  {{/if}}
 
-{{#if helptext}}
-  {{fm-helptext helptext=helptext}}
-{{/if}}
+  {{#if helptext}}
+    {{fm-helptext helptext=helptext}}
+  {{/if}}
+</div>
diff --git a/addon/templates/components/ember-form-master-2000/fm-radio-group.hbs b/addon/templates/components/ember-form-master-2000/fm-radio-group.hbs
index e49879c..0296934 100644
--- a/addon/templates/components/ember-form-master-2000/fm-radio-group.hbs
+++ b/addon/templates/components/ember-form-master-2000/fm-radio-group.hbs
@@ -2,10 +2,12 @@
   <label class='{{labelClass}}'>{{label}}</label>
 {{/if}}
 
-{{#each content as |option|}}
+<div class={{inputWrapperClass}}>
+  {{#each content as |option|}}
 
-  {{fm-radio content=option}}
+    {{fm-radio content=option}}
 
-{{/each}}
+  {{/each}}
 
-{{fm-errortext errors=errors}}
+  {{fm-errortext errors=errors}}
+</div>
diff --git a/addon/templates/components/ember-form-master-2000/fm-submit.hbs b/addon/templates/components/ember-form-master-2000/fm-submit.hbs
index 61aef54..23b64c1 100644
--- a/addon/templates/components/ember-form-master-2000/fm-submit.hbs
+++ b/addon/templates/components/ember-form-master-2000/fm-submit.hbs
@@ -1,10 +1,12 @@
-<button
-  value={{value}}
-  disabled={{disabled}}
-  class='{{submitButtonClass}}'
-  type="submit">
-  {{#if value}}
-    {{value}}
-  {{/if}}
-  {{yield}}
-</button>
+<div class={{inputWrapperClass}}>
+  <button
+    value={{value}}
+    disabled={{disabled}}
+    class='{{submitButtonClass}}'
+    type="submit">
+    {{#if value}}
+      {{value}}
+    {{/if}}
+    {{yield}}
+  </button>
+</div>
diff --git a/tests/dummy/app/routes/application.js b/tests/dummy/app/routes/application.js
index d1e1a24..d94f0a0 100644
--- a/tests/dummy/app/routes/application.js
+++ b/tests/dummy/app/routes/application.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-
   model: function() {
     return Ember.RSVP.hash({
       exampleModel: Ember.Object.create(),
@@ -77,4 +76,4 @@ export default Ember.Route.extend({
 
   }
 
-});
\ No newline at end of file
+});