diff --git a/stylesheets/flame.css.scss b/stylesheets/flame.css.scss
index 3da9e73..0d8e93c 100644
--- a/stylesheets/flame.css.scss
+++ b/stylesheets/flame.css.scss
@@ -212,6 +212,9 @@ body {
         padding-left: 7px;
         text-align: left;
         font-size: $default-font-size;
+        white-space: nowrap;
+        margin-right: 23px;
+        overflow: hidden;
     }
 
     div {
diff --git a/views/form_view.js b/views/form_view.js
index 4d19c13..9918036 100644
--- a/views/form_view.js
+++ b/views/form_view.js
@@ -233,8 +233,10 @@ Flame.FormView = Flame.View.extend({
     _buildControl: function(descriptor) {
         var property = descriptor.get('property');
         var object = this.get('object');
+        var layout = { topPadding: 1, bottomPadding: 1, width: this.get('controlWidth') };
+        if (descriptor.controlLayout) layout = jQuery.extend(layout, descriptor.controlLayout);
         var settings = {
-            layout: { topPadding: 1, bottomPadding: 1, width: this.get('controlWidth') },
+            layout: layout,
             value: Ember.computed.alias('parentView.parentView.object.%@'.fmt(property)),
             isValid: Ember.computed.notEqual('parentView.parentView.object.%@IsValid'.fmt(property), false),
             isDisabled: descriptor.isDisabled ? descriptor.isDisabled : Ember.computed.equal('parentView.parentView.object.%@IsDisabled'.fmt(property), true)