diff --git a/app/components/startContainer/startContainerController.js b/app/components/startContainer/startContainerController.js
index c4da4e99b..b7f699d84 100644
--- a/app/components/startContainer/startContainerController.js
+++ b/app/components/startContainer/startContainerController.js
@@ -21,7 +21,9 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
             DnsSearch: [],
             VolumesFrom: [],
             CapAdd: [],
-            CapDrop: []
+            CapDrop: [],
+            Devices: [],
+            LxcConf: []
         }
     };
 
@@ -70,6 +72,10 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
         config.HostConfig.DnsSearch = getNames(config.HostConfig.DnsSearch);
         config.HostConfig.CapAdd = getNames(config.HostConfig.CapAdd);
         config.HostConfig.CapDrop = getNames(config.HostConfig.CapDrop);
+        config.HostConfig.LxcConf = config.HostConfig.LxcConf.reduce(function(prev, cur, idx){
+            prev[cur.name] = cur.value;
+            return prev;
+        }, {});
 
         var ExposedPorts = {};
         var PortBindings = {};
diff --git a/app/components/startContainer/startContainerController.spec.js b/app/components/startContainer/startContainerController.spec.js
index 8b51e029a..b8c6f398e 100644
--- a/app/components/startContainer/startContainerController.spec.js
+++ b/app/components/startContainer/startContainerController.spec.js
@@ -153,7 +153,10 @@ describe('startContainerController', function() {
                     Dns: ['8.8.8.8'],
                     DnsSearch: ['example.com'],
                     CapAdd: ['cap_sys_admin'],
-                    CapDrop: ['cap_foo_bar']
+                    CapDrop: ['cap_foo_bar'],
+                    Devices: [{ 'PathOnHost': '/dev/deviceName', 'PathInContainer': '/dev/deviceName', 'CgroupPermissions': 'mrw'}],
+                    LxcConf: {'lxc.utsname':'docker'},
+                    RestartPolicy: {name: 'always', MaximumRetryCount: 5}
                 },
                 name: 'container-name'
             };
@@ -185,6 +188,9 @@ describe('startContainerController', function() {
             scope.config.HostConfig.CapDrop = [{name: 'cap_foo_bar'}];
             scope.config.HostConfig.PublishAllPorts = true;
             scope.config.HostConfig.Privileged = true;
+            scope.config.HostConfig.RestartPolicy = {name: 'always', MaximumRetryCount: 5};
+            scope.config.HostConfig.Devices = [{ 'PathOnHost': '/dev/deviceName', 'PathInContainer': '/dev/deviceName', 'CgroupPermissions': 'mrw'}];
+            scope.config.HostConfig.LxcConf = [{name: 'lxc.utsname', value: 'docker'}];
 
             scope.create();
             $httpBackend.flush();
diff --git a/app/components/startContainer/startcontainer.html b/app/components/startContainer/startcontainer.html
index 309fe03d0..4e5290e6f 100644
--- a/app/components/startContainer/startcontainer.html
+++ b/app/components/startContainer/startcontainer.html
@@ -54,11 +54,11 @@
                                 </div>
                                 <div class="col-xs-6">
                                     <div class="form-group">
-                                        <label>Memory Swap:</label>
+                                        <label>MemorySwap:</label>
                                         <input type="number" ng-model="config.MemorySwap" class="form-control"/>
                                     </div>
                                     <div class="form-group">
-                                        <label>CPU Shares:</label>
+                                        <label>CpuShares:</label>
                                         <input type="number" ng-model="config.CpuShares" class="form-control"/>
                                     </div>
                                     <div class="form-group">
@@ -91,7 +91,7 @@
                                         <input id="stdinOnce" type="checkbox" ng-model="config.StdinOnce"/>
                                     </div>
                                     <div class="form-group">
-                                        <label>Security Options:</label>
+                                        <label>SecurityOpts:</label>
                                         <div ng-repeat="opt in config.SecurityOpts">
                                             <div class="form-group form-inline">
                                                 <input type="text" ng-model="opt.name" class="form-control" placeholder="label:type:svirt_apache"/>
@@ -104,7 +104,7 @@
                             </div>
                             <hr>
                             <div class="form-group">
-                                <label>Environment Variables:</label>
+                                <label>Env:</label>
                                 <div ng-repeat="envar in config.Env">
                                     <div class="form-inline">
                                         <div class="form-group">
@@ -120,7 +120,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.Env, {name: '', value: ''})">Add ENV variable</button>
+                                <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.Env, {name: '', value: ''})">Add environment variable</button>
                             </div>
                         </fieldset>
                     </accordion-group>
