diff --git a/app/components/startContainer/startcontainer.html b/app/components/startContainer/startcontainer.html
index 681aa34e1..39285dcff 100644
--- a/app/components/startContainer/startcontainer.html
+++ b/app/components/startContainer/startcontainer.html
@@ -106,7 +106,7 @@
                             <div class="form-group">
                                 <label>Env:</label>
                                 <div ng-repeat="envar in config.Env">
-                                    <div class="form-inline">
+                                    <div class="form-group form-inline">
                                         <div class="form-group">
                                             <label class="sr-only">Variable Name:</label>
                                             <input type="text" ng-model="envar.name" class="form-control" placeholder="NAME"/>
@@ -205,7 +205,7 @@
                                     <div class="form-group">
                                         <label>VolumesFrom:</label>
                                         <div ng-repeat="volume in config.HostConfig.VolumesFrom">
-                                            <div class="form-inline">
+                                            <div class="form-group form-inline">
                                                 <select ng-model="volume.name" ng-options="name for name in containerNames track by name" class="form-control"/>
                                                 <button class="btn btn-danger btn-xs form-control" ng-click="rmEntry(config.HostConfig.VolumesFrom, volume)">Remove</button>
                                             </div>
@@ -229,7 +229,7 @@
                             <div class="form-group">
                                 <label>ExtraHosts:</label>
                                 <div ng-repeat="entry in config.HostConfig.ExtraHosts">
-                                    <div class="form-inline">
+                                    <div class="form-group form-inline">
                                         <div class="form-group">
                                             <label class="sr-only">Hostname:</label>
                                             <input type="text" ng-model="entry.host" class="form-control" placeholder="hostname"/>
@@ -248,7 +248,7 @@
                             <div class="form-group">
                                 <label>LxcConf:</label>
                                 <div ng-repeat="entry in config.HostConfig.LxcConf">
-                                    <div class="form-inline">
+                                    <div class="form-group form-inline">
                                         <div class="form-group">
                                             <label class="sr-only">Name:</label>
                                             <input type="text" ng-model="entry.name" class="form-control" placeholder="lxc.utsname"/>
@@ -267,7 +267,7 @@
                             <div class="form-group">
                                 <label>Devices:</label>
                                 <div ng-repeat="device in config.HostConfig.Devices">
-                                    <div class="form-group form-inline">
+                                    <div class="form-group form-inline inline-four">
                                         <label class="sr-only">PathOnHost:</label>
                                         <input type="text" ng-model="device.PathOnHost" class="form-control" placeholder="PathOnHost"/>
                                         <label class="sr-only">PathInContainer:</label>
@@ -282,7 +282,7 @@
                             <div class="form-group">
                                 <label>PortBindings:</label>
                                 <div ng-repeat="portBinding in config.HostConfig.PortBindings">
-                                    <div class="form-group form-inline">
+                                    <div class="form-group form-inline inline-four">
                                         <label class="sr-only">Host IP:</label>
                                         <input type="text" ng-model="portBinding.ip" class="form-control" placeholder="Host IP Address"/>
                                         <label class="sr-only">Host Port:</label>
diff --git a/assets/css/app.css b/assets/css/app.css
index 6087c9c28..b7b7bd8f0 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -109,3 +109,7 @@ body {
     border-style: solid;
     border-width: 0 0 0 1em;
 }
+
+.inline-four .form-control {
+    max-width: 25%;
+}
diff --git a/dist/assets/css/app.css b/dist/assets/css/app.css
index 6087c9c28..b7b7bd8f0 100644
--- a/dist/assets/css/app.css
+++ b/dist/assets/css/app.css
@@ -109,3 +109,7 @@ body {
     border-style: solid;
     border-width: 0 0 0 1em;
 }
+
+.inline-four .form-control {
+    max-width: 25%;
+}
diff --git a/dist/dockerui.css b/dist/dockerui.css
index 14513e91c..a12442daa 100644
--- a/dist/dockerui.css
+++ b/dist/dockerui.css
@@ -109,4 +109,8 @@ body {
   margin: 0.5em;
   border-style: solid;
   border-width: 0 0 0 1em;
+}
+
+.inline-four .form-control {
+  max-width: 25%;
 }
