diff --git a/.gitignore b/.gitignore
index 4ca058912..4a54b4a3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 logs/*
 !.gitkeep
 dockerui
+*.esproj/*
diff --git a/css/app.css b/css/app.css
index 54db7ccba..6dd3155e0 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1,101 +1,110 @@
-  body {
+body {
     padding-top: 20px;
     padding-bottom: 60px;
-  }
+}
 
-  .container {
+.container {
     margin: 0 auto;
     max-width: 1000px;
-  }
-  .container > hr {
-    margin: 60px 0;
-  }
+}
 
-  .jumbotron {
+.container > hr {
+    margin: 60px 0;
+}
+
+.jumbotron {
     margin: 80px 0;
     text-align: center;
-  }
-  .jumbotron h1 {
+}
+
+.jumbotron h1 {
     font-size: 100px;
     line-height: 1;
-  }
-  .jumbotron .lead {
+}
+
+.jumbotron .lead {
     font-size: 24px;
     line-height: 1.25;
-  }
-  .jumbotron .btn {
+}
+
+.jumbotron .btn {
     font-size: 21px;
     padding: 14px 24px;
-  }
+}
 
-  .marketing {
+.marketing {
     margin: 60px 0;
-  }
-  .marketing p + h4 {
-    margin-top: 28px;
-  }
+}
 
-  .navbar .navbar-inner {
+.marketing p + h4 {
+    margin-top: 28px;
+}
+
+.navbar .navbar-inner {
     padding: 0;
-  }
-  .navbar .nav {
+}
+
+.navbar .nav {
     margin: 0;
-  }
-  .navbar .nav li {
+}
+
+.navbar .nav li {
     display: table-cell;
     width: 1%;
     float: none;
-  }
-  .navbar .nav li a {
+}
+
+.navbar .nav li a {
     font-weight: bold;
     text-align: center;
     border-left: 1px solid rgba(255,255,255,.75);
     border-right: 1px solid rgba(0,0,0,.1);
-  }
-  .navbar .nav li:first-child a {
+}
+
+.navbar .nav li:first-child a {
     border-left: 0;
     border-radius: 3px 0 0 3px;
-  }
-  .navbar .nav li:last-child a {
+}
+.navbar .nav li:last-child a {
     border-right: 0;
     border-radius: 0 3px 3px 0;
-  }
+}
 
-  .btn-group button {
+.btn-group button {
     margin: 3px;
-  }
+}
 
-  .detail {
+.detail {
     width: 80%;
     margin: 0 auto;
-  }
+}
 
-  .center {
+.center {
     width: 80%;
     margin: 0 auto;
-  }
+}
 
- .btn-remove {
+.btn-remove {
     margin: 0 auto;
     max-width: 70%;
-  }
+}
 
-  .actions {
+.actions {
     margin: 0 auto;
-  }
+}
 
-  .container-bottom {
-      height: 50px;
-  }
+.container-bottom {
+    height: 50px;
+}
 
-  .footer {
+.footer {
     max-height:6px;
-  }
+}
 
-  #response {
+#response {
     width: 80%;
     margin: 0 auto;
-  }
+}
 
 #editor {
     height: 300px;
diff --git a/js/controllers.js b/js/controllers.js
index e45e45a85..901360b68 100644
--- a/js/controllers.js
+++ b/js/controllers.js
@@ -213,14 +213,15 @@ function ContainerController($scope, $routeParams, $location, Container, Message
 
 // Controller for the list of containers
 function ContainersController($scope, Container, Settings, Messages, ViewSpinner) {
-    $scope.displayAll = Settings.displayAll;
     $scope.predicate = '-Created';
-    $scope.toggle = false;
+    $scope.toggle = false;
+    $scope.displayAll = Settings.displayAll;
 
     var update = function(data) {
         ViewSpinner.spin();
         Container.query(data, function(d) {
-            $scope.containers = d.map(function(item) { return new ContainerViewModel(item); });
+            $scope.containers = d.map(function(item) { 
+            	return new ContainerViewModel(item); });
             ViewSpinner.stop();
         });
     };
@@ -257,13 +258,8 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner
     };
 
     $scope.toggleGetAll = function() {
-        Settings.displayAll = $scope.displayAll;
-        var data = {all: 0};
-
-        if ($scope.displayAll) {
-            data.all = 1;
-        }
-        update(data);
+        Settings.displayAll = $scope.displayAll;
+        update({all: Settings.displayAll ? 1 : 0});
     };
 
     $scope.startAction = function() {
@@ -282,7 +278,7 @@ function ContainersController($scope, Container, Settings, Messages, ViewSpinner
         batch($scope.containers, Container.remove, "Removed");
     };
 
-    update({all: $scope.displayAll ? 1 : 0});
+    update({all: Settings.displayAll ? 1 : 0});
 }
 
 // Controller for the list of images
diff --git a/partials/containers.html b/partials/containers.html
index c76af8905..b0b580184 100644
--- a/partials/containers.html
+++ b/partials/containers.html
@@ -15,13 +15,14 @@
     </ul>
 
     <div class="pull-right">
-        <input type="checkbox" ng-model="displayAll" ng-click="toggleGetAll()"/> Display All
+        <input type="checkbox" ng-model="displayAll" 
+        	ng-change="toggleGetAll()"/> Display All
     </div>
 </div>
 <table class="table table-striped">
     <thead>
         <tr>
-            <th><input type="checkbox" ng-model="toggle" ng-click="toggleSelectAll()" /> Action</th>
+            <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
             <th>Name</th>
             <th>Image</th>
             <th>Command</th>
diff --git a/partials/images.html b/partials/images.html
index e93a6fa3a..15528ab09 100644
--- a/partials/images.html
+++ b/partials/images.html
@@ -14,7 +14,7 @@
 <table class="table table-striped">
     <thead>
         <tr>
-            <th><input type="checkbox" ng-model="toggle" ng-click="toggleSelectAll()" /> Action</th>
+            <th><input type="checkbox" ng-model="toggle" ng-change="toggleSelectAll()" /> Action</th>
             <th>Id</th>
             <th>Repository</th>
             <th>Created</th>