@@ -149,14 +149,14 @@
                                         <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.Links, {name: ''})">Add Link</button>
                                     </div>
                                     <div class="form-group">
-                                        <label>DNS:</label>
+                                        <label>Dns:</label>
                                         <div ng-repeat="entry in config.HostConfig.Dns">
                                             <div class="form-group form-inline">
                                                 <input type="text" ng-model="entry.name" class="form-control" placeholder="8.8.8.8"/>
                                                 <button type="button" class="btn btn-danger btn-sm" ng-click="rmEntry(config.HostConfig.Dns, entry)">Remove</button>
                                             </div>
                                         </div>
-                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.Dns, {name: ''})">Add</button>
+                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.Dns, {name: ''})">Add entry</button>
                                     </div>
                                     <div class="form-group">
                                         <label>DnsSearch:</label>
@@ -166,7 +166,7 @@
                                                 <button type="button" class="btn btn-danger btn-sm" ng-click="rmEntry(config.HostConfig.DnsSearch, entry)">Remove</button>
                                             </div>
                                         </div>
-                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.DnsSearch, {name: ''})">Add</button>
+                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.DnsSearch, {name: ''})">Add entry</button>
                                     </div>
                                     <div class="form-group">
                                         <label>CapAdd:</label>
@@ -176,10 +176,8 @@
                                                 <button type="button" class="btn btn-danger btn-sm" ng-click="rmEntry(config.HostConfig.CapAdd, entry)">Remove</button>
                                             </div>
                                         </div>
-                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.CapAdd, {name: ''})">Add</button>
+                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.CapAdd, {name: ''})">Add entry</button>
                                     </div>
-                                </div>
-                                <div class="col-xs-6">
                                     <div class="form-group">
                                         <label>CapDrop:</label>
                                         <div ng-repeat="entry in config.HostConfig.CapDrop">
@@ -188,8 +186,10 @@
                                                 <button type="button" class="btn btn-danger btn-sm" ng-click="rmEntry(config.HostConfig.CapDrop, entry)">Remove</button>
                                             </div>
                                         </div>
-                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.CapDrop, {name: ''})">Add</button>
+                                        <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.CapDrop, {name: ''})">Add entry</button>
                                     </div>
+                                </div>
+                                <div class="col-xs-6">
                                     <div class="form-group">
                                         <label>NetworkMode:</label>
                                         <input type="text" ng-model="config.HostConfig.NetworkMode" class="form-control" placeholder="bridge"/>
@@ -203,7 +203,7 @@
                                         <input id="privileged" type="checkbox" ng-model="config.HostConfig.Privileged"/>
                                     </div>
                                     <div class="form-group">
-                                        <label>Mount Volumes From other containers:</label>
+                                        <label>VolumesFrom:</label>
                                         <div ng-repeat="volume in config.HostConfig.VolumesFrom">
                                             <div class="form-inline">
                                                 <select ng-model="volume.name" ng-options="name for name in containerNames track by name" class="form-control"/>
@@ -212,22 +212,56 @@
                                         </div>
                                         <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.VolumesFrom, {name: ''})">Add volume</button>
                                     </div>
-                                    <!--
+                                    
                                     <div class="form-group">
-                                        RestartPolicy unimplemented...
+                                        <label>RestartPolicy:</label>
+                                        <select ng-model="config.HostConfig.RestartPolicy.name">
+                                            <option value="">disabled</option>
+                                            <option value="always">always</option>
+                                            <option value="on-failure">on-failure</option>
+                                        </select>
+                                        <label>MaximumRetryCount:</label>
+                                        <input type="number" ng-model="config.HostConfig.RestartPolicy.MaximumRetryCount"/>
                                     </div>