\ No newline at end of file
diff --git a/dist/dockerui.js b/dist/dockerui.js
index 5b7e62e8e..5ffdda001 100644
--- a/dist/dockerui.js
+++ b/dist/dockerui.js
@@ -1,4 +1,4 @@
-/*! dockerui - v0.6.0 - 2015-01-28
+/*! dockerui - v0.6.0 - 2015-01-31
  * https://github.com/crosbymichael/dockerui
  * Copyright (c) 2015 Michael Crosby;
  * Licensed MIT
@@ -1632,7 +1632,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>Env:</label>\n" +
     "                                <div ng-repeat=\"envar in config.Env\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Variable Name:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"envar.name\" class=\"form-control\" placeholder=\"NAME\"/>\n" +
@@ -1731,7 +1731,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>VolumesFrom:</label>\n" +
     "                                        <div ng-repeat=\"volume in config.HostConfig.VolumesFrom\">\n" +
-    "                                            <div class=\"form-inline\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <select ng-model=\"volume.name\" ng-options=\"name for name in containerNames track by name\" class=\"form-control\"/>\n" +
     "                                                <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.VolumesFrom, volume)\">Remove</button>\n" +
     "                                            </div>\n" +
@@ -1755,7 +1755,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>ExtraHosts:</label>\n" +
     "                                <div ng-repeat=\"entry in config.HostConfig.ExtraHosts\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Hostname:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"entry.host\" class=\"form-control\" placeholder=\"hostname\"/>\n" +
@@ -1774,7 +1774,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>LxcConf:</label>\n" +
     "                                <div ng-repeat=\"entry in config.HostConfig.LxcConf\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Name:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"lxc.utsname\"/>\n" +
@@ -1793,7 +1793,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>Devices:</label>\n" +
     "                                <div ng-repeat=\"device in config.HostConfig.Devices\">\n" +
-    "                                    <div class=\"form-group form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline inline-four\">\n" +
     "                                        <label class=\"sr-only\">PathOnHost:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"device.PathOnHost\" class=\"form-control\" placeholder=\"PathOnHost\"/>\n" +
     "                                        <label class=\"sr-only\">PathInContainer:</label>\n" +
@@ -1808,7 +1808,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>PortBindings:</label>\n" +
     "                                <div ng-repeat=\"portBinding in config.HostConfig.PortBindings\">\n" +
-    "                                    <div class=\"form-group form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline inline-four\">\n" +
     "                                        <label class=\"sr-only\">Host IP:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"portBinding.ip\" class=\"form-control\" placeholder=\"Host IP Address\"/>\n" +
     "                                        <label class=\"sr-only\">Host Port:</label>\n" +
diff --git a/dist/templates/app.js b/dist/templates/app.js
index b87ec2b2b..b2b306b06 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -653,7 +653,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>Env:</label>\n" +
     "                                <div ng-repeat=\"envar in config.Env\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Variable Name:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"envar.name\" class=\"form-control\" placeholder=\"NAME\"/>\n" +
@@ -752,7 +752,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>VolumesFrom:</label>\n" +
     "                                        <div ng-repeat=\"volume in config.HostConfig.VolumesFrom\">\n" +
-    "                                            <div class=\"form-inline\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <select ng-model=\"volume.name\" ng-options=\"name for name in containerNames track by name\" class=\"form-control\"/>\n" +
     "                                                <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.VolumesFrom, volume)\">Remove</button>\n" +
     "                                            </div>\n" +
@@ -776,7 +776,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>ExtraHosts:</label>\n" +
     "                                <div ng-repeat=\"entry in config.HostConfig.ExtraHosts\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Hostname:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"entry.host\" class=\"form-control\" placeholder=\"hostname\"/>\n" +
@@ -795,7 +795,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>LxcConf:</label>\n" +
     "                                <div ng-repeat=\"entry in config.HostConfig.LxcConf\">\n" +
-    "                                    <div class=\"form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
     "                                            <label class=\"sr-only\">Name:</label>\n" +
     "                                            <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"lxc.utsname\"/>\n" +
@@ -814,7 +814,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>Devices:</label>\n" +
     "                                <div ng-repeat=\"device in config.HostConfig.Devices\">\n" +
-    "                                    <div class=\"form-group form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline inline-four\">\n" +
     "                                        <label class=\"sr-only\">PathOnHost:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"device.PathOnHost\" class=\"form-control\" placeholder=\"PathOnHost\"/>\n" +
     "                                        <label class=\"sr-only\">PathInContainer:</label>\n" +
@@ -829,7 +829,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            <div class=\"form-group\">\n" +
     "                                <label>PortBindings:</label>\n" +
     "                                <div ng-repeat=\"portBinding in config.HostConfig.PortBindings\">\n" +
-    "                                    <div class=\"form-group form-inline\">\n" +
+    "                                    <div class=\"form-group form-inline inline-four\">\n" +
     "                                        <label class=\"sr-only\">Host IP:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"portBinding.ip\" class=\"form-control\" placeholder=\"Host IP Address\"/>\n" +
     "                                        <label class=\"sr-only\">Host Port:</label>\n" +