diff --git a/dist/angular.js b/dist/angular.js
index cedbd4c38..09000f025 100644
--- a/dist/angular.js
+++ b/dist/angular.js
@@ -228,3 +228,12 @@ var B={get:{method:"GET"},save:{method:"POST"},query:{method:"GET",isArray:!0},r
 g[c]:r.defaults[c];a.isDefined(f)&&null!==f?(p=encodeURIComponent(f).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%20/g,"%20").replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+"),e=e.replace(RegExp(":"+c+"(\\W|$)","g"),p+"$1")):e=e.replace(RegExp("(/?):"+c+"(\\W|$)","g"),function(a,c,d){return"/"==d.charAt(0)?d:c+d})});e=e.replace(/\/+$/,"");e=e.replace(/\/\.(?=\w+($|\?))/,".");c.url=e.replace(/\/\\\./,"/.");s(g,function(a,e){r.urlParams[e]||
 (c.params=c.params||{},c.params[e]=a)})}};return t}])})(window,window.angular);
 //# sourceMappingURL=angular-resource.min.js.map
+
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.12.0 - 2014-11-16
+ * License: MIT
+ */
+angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.accordion","ui.bootstrap.collapse","ui.bootstrap.transition"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html"]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(n,o,i){this.groups=[],this.closeOthers=function(t){var e=angular.isDefined(o.closeOthers)?n.$eval(o.closeOthers):i.closeOthers;e&&angular.forEach(this.groups,function(n){n!==t&&(n.isOpen=!1)})},this.addGroup=function(n){var o=this;this.groups.push(n),n.$on("$destroy",function(){o.removeGroup(n)})},this.removeGroup=function(n){var o=this.groups.indexOf(n);-1!==o&&this.groups.splice(o,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(n){this.heading=n}},link:function(n,o,i,t){t.addGroup(n),n.$watch("isOpen",function(o){o&&t.closeOthers(n)}),n.toggleOpen=function(){n.isDisabled||(n.isOpen=!n.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(n,o,i,t,e){t.setHeading(e(n,function(){}))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(n,o,i,t){n.$watch(function(){return t[i.accordionTransclude]},function(n){n&&(o.html(""),o.append(n))})}}}),angular.module("ui.bootstrap.collapse",["ui.bootstrap.transition"]).directive("collapse",["$transition",function(n){return{link:function(o,i,t){function e(o){function t(){l===e&&(l=void 0)}var e=n(i,o);return l&&l.cancel(),l=e,e.then(t,t),e}function a(){u?(u=!1,r()):(i.removeClass("collapse").addClass("collapsing"),e({height:i[0].scrollHeight+"px"}).then(r))}function r(){i.removeClass("collapsing"),i.addClass("collapse in"),i.css({height:"auto"})}function c(){if(u)u=!1,s(),i.css({height:0});else{i.css({height:i[0].scrollHeight+"px"});{i[0].offsetWidth}i.removeClass("collapse in").addClass("collapsing"),e({height:0}).then(s)}}function s(){i.removeClass("collapsing"),i.addClass("collapse")}var l,u=!0;o.$watch(t.collapse,function(n){n?c():a()})}}}]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(n,o,i){function t(n){for(var o in n)if(void 0!==a.style[o])return n[o]}var e=function(t,a,r){r=r||{};var c=n.defer(),s=e[r.animation?"animationEndEventName":"transitionEndEventName"],l=function(){i.$apply(function(){t.unbind(s,l),c.resolve(t)})};return s&&t.bind(s,l),o(function(){angular.isString(a)?t.addClass(a):angular.isFunction(a)?a(t):angular.isObject(a)&&t.css(a),s||c.resolve(t)}),c.promise.cancel=function(){s&&t.unbind(s,l),c.reject("Transition cancelled")},c.promise},a=document.createElement("trans"),r={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},c={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=t(r),e.animationEndEventName=t(c),e}]),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(n){n.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a href class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(n){n.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]);
\ No newline at end of file
diff --git a/dist/assets/js/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.min.js b/dist/assets/js/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.min.js
new file mode 100644
index 000000000..c9e65424f
--- /dev/null
+++ b/dist/assets/js/ui-bootstrap/ui-bootstrap-custom-tpls-0.12.0.min.js
@@ -0,0 +1,8 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.12.0 - 2014-11-16
+ * License: MIT
+ */
+angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.accordion","ui.bootstrap.collapse","ui.bootstrap.transition"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html"]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(n,o,i){this.groups=[],this.closeOthers=function(t){var e=angular.isDefined(o.closeOthers)?n.$eval(o.closeOthers):i.closeOthers;e&&angular.forEach(this.groups,function(n){n!==t&&(n.isOpen=!1)})},this.addGroup=function(n){var o=this;this.groups.push(n),n.$on("$destroy",function(){o.removeGroup(n)})},this.removeGroup=function(n){var o=this.groups.indexOf(n);-1!==o&&this.groups.splice(o,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(n){this.heading=n}},link:function(n,o,i,t){t.addGroup(n),n.$watch("isOpen",function(o){o&&t.closeOthers(n)}),n.toggleOpen=function(){n.isDisabled||(n.isOpen=!n.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(n,o,i,t,e){t.setHeading(e(n,function(){}))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(n,o,i,t){n.$watch(function(){return t[i.accordionTransclude]},function(n){n&&(o.html(""),o.append(n))})}}}),angular.module("ui.bootstrap.collapse",["ui.bootstrap.transition"]).directive("collapse",["$transition",function(n){return{link:function(o,i,t){function e(o){function t(){l===e&&(l=void 0)}var e=n(i,o);return l&&l.cancel(),l=e,e.then(t,t),e}function a(){u?(u=!1,r()):(i.removeClass("collapse").addClass("collapsing"),e({height:i[0].scrollHeight+"px"}).then(r))}function r(){i.removeClass("collapsing"),i.addClass("collapse in"),i.css({height:"auto"})}function c(){if(u)u=!1,s(),i.css({height:0});else{i.css({height:i[0].scrollHeight+"px"});{i[0].offsetWidth}i.removeClass("collapse in").addClass("collapsing"),e({height:0}).then(s)}}function s(){i.removeClass("collapsing"),i.addClass("collapse")}var l,u=!0;o.$watch(t.collapse,function(n){n?c():a()})}}}]),angular.module("ui.bootstrap.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(n,o,i){function t(n){for(var o in n)if(void 0!==a.style[o])return n[o]}var e=function(t,a,r){r=r||{};var c=n.defer(),s=e[r.animation?"animationEndEventName":"transitionEndEventName"],l=function(){i.$apply(function(){t.unbind(s,l),c.resolve(t)})};return s&&t.bind(s,l),o(function(){angular.isString(a)?t.addClass(a):angular.isFunction(a)?a(t):angular.isObject(a)&&t.css(a),s||c.resolve(t)}),c.promise.cancel=function(){s&&t.unbind(s,l),c.reject("Transition cancelled")},c.promise},a=document.createElement("trans"),r={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},c={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=t(r),e.animationEndEventName=t(c),e}]),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(n){n.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a href class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(n){n.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]);
\ No newline at end of file
diff --git a/dist/dockerui.js b/dist/dockerui.js
index 1cec52022..67b0d0359 100644
--- a/dist/dockerui.js
+++ b/dist/dockerui.js
@@ -1,4 +1,4 @@
-/*! dockerui - v0.6.0 - 2015-01-18
+/*! dockerui - v0.6.0 - 2015-01-25
  * https://github.com/crosbymichael/dockerui
  * Copyright (c) 2015 Michael Crosby;
  * Licensed MIT
@@ -17,10 +17,10 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
     }])
     // This is your docker url that the api will use to make requests
     // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
-    .constant('DOCKER_ENDPOINT', '/dockerapi')
+    .constant('DOCKER_ENDPOINT', 'dockerapi')
     .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred.  If you have a port, prefix it with a ':' i.e. :4243
     .constant('UI_VERSION', 'v0.6.0')
-    .constant('DOCKER_API_VERSION', 'v1.15');
+    .constant('DOCKER_API_VERSION', 'v1.16');
 
 angular.module('builder', [])
 .controller('BuilderController', ['$scope', 'Dockerfile', 'Messages',
@@ -501,44 +501,108 @@ function($scope, Container, Settings) {
     });
 }]);
 
-angular.module('startContainer', [])
-.controller('StartContainerController', ['$scope', '$routeParams', '$location', 'Container', 'Messages',
-function($scope, $routeParams, $location, Container, Messages) {
+angular.module('startContainer', ['ui.bootstrap'])
+.controller('StartContainerController', ['$scope', '$routeParams', '$location', 'Container', 'Messages', 'containernameFilter', 'errorMsgFilter',
+function($scope, $routeParams, $location, Container, Messages, containernameFilter, errorMsgFilter) {
     $scope.template = 'app/components/startContainer/startcontainer.html';
+
+    Container.query({all: 1}, function(d) {
+        $scope.containerNames = d.map(function(container){
+            return containernameFilter(container);
+        });
+    });
+
     $scope.config = {
-        name: '',
-        memory: 0,
-        memorySwap: 0,
-        cpuShares: 1024,
-        env: '',
-        commands: '',
-        volumesFrom: ''
+        Env: [],
+        Volumes: [],
+        SecurityOpts: [],
+        HostConfig: {
+            PortBindings: [],
+            Binds: [],
+            Links: [],
+            Dns: [],
+            DnsSearch: [],
+            VolumesFrom: [],
+            CapAdd: [],
+            CapDrop: []
+        }
+    };
+
+    $scope.menuStatus = {
+        containerOpen: true,
+        hostConfigOpen: false
     };
-    $scope.commandPlaceholder = '["/bin/echo", "Hello world"]';
 
     function failedRequestHandler(e, Messages) {
-        Messages.send({class: 'text-error', data: e.data});
+        Messages.error('Error', errorMsgFilter(e));
+    }
+
+    function rmEmptyKeys(col) {
+        for (var key in col) {
+            if (col[key] === null || col[key] === undefined || col[key] === '' || $.isEmptyObject(col[key]) || col[key].length === 0) {
+                delete col[key];
+            }
+        }
+    }
+
+    function getNames(arr) {
+        return arr.map(function(item) {return item.name;});
     }
 
     $scope.create = function() {
-        var cmds = null;
-        if ($scope.config.commands !== '') {
-            cmds = angular.fromJson($scope.config.commands);
+        // Copy the config before transforming fields to the remote API format
+        var config = angular.copy($scope.config);
+
+        config.Image = $routeParams.id;
+
+        if (config.Cmd && config.Cmd[0] === "[") {
+            config.Cmd = angular.fromJson(config.Cmd);
         }
-        var id = $routeParams.id;
+
+        config.Env = config.Env.map(function(envar) {return envar.name + '=' + envar.value;});
+
+        config.Volumes = getNames(config.Volumes);
+        config.SecurityOpts = getNames(config.SecurityOpts);
+
+        config.HostConfig.VolumesFrom = getNames(config.HostConfig.VolumesFrom);
+        config.HostConfig.Binds = getNames(config.HostConfig.Binds);
+        config.HostConfig.Links = getNames(config.HostConfig.Links);
+        config.HostConfig.Dns = getNames(config.HostConfig.Dns);
+        config.HostConfig.DnsSearch = getNames(config.HostConfig.DnsSearch);
+        config.HostConfig.CapAdd = getNames(config.HostConfig.CapAdd);
+        config.HostConfig.CapDrop = getNames(config.HostConfig.CapDrop);
+
+        var ExposedPorts = {};
+        var PortBindings = {};
+        // TODO: consider using compatibility library 
+        config.HostConfig.PortBindings.forEach(function(portBinding) {
+            var intPort = portBinding.intPort + "/tcp";
+            var binding = {
+                HostIp: portBinding.ip,
+                HostPort: portBinding.extPort
+            };
+            if (portBinding.intPort) {
+                ExposedPorts[intPort] = {};
+                if (intPort in PortBindings) {
+                    PortBindings[intPort].push(binding);
+                } else {
+                    PortBindings[intPort] = [binding];
+                }
+            } else {
+                // TODO: Send warning message? Internal port need to be specified.
+            }
+        });
+        config.ExposedPorts = ExposedPorts;
+        config.HostConfig.PortBindings = PortBindings;
+
+        // Remove empty fields from the request to avoid overriding defaults
+        rmEmptyKeys(config.HostConfig);
+        rmEmptyKeys(config);
+
         var ctor = Container;
         var loc = $location;
         var s = $scope;
-
-        Container.create({
-                Image: id,
-                name: $scope.config.name,
-                Memory: $scope.config.memory,
-                MemorySwap: $scope.config.memorySwap,
-                CpuShares: $scope.config.cpuShares,
-                Cmd: cmds,
-                VolumesFrom: $scope.config.volumesFrom
-            }, function(d) {
+        Container.create(config, function(d) {
                 if (d.Id) {
                     ctor.start({id: d.Id}, function(cd) {
                         $('#create-modal').modal('hide');
@@ -553,6 +617,14 @@ function($scope, $routeParams, $location, Container, Messages) {
                 failedRequestHandler(e, Messages);
         });
     };
+
+    $scope.addEntry = function(array, entry) {
+        array.push(entry);
+    };
+    $scope.rmEntry = function(array, entry) {
+        var idx = array.indexOf(entry);
+        array.splice(idx, 1);
+    };
 }]);
 
 angular.module('dockerui.filters', [])
@@ -656,6 +728,17 @@ angular.module('dockerui.filters', [])
             var date = new Date(data * 1000);
             return date.toDateString();
         };
+    })
+    .filter('errorMsg', function() {
+        return function(object) {
+            var idx = 0;
+            var msg = '';
+            while (object[idx] && typeof(object[idx]) === 'string') {
+                msg += object[idx];
+                idx++;
+            }
+            return msg;
+        };
     });
 
 angular.module('dockerui.services', ['ngResource'])
@@ -779,7 +862,7 @@ angular.module('dockerui.services', ['ngResource'])
                 $.gritter.add({
                     title: title,
                     text: text,
-                    time: 6000,
+                    time: 10000,
                     before_open: function() {
                         if($('.gritter-item-wrapper').length === 4) {
                             return false;
@@ -1432,38 +1515,248 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                <h3>Create And Start Container From Image</h3>\n" +
     "            </div>\n" +
     "            <div class=\"modal-body\">\n" +
-    "                <form role=\"form\">\n" +
+    "            <form role=\"form\">\n" +
+    "                <accordion close-others=\"true\">\n" +
+    "                    <accordion-group heading=\"Container options\" is-open=\"menuStatus.containerOpen\">\n" +
     "                        <fieldset>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Cmd:</label>\n" +
-    "                                    <input type=\"text\" placeholder=\"{{ commandPlaceholder }}\" ng-model=\"config.commands\" class=\"form-control\"/>\n" +
-    "                                    <small>Input commands as an array</small>\n" +
+    "                            <div class=\"row\">\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Cmd:</label>\n" +
+    "                                        <input type=\"text\" placeholder='[\"/bin/echo\", \"Hello world\"]' ng-model=\"config.Cmd\" class=\"form-control\"/>\n" +
+    "                                        <small>Input commands as a raw string or JSON array</small>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Entrypoint:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Entrypoint\" class=\"form-control\" placeholder=\"./entrypoint.sh\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Name:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.name\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Hostname:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Hostname\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Domainname:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Domainname\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>User:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.User\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Memory:</label>\n" +
+    "                                        <input type=\"number\" ng-model=\"config.Memory\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Volumes:</label>\n" +
+    "                                        <div ng-repeat=\"volume in config.Volumes\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"volume.name\" class=\"form-control\" placeholder=\"/var/data\"/>\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.Volumes, volume)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Volumes, {name: ''})\">Add Volume</button>\n" +
+    "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Name:</label>\n" +
-    "                                    <input type=\"text\" ng-model=\"config.name\" class=\"form-control\"/>\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Memory Swap:</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" +
+    "                                        <input type=\"number\" ng-model=\"config.CpuShares\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Cpuset:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Cpuset\" class=\"form-control\" placeholder=\"1,2\"/>\n" +
+    "                                        <small>Input as comma-separated list of numbers</small>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>WorkingDir:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.WorkingDir\" class=\"form-control\" placeholder=\"/app\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>MacAddress:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.MacAddress\" class=\"form-control\" placeholder=\"12:34:56:78:9a:bc\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"networkDisabled\">NetworkDisabled:</label>\n" +
+    "                                        <input id=\"networkDisabled\" type=\"checkbox\" ng-model=\"config.NetworkDisabled\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"tty\">Tty:</label>\n" +
+    "                                        <input id=\"tty\" type=\"checkbox\" ng-model=\"config.Tty\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"openStdin\">OpenStdin:</label>\n" +
+    "                                        <input id=\"openStdin\" type=\"checkbox\" ng-model=\"config.OpenStdin\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"stdinOnce\">StdinOnce:</label>\n" +
+    "                                        <input id=\"stdinOnce\" type=\"checkbox\" ng-model=\"config.StdinOnce\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Security Options:</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" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.SecurityOpts, opt)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.SecurityOpts, {name: ''})\">Add Option</button>\n" +
+    "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Memory:</label>\n" +
-    "                                    <input type=\"number\" ng-model=\"config.memory\" class=\"form-control\"/>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Memory Swap:</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" +
-    "                                    <input type=\"number\" ng-model=\"config.cpuShares\" class=\"form-control\"/>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Volumes From:</label>\n" +
-    "                                    <input type=\"text\" ng-model=\"config.volumesFrom\" class=\"form-control\"/>\n" +
+    "                            </div>\n" +
+    "                            <hr>\n" +
+    "                            <div class=\"form-group\">\n" +
+    "                                <label>Environment Variables:</label>\n" +
+    "                                <div ng-repeat=\"envar in config.Env\">\n" +
+    "                                    <div class=\"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" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <label class=\"sr-only\">Variable Value:</label>\n" +
+    "                                            <input type=\"text\" ng-model=\"envar.value\" class=\"form-control\" placeholder=\"value\"/>\n" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.Env, envar)\">Remove</button>\n" +
+    "                                        </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" +
+    "                            </div>\n" +
     "                        </fieldset>\n" +
+    "                    </accordion-group>\n" +
+    "                    <accordion-group heading=\"HostConfig options\" is-open=\"menuStatus.hostConfigOpen\">\n" +
+    "                        <fieldset>\n" +
+    "                            <div class=\"row\">\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Binds:</label>\n" +
+    "                                        <div ng-repeat=\"bind in config.HostConfig.Binds\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"bind.name\" class=\"form-control\" placeholder=\"/host:/container\"/>\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Binds, bind)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Binds, {name: ''})\">Add Bind</button>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Links:</label>\n" +
+    "                                        <div ng-repeat=\"link in config.HostConfig.Links\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"link.name\" class=\"form-control\" placeholder=\"web:db\">\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Links, link)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <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" +
+    "                                        <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>DnsSearch:</label>\n" +
+    "                                        <div ng-repeat=\"entry in config.HostConfig.DnsSearch\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"example.com\"/>\n" +
+    "                                                <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>CapAdd:</label>\n" +
+    "                                        <div ng-repeat=\"entry in config.HostConfig.CapAdd\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"cap_sys_admin\"/>\n" +
+    "                                                <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" +
+    "                                    </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" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"cap_sys_admin\"/>\n" +
+    "                                                <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>NetworkMode:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.HostConfig.NetworkMode\" class=\"form-control\" placeholder=\"bridge\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"publishAllPorts\">PublishAllPorts:</label>\n" +
+    "                                        <input id=\"publishAllPorts\" type=\"checkbox\" ng-model=\"config.HostConfig.PublishAllPorts\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"privileged\">Privileged:</label>\n" +
+    "                                        <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" +
+    "                                        <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" +
+    "                                                <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.VolumesFrom, volume)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </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" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        RestartPolicy unimplemented...\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" +
+    "                                <div ng-repeat=\"portBinding in config.HostConfig.PortBindings\">\n" +
+    "                                    <div class=\"form-group form-inline\">\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" +
+    "                                        <input type=\"text\" ng-model=\"portBinding.extPort\" class=\"form-control\" placeholder=\"Host Port\"/>\n" +
+    "                                        <label class=\"sr-only\">Container port:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"portBinding.intPort\" class=\"form-control\" placeholder=\"Container Port\"/>\n" +
+    "                                        <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.PortBindings, portBinding)\">Remove</button>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.PortBindings, {ip: '', extPort: '', intPort: ''})\">Add Port Binding</button>\n" +
+    "                            </div>\n" +
+    "                        </fieldset>\n" +
+    "                    </accordion-group>\n" +
+    "                  </accordion>\n" +
     "                </form>\n" +
     "            </div>\n" +
     "            <div class=\"modal-footer\">\n" +
-    "                <a href=\"\" class=\"btn btn-primary\" ng-click=\"create()\">Create</a>\n" +
+    "                <a href=\"\" class=\"btn btn-primary btn-lg\" ng-click=\"create()\">Create</a>\n" +
     "            </div>\n" +
     "        </div>\n" +
     "    </div>\n" +
diff --git a/dist/index.html b/dist/index.html
index 50008da8d..11d129a16 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -23,11 +23,7 @@
 
 
     <script src="assets/js/spin.js" type="text/javascript" charset="utf-8"></script>
-
-    <script src="assets/js/angularjs/1.2.6/angular.min.js"></script>
-    <script src="assets/js/angularjs/1.2.6/angular-resource.min.js"></script>
-    <script src="assets/js/angularjs/1.2.6/angular-route.min.js"></script>
-
+    <script src="angular.js"></script>
     <script src="assets/js/jquery.gritter.min.js"></script>
     <script src="assets/js/Chart.min.js"></script>
     <script src="assets/js/legend.js"></script>
diff --git a/dist/templates/app.js b/dist/templates/app.js
index dc76c3ec4..008a307e9 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -553,38 +553,248 @@ angular.module("app/components/startContainer/startcontainer.html", []).run(["$t
     "                <h3>Create And Start Container From Image</h3>\n" +
     "            </div>\n" +
     "            <div class=\"modal-body\">\n" +
-    "                <form role=\"form\">\n" +
+    "            <form role=\"form\">\n" +
+    "                <accordion close-others=\"true\">\n" +
+    "                    <accordion-group heading=\"Container options\" is-open=\"menuStatus.containerOpen\">\n" +
     "                        <fieldset>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Cmd:</label>\n" +
-    "                                    <input type=\"text\" placeholder=\"{{ commandPlaceholder }}\" ng-model=\"config.commands\" class=\"form-control\"/>\n" +
-    "                                    <small>Input commands as an array</small>\n" +
+    "                            <div class=\"row\">\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Cmd:</label>\n" +
+    "                                        <input type=\"text\" placeholder='[\"/bin/echo\", \"Hello world\"]' ng-model=\"config.Cmd\" class=\"form-control\"/>\n" +
+    "                                        <small>Input commands as a raw string or JSON array</small>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Entrypoint:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Entrypoint\" class=\"form-control\" placeholder=\"./entrypoint.sh\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Name:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.name\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Hostname:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Hostname\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Domainname:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Domainname\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>User:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.User\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Memory:</label>\n" +
+    "                                        <input type=\"number\" ng-model=\"config.Memory\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Volumes:</label>\n" +
+    "                                        <div ng-repeat=\"volume in config.Volumes\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"volume.name\" class=\"form-control\" placeholder=\"/var/data\"/>\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.Volumes, volume)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.Volumes, {name: ''})\">Add Volume</button>\n" +
+    "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Name:</label>\n" +
-    "                                    <input type=\"text\" ng-model=\"config.name\" class=\"form-control\"/>\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Memory Swap:</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" +
+    "                                        <input type=\"number\" ng-model=\"config.CpuShares\" class=\"form-control\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Cpuset:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.Cpuset\" class=\"form-control\" placeholder=\"1,2\"/>\n" +
+    "                                        <small>Input as comma-separated list of numbers</small>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>WorkingDir:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.WorkingDir\" class=\"form-control\" placeholder=\"/app\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>MacAddress:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.MacAddress\" class=\"form-control\" placeholder=\"12:34:56:78:9a:bc\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"networkDisabled\">NetworkDisabled:</label>\n" +
+    "                                        <input id=\"networkDisabled\" type=\"checkbox\" ng-model=\"config.NetworkDisabled\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"tty\">Tty:</label>\n" +
+    "                                        <input id=\"tty\" type=\"checkbox\" ng-model=\"config.Tty\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"openStdin\">OpenStdin:</label>\n" +
+    "                                        <input id=\"openStdin\" type=\"checkbox\" ng-model=\"config.OpenStdin\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"stdinOnce\">StdinOnce:</label>\n" +
+    "                                        <input id=\"stdinOnce\" type=\"checkbox\" ng-model=\"config.StdinOnce\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Security Options:</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" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.SecurityOpts, opt)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.SecurityOpts, {name: ''})\">Add Option</button>\n" +
+    "                                    </div>\n" +
     "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Memory:</label>\n" +
-    "                                    <input type=\"number\" ng-model=\"config.memory\" class=\"form-control\"/>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Memory Swap:</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" +
-    "                                    <input type=\"number\" ng-model=\"config.cpuShares\" class=\"form-control\"/>\n" +
-    "                                </div>\n" +
-    "                                <div class=\"form-group\">\n" +
-    "                                    <label>Volumes From:</label>\n" +
-    "                                    <input type=\"text\" ng-model=\"config.volumesFrom\" class=\"form-control\"/>\n" +
+    "                            </div>\n" +
+    "                            <hr>\n" +
+    "                            <div class=\"form-group\">\n" +
+    "                                <label>Environment Variables:</label>\n" +
+    "                                <div ng-repeat=\"envar in config.Env\">\n" +
+    "                                    <div class=\"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" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <label class=\"sr-only\">Variable Value:</label>\n" +
+    "                                            <input type=\"text\" ng-model=\"envar.value\" class=\"form-control\" placeholder=\"value\"/>\n" +
+    "                                        </div>\n" +
+    "                                        <div class=\"form-group\">\n" +
+    "                                            <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.Env, envar)\">Remove</button>\n" +
+    "                                        </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" +
+    "                            </div>\n" +
     "                        </fieldset>\n" +
+    "                    </accordion-group>\n" +
+    "                    <accordion-group heading=\"HostConfig options\" is-open=\"menuStatus.hostConfigOpen\">\n" +
+    "                        <fieldset>\n" +
+    "                            <div class=\"row\">\n" +
+    "                                <div class=\"col-xs-6\">\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Binds:</label>\n" +
+    "                                        <div ng-repeat=\"bind in config.HostConfig.Binds\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"bind.name\" class=\"form-control\" placeholder=\"/host:/container\"/>\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Binds, bind)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.Binds, {name: ''})\">Add Bind</button>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>Links:</label>\n" +
+    "                                        <div ng-repeat=\"link in config.HostConfig.Links\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"link.name\" class=\"form-control\" placeholder=\"web:db\">\n" +
+    "                                                <button type=\"button\" class=\"btn btn-danger btn-sm\" ng-click=\"rmEntry(config.HostConfig.Links, link)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </div>\n" +
+    "                                        <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" +
+    "                                        <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>DnsSearch:</label>\n" +
+    "                                        <div ng-repeat=\"entry in config.HostConfig.DnsSearch\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"example.com\"/>\n" +
+    "                                                <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>CapAdd:</label>\n" +
+    "                                        <div ng-repeat=\"entry in config.HostConfig.CapAdd\">\n" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"cap_sys_admin\"/>\n" +
+    "                                                <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" +
+    "                                    </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" +
+    "                                            <div class=\"form-group form-inline\">\n" +
+    "                                                <input type=\"text\" ng-model=\"entry.name\" class=\"form-control\" placeholder=\"cap_sys_admin\"/>\n" +
+    "                                                <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" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label>NetworkMode:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"config.HostConfig.NetworkMode\" class=\"form-control\" placeholder=\"bridge\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"publishAllPorts\">PublishAllPorts:</label>\n" +
+    "                                        <input id=\"publishAllPorts\" type=\"checkbox\" ng-model=\"config.HostConfig.PublishAllPorts\"/>\n" +
+    "                                    </div>\n" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        <label for=\"privileged\">Privileged:</label>\n" +
+    "                                        <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" +
+    "                                        <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" +
+    "                                                <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.VolumesFrom, volume)\">Remove</button>\n" +
+    "                                            </div>\n" +
+    "                                        </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" +
+    "                                    <div class=\"form-group\">\n" +
+    "                                        RestartPolicy unimplemented...\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" +
+    "                                <div ng-repeat=\"portBinding in config.HostConfig.PortBindings\">\n" +
+    "                                    <div class=\"form-group form-inline\">\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" +
+    "                                        <input type=\"text\" ng-model=\"portBinding.extPort\" class=\"form-control\" placeholder=\"Host Port\"/>\n" +
+    "                                        <label class=\"sr-only\">Container port:</label>\n" +
+    "                                        <input type=\"text\" ng-model=\"portBinding.intPort\" class=\"form-control\" placeholder=\"Container Port\"/>\n" +
+    "                                        <button class=\"btn btn-danger btn-xs form-control\" ng-click=\"rmEntry(config.HostConfig.PortBindings, portBinding)\">Remove</button>\n" +
+    "                                    </div>\n" +
+    "                                </div>\n" +
+    "                                <button type=\"button\" class=\"btn btn-success btn-sm\" ng-click=\"addEntry(config.HostConfig.PortBindings, {ip: '', extPort: '', intPort: ''})\">Add Port Binding</button>\n" +
+    "                            </div>\n" +
+    "                        </fieldset>\n" +
+    "                    </accordion-group>\n" +
+    "                  </accordion>\n" +
     "                </form>\n" +
     "            </div>\n" +
     "            <div class=\"modal-footer\">\n" +
-    "                <a href=\"\" class=\"btn btn-primary\" ng-click=\"create()\">Create</a>\n" +
+    "                <a href=\"\" class=\"btn btn-primary btn-lg\" ng-click=\"create()\">Create</a>\n" +
     "            </div>\n" +
     "        </div>\n" +
     "    </div>\n" +