-                                    <div class="form-group">
-                                        Devices unimplemented...
-                                    </div>
-                                    <div class="form-group">
-                                        LxcConf unimplemented...
-                                    </div>
-                                    -->
                                 </div>
                             </div>
                             <hr>
                             <div class="form-group">
-                                <label>Port bindings:</label>
+                                <label>LxcConf:</label>
+                                <div ng-repeat="entry in config.HostConfig.LxcConf">
+                                    <div class="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"/>
+                                        </div>
+                                        <div class="form-group">
+                                            <label class="sr-only">Value:</label>
+                                            <input type="text" ng-model="entry.value" class="form-control" placeholder="docker"/>
+                                        </div>
+                                        <div class="form-group">
+                                            <button class="btn btn-danger btn-xs form-control" ng-click="rmEntry(config.HostConfig.LxcConf, entry)">Remove</button>
+                                        </div>
+                                    </div>
+                                </div>
+                                <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.LxcConf, {name: '', value: ''})">Add Entry</button>
+                            </div>
+                            <div class="form-group">
+                                <label>Devices:</label>
+                                <div ng-repeat="device in config.HostConfig.Devices">
+                                    <div class="form-group form-inline">
+                                        <label class="sr-only">PathOnHost:</label>
+                                        <input type="text" ng-model="device.PathOnHost" class="form-control" placeholder="PathOnHost"/>
+                                        <label class="sr-only">PathInContainer:</label>
+                                        <input type="text" ng-model="device.PathInContainer" class="form-control" placeholder="PathInContainer"/>
+                                        <label class="sr-only">CgroupPermissions:</label>
+                                        <input type="text" ng-model="device.CgroupPermissions" class="form-control" placeholder="CgroupPermissions"/>
+                                        <button class="btn btn-danger btn-xs form-control" ng-click="rmEntry(config.HostConfig.Devices, device)">Remove</button>
+                                    </div>
+                                </div>
+                                <button type="button" class="btn btn-success btn-sm" ng-click="addEntry(config.HostConfig.Devices, { PathOnHost: '', PathInContainer: '', CgroupPermissions: ''})">Add Device</button>
+                            </div>
+                            <div class="form-group">
+                                <label>PortBindings:</label>
                                 <div ng-repeat="portBinding in config.HostConfig.PortBindings">
                                     <div class="form-group form-inline">
                                         <label class="sr-only">Host IP:</label>
