diff --git a/app/components/container/container.html b/app/components/container/container.html
index e696fde8d..574e67aec 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -294,14 +294,14 @@
         <form class="form-horizontal">
           <!-- network-input -->
           <div class="row">
-            <label for="container_network" class="col-sm-3 col-lg-3 control-label text-left">Join a Network</label>
-            <div class="col-sm-5 col-lg-5">
+            <label for="container_network" class="col-sm-3 col-lg-2 control-label text-left">Join a Network</label>
+            <div class="col-sm-5 col-lg-4">
               <select class="form-control" ng-model="selectedNetwork" id="container_network">
                 <option selected disabled hidden value="">Select a network</option>
                 <option ng-repeat="net in availableNetworks" ng-value="net.Id">{{ net.Name }}</option>
               </select>
             </div>
-            <div class="col-sm-4 col-lg-4">
+            <div class="col-sm-1">
               <button type="button" class="btn btn-primary btn-sm" ng-disabled="!selectedNetwork" ng-click="containerJoinNetwork(container, selectedNetwork)">Join Network</button>
             </div>
           </div>
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js
index 183bb9fa8..e9c6b3303 100644
--- a/app/components/container/containerController.js
+++ b/app/components/container/containerController.js
@@ -222,15 +222,13 @@ function ($scope, $state, $stateParams, $filter, Container, ContainerCommit, Con
             return network;
           }
         });
-        $scope.globalNetworkCount = networks.length;
         networks.push({Name: 'bridge'});
         networks.push({Name: 'host'});
         networks.push({Name: 'none'});
       }
-      networks.push({Name: 'container'});
       $scope.availableNetworks = networks;
       if (!_.find(networks, {'Name': 'bridge'})) {
-        $scope.config.HostConfig.NetworkMode = 'nat';
+        networks.push({Name: 'nat'});
       }
     }, function (e) {
       Notifications.error('Failure', e, 'Unable to retrieve networks');