diff --git a/unleash-server/public/index.html b/unleash-server/public/index.html
index 9a3bef37ea..02bf202fa8 100644
--- a/unleash-server/public/index.html
+++ b/unleash-server/public/index.html
@@ -19,7 +19,7 @@
             <a class="navbar-brand" href="#">Unleash</a>
         </div>
     </nav>
-    <div class="container">
+    <div class="container-fluid">
         <div id="content">Loading...</div>
     </div>
     <script type="text/jsx" src="js/unleash.jsx"></script>
diff --git a/unleash-server/public/js/unleash.jsx b/unleash-server/public/js/unleash.jsx
index 0dc30a7826..0f85e4e970 100644
--- a/unleash-server/public/js/unleash.jsx
+++ b/unleash-server/public/js/unleash.jsx
@@ -30,10 +30,19 @@ var SavedFeature = React.createClass({
 
     render: function() {
         return (
-            <div>
-                <span title='{this.props.feature.description}'>{this.props.feature.name}</span>
-                <span>{this.props.feature.strategy}</span>
-                <input type='checkbox' checked={this.props.feature.enabled} onChange={this.onChange} />
+            <div className='row'>
+                <span>
+                <input
+                    className='pull-left'
+                    type='checkbox'
+                    checked={this.props.feature.enabled}
+                    onChange={this.onChange} />
+                    </span>
+                <span
+                    className='col-xs-4 col-sm-4 col-md-4 col-lg-4'
+                    title='{this.props.feature.description}'>{this.props.feature.name}
+                </span>
+                <span className='col-xs-4 col-sm-4 col-md-4 col-lg-4'>{this.props.feature.strategy}</span>
             </div>
         );
     }
@@ -64,7 +73,7 @@ var FeatureList = React.createClass({
                             <button type="button" className="btn btn-success btn-sm">
                                 <span className="glyphicon glyphicon-plus"></span> New
                             </button>
-                        </div>    
+                        </div>
                     </div>
 
                     <div className='panel-body'>