diff --git a/dist/dockerui.js b/dist/dockerui.js
index 847ebbf09..381fc5c10 100644
--- a/dist/dockerui.js
+++ b/dist/dockerui.js
@@ -1,4 +1,4 @@
-/*! dockerui - v0.6.0 - 2015-01-25
+/*! dockerui - v0.6.0 - 2015-01-28
  * https://github.com/crosbymichael/dockerui
  * Copyright (c) 2015 Michael Crosby;
  * Licensed MIT
@@ -524,7 +524,9 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
             DnsSearch: [],
             VolumesFrom: [],
             CapAdd: [],
-            CapDrop: []
+            CapDrop: [],
+            Devices: [],
+            LxcConf: []
         }
     };
 
@@ -573,6 +575,10 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
         config.HostConfig.DnsSearch = getNames(config.HostConfig.DnsSearch);
         config.HostConfig.CapAdd = getNames(config.HostConfig.CapAdd);
         config.HostConfig.CapDrop = getNames(config.HostConfig.CapDrop);
+        config.HostConfig.LxcConf = config.HostConfig.LxcConf.reduce(function(prev, cur, idx){
+            prev[cur.name] = cur.value;
+            return prev;
+        }, {});
 
         var ExposedPorts = {};
         var PortBindings = {};
@@ -1572,11 +1578,11 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                </div>\n" +
     "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Memory Swap:</label>\n" +
+    "                                        <label>MemorySwap:</label>\n" +
     "                                        <input type=\"number\" ng-model=\"config.MemorySwap\" class=\"form-control\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>CPU Shares:</label>\n" +
+    "                                        <label>CpuShares:</label>\n" +
     "                                        <input type=\"number\" ng-model=\"config.CpuShares\" class=\"form-control\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
@@ -1609,7 +1615,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <input id=\"stdinOnce\" type=\"checkbox\" ng-model=\"config.StdinOnce\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Security Options:</label>\n" +
+    "                                        <label>SecurityOpts:</label>\n" +
     "                                        <div ng-repeat=\"opt in config.SecurityOpts\">\n" +
     "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <input type=\"text\" ng-model=\"opt.name\" class=\"form-control\" placeholder=\"label:type:svirt_apache\"/>\n" +
@@ -1622,7 +1628,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            </div>\n" +
     "                            <hr>\n" +
     "                            <div class=\"form-group\">\n" +
-    "                                <label>Environment Variables:</label>\n" +
+    "                                <label>Env:</label>\n" +
     "                                <div ng-repeat=\"envar in config.Env\">\n" +
     "                                    <div class=\"form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
@@ -1638,7 +1644,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        </div>\n" +
     "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Env, {name: '', value: ''})\">Add ENV variable</button>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Env, {name: '', value: ''})\">Add environment variable</button>\n" +
     "                            </div>\n" +
     "                        </fieldset>\n" +
     "                    </accordion-group>\n" +
@@ -1667,14 +1673,14 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Links, {name: ''})\">Add Link</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>DNS:</label>\n" +
+    "                                        <label>Dns:</label>\n" +
     "                                        <div ng-repeat=\"entry in config.HostConfig.Dns\">\n" +
     "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"8.8.8.8\"/>\n" +
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Dns, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Dns, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Dns, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>DnsSearch:</label>\n" +
@@ -1684,7 +1690,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.DnsSearch, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.DnsSearch, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.DnsSearch, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>CapAdd:</label>\n" +
@@ -1694,10 +1700,8 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.CapAdd, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapAdd, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapAdd, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>CapDrop:</label>\n" +
     "                                        <div ng-repeat=\"entry in config.HostConfig.CapDrop\">\n" +
@@ -1706,8 +1710,10 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.CapDrop, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapDrop, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapDrop, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>NetworkMode:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"config.HostConfig.NetworkMode\" class=\"form-control\" placeholder=\"bridge\"/>\n" +
@@ -1721,7 +1727,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <input id=\"privileged\" type=\"checkbox\" ng-model=\"config.HostConfig.Privileged\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Mount Volumes From other containers:</label>\n" +
+    "                                        <label>VolumesFrom:</label>\n" +
     "                                        <div ng-repeat=\"volume in config.HostConfig.VolumesFrom\">\n" +
     "                                            <div class=\"form-inline\">\n" +
     "                                                <select ng-model=\"volume.name\" ng-options=\"name for name in containerNames track by name\" class=\"form-control\"/>\n" +
@@ -1730,22 +1736,56 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        </div>\n" +
     "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.VolumesFrom, {name: ''})\">Add volume</button>\n" +
     "                                    </div>\n" +
-    "                                    <!--\n" +
+    "                                    \n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        RestartPolicy unimplemented...\n" +
+    "                                        <label>RestartPolicy:</label>\n" +
+    "                                        <select ng-model=\"config.HostConfig.RestartPolicy.name\">\n" +
+    "                                            <option value=\"\">disabled</option>\n" +
+    "                                            <option value=\"always\">always</option>\n" +
+    "                                            <option value=\"on-failure\">on-failure</option>\n" +
+    "                                        </select>\n" +
+    "                                        <label>MaximumRetryCount:</label>\n" +
+    "                                        <input type=\"number\" ng-model=\"config.HostConfig.RestartPolicy.MaximumRetryCount\"/>\n" +
     "                                    </div>\n" +
-    "                                    <div class=\"form-group\">\n" +
-    "                                        Devices unimplemented...\n" +
-    "                                    </div>\n" +
-    "                                    <div class=\"form-group\">\n" +
-    "                                        LxcConf unimplemented...\n" +
-    "                                    </div>\n" +
-    "                                    -->\n" +
     "                                </div>\n" +
     "                            </div>\n" +
     "                            <hr>\n" +
     "                            <div class=\"form-group\">\n" +
-    "                                <label>Port bindings:</label>\n" +
+    "                                <label>LxcConf:</label>\n" +
+    "                                <div ng-repeat=\"entry in config.HostConfig.LxcConf\">\n" +
+    "                                    <div class=\"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" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <label class=\"sr-only\">Value:</label>\n" +
+    "                                            <input type=\"text\" ng-model=\"entry.value\" class=\"form-control\" placeholder=\"docker\"/>\n" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.LxcConf, entry)\">Remove</button>\n" +
+    "                                        </div>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.LxcConf, {name: '', value: ''})\">Add Entry</button>\n" +
+    "                            </div>\n" +
+    "                            <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" +
+    "                                        <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" +
+    "                                        <input type=\"text\" ng-model=\"device.PathInContainer\" class=\"form-control\" placeholder=\"PathInContainer\"/>\n" +
+    "                                        <label class=\"sr-only\">CgroupPermissions:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"device.CgroupPermissions\" class=\"form-control\" placeholder=\"CgroupPermissions\"/>\n" +
+    "                                        <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.Devices, device)\">Remove</button>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Devices, { PathOnHost: '', PathInContainer: '', CgroupPermissions: ''})\">Add Device</button>\n" +
+    "                            </div>\n" +
+    "                            <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" +
     "                                        <label class=\"sr-only\">Host IP:</label>\n" +
diff --git a/dist/templates/app.js b/dist/templates/app.js
index 008a307e9..0015a9879 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -601,11 +601,11 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                </div>\n" +
     "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Memory Swap:</label>\n" +
+    "                                        <label>MemorySwap:</label>\n" +
     "                                        <input type=\"number\" ng-model=\"config.MemorySwap\" class=\"form-control\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>CPU Shares:</label>\n" +
+    "                                        <label>CpuShares:</label>\n" +
     "                                        <input type=\"number\" ng-model=\"config.CpuShares\" class=\"form-control\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
@@ -638,7 +638,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <input id=\"stdinOnce\" type=\"checkbox\" ng-model=\"config.StdinOnce\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Security Options:</label>\n" +
+    "                                        <label>SecurityOpts:</label>\n" +
     "                                        <div ng-repeat=\"opt in config.SecurityOpts\">\n" +
     "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <input type=\"text\" ng-model=\"opt.name\" class=\"form-control\" placeholder=\"label:type:svirt_apache\"/>\n" +
@@ -651,7 +651,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                            </div>\n" +
     "                            <hr>\n" +
     "                            <div class=\"form-group\">\n" +
-    "                                <label>Environment Variables:</label>\n" +
+    "                                <label>Env:</label>\n" +
     "                                <div ng-repeat=\"envar in config.Env\">\n" +
     "                                    <div class=\"form-inline\">\n" +
     "                                        <div class=\"form-group\">\n" +
@@ -667,7 +667,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        </div>\n" +
     "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Env, {name: '', value: ''})\">Add ENV variable</button>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Env, {name: '', value: ''})\">Add environment variable</button>\n" +
     "                            </div>\n" +
     "                        </fieldset>\n" +
     "                    </accordion-group>\n" +
@@ -696,14 +696,14 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Links, {name: ''})\">Add Link</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>DNS:</label>\n" +
+    "                                        <label>Dns:</label>\n" +
     "                                        <div ng-repeat=\"entry in config.HostConfig.Dns\">\n" +
     "                                            <div class=\"form-group form-inline\">\n" +
     "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"8.8.8.8\"/>\n" +
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Dns, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Dns, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Dns, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>DnsSearch:</label>\n" +
@@ -713,7 +713,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.DnsSearch, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.DnsSearch, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.DnsSearch, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>CapAdd:</label>\n" +
@@ -723,10 +723,8 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.CapAdd, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapAdd, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapAdd, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>CapDrop:</label>\n" +
     "                                        <div ng-repeat=\"entry in config.HostConfig.CapDrop\">\n" +
@@ -735,8 +733,10 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.CapDrop, entry)\">Remove</button>\n" +
     "                                            </div>\n" +
     "                                        </div>\n" +
-    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapDrop, {name: ''})\">Add</button>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.CapDrop, {name: ''})\">Add entry</button>\n" +
     "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <div class=\"col-xs-6\">\n" +
     "                                    <div class=\"form-group\">\n" +
     "                                        <label>NetworkMode:</label>\n" +
     "                                        <input type=\"text\" ng-model=\"config.HostConfig.NetworkMode\" class=\"form-control\" placeholder=\"bridge\"/>\n" +
@@ -750,7 +750,7 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        <input id=\"privileged\" type=\"checkbox\" ng-model=\"config.HostConfig.Privileged\"/>\n" +
     "                                    </div>\n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        <label>Mount Volumes From other containers:</label>\n" +
+    "                                        <label>VolumesFrom:</label>\n" +
     "                                        <div ng-repeat=\"volume in config.HostConfig.VolumesFrom\">\n" +
     "                                            <div class=\"form-inline\">\n" +
     "                                                <select ng-model=\"volume.name\" ng-options=\"name for name in containerNames track by name\" class=\"form-control\"/>\n" +
@@ -759,22 +759,56 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                                        </div>\n" +
     "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.VolumesFrom, {name: ''})\">Add volume</button>\n" +
     "                                    </div>\n" +
-    "                                    <!--\n" +
+    "                                    \n" +
     "                                    <div class=\"form-group\">\n" +
-    "                                        RestartPolicy unimplemented...\n" +
+    "                                        <label>RestartPolicy:</label>\n" +
+    "                                        <select ng-model=\"config.HostConfig.RestartPolicy.name\">\n" +
+    "                                            <option value=\"\">disabled</option>\n" +
+    "                                            <option value=\"always\">always</option>\n" +
+    "                                            <option value=\"on-failure\">on-failure</option>\n" +
+    "                                        </select>\n" +
+    "                                        <label>MaximumRetryCount:</label>\n" +
+    "                                        <input type=\"number\" ng-model=\"config.HostConfig.RestartPolicy.MaximumRetryCount\"/>\n" +
     "                                    </div>\n" +
-    "                                    <div class=\"form-group\">\n" +
-    "                                        Devices unimplemented...\n" +
-    "                                    </div>\n" +
-    "                                    <div class=\"form-group\">\n" +
-    "                                        LxcConf unimplemented...\n" +
-    "                                    </div>\n" +
-    "                                    -->\n" +
     "                                </div>\n" +
     "                            </div>\n" +
     "                            <hr>\n" +
     "                            <div class=\"form-group\">\n" +
-    "                                <label>Port bindings:</label>\n" +
+    "                                <label>LxcConf:</label>\n" +
+    "                                <div ng-repeat=\"entry in config.HostConfig.LxcConf\">\n" +
+    "                                    <div class=\"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" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <label class=\"sr-only\">Value:</label>\n" +
+    "                                            <input type=\"text\" ng-model=\"entry.value\" class=\"form-control\" placeholder=\"docker\"/>\n" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.LxcConf, entry)\">Remove</button>\n" +
+    "                                        </div>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.LxcConf, {name: '', value: ''})\">Add Entry</button>\n" +
+    "                            </div>\n" +
+    "                            <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" +
+    "                                        <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" +
+    "                                        <input type=\"text\" ng-model=\"device.PathInContainer\" class=\"form-control\" placeholder=\"PathInContainer\"/>\n" +
+    "                                        <label class=\"sr-only\">CgroupPermissions:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"device.CgroupPermissions\" class=\"form-control\" placeholder=\"CgroupPermissions\"/>\n" +
+    "                                        <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.Devices, device)\">Remove</button>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Devices, { PathOnHost: '', PathInContainer: '', CgroupPermissions: ''})\">Add Device</button>\n" +
+    "                            </div>\n" +
+    "                            <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" +
     "                                        <label class=\"sr-only\">Host IP:</label>\n" +