diff --git a/app/app.js b/app/app.js
index 6b1b0152a..d41c7e039 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,4 +1,4 @@
-angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
+angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs'])
     .config(['$routeProvider', function ($routeProvider) {
         'use strict';
         $routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@@ -7,7 +7,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
         $routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'});
         $routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'});
         $routeProvider.when('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
-        $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
+        $routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'});
         $routeProvider.otherwise({redirectTo: '/'});
     }])
     // This is your docker url that the api will use to make requests
diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index 1ae9b1ef7..c2811581b 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -18,8 +18,7 @@
     </ul>
 
     <div class="pull-right">
-        <input type="checkbox" ng-model="displayAll" 
-            ng-change="toggleGetAll()"/> Display All
+        <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>
     </div>
 </div>
 <table class="table table-striped">
diff --git a/app/components/image/image.html b/app/components/image/image.html
index 108c6f21d..9a76eeb5d 100644
--- a/app/components/image/image.html
+++ b/app/components/image/image.html
@@ -23,40 +23,40 @@
          <tbody>
             <tr>
                 <td>Created:</td>
-                <td>{{ image.created }}</td>
+                <td>{{ image.Created }}</td>
             </tr>
             <tr>
                 <td>Parent:</td>
-                <td><a href="#/images/{{ image.parent }}/">{{ image.parent }}</a></td>
+                <td><a href="#/images/{{ image.Parent }}/">{{ image.Parent }}</a></td>
             </tr>
             <tr>
-                <td>Size:</td>
-                <td>{{ image.Size|humansize }}</td>
+                <td>Size (Virtual Size):</td>
+                <td>{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})</td>
             </tr>
 
             <tr>
                 <td>Hostname:</td>
-                <td>{{ image.container_config.Hostname }}</td>
+                <td>{{ image.ContainerConfig.Hostname }}</td>
             </tr>
             <tr>
                 <td>User:</td>
-                <td>{{ image.container_config.User }}</td>
+                <td>{{ image.ContainerConfig.User }}</td>
             </tr>
             <tr>
                 <td>Cmd:</td>
-                <td>{{ image.container_config.Cmd }}</td>
+                <td>{{ image.ContainerConfig.Cmd }}</td>
             </tr>
             <tr>
                 <td>Volumes:</td>
-                <td>{{ image.container_config.Volumes }}</td>
+                <td>{{ image.ContainerConfig.Volumes }}</td>
             </tr>
             <tr>
                 <td>Volumes from:</td>
-                <td>{{ image.container_config.VolumesFrom }}</td>
+                <td>{{ image.ContainerConfig.VolumesFrom }}</td>
             </tr>
             <tr>
-                <td>Comment:</td>
-                <td>{{ image.comment }}</td>
+                <td>Built with:</td>
+                <td>Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}</td>
             </tr>
 
         </tbody>
diff --git a/app/components/info/info.html b/app/components/info/info.html
new file mode 100644
index 000000000..9a4b23841
--- /dev/null
+++ b/app/components/info/info.html
@@ -0,0 +1,101 @@
+<div class="detail">
+    <h2>Docker Information</h2>
+    <div>
+        <p class="lead">
+            <strong>Endpoint: </strong>{{ endpoint }}<br />
+            <strong>Api Version: </strong>{{ apiVersion }}<br />
+            <strong>Version: </strong>{{ docker.Version }}<br />
+            <strong>Git Commit: </strong>{{ docker.GitCommit }}<br />
+            <strong>Go Version: </strong>{{ docker.GoVersion }}<br />
+        </p>
+    </div>
+
+    <table class="table table-striped">
+         <tbody>
+            <tr>
+                <td>Containers:</td>
+                <td>{{ info.Containers }}</td>
+            </tr>
+            <tr>
+                <td>Images:</td>
+                <td>{{ info.Images }}</td>
+            </tr>
+            <tr>
+                <td>Debug:</td>
+                <td>{{ info.Debug }}</td>
+            </tr>
+            <tr>
+                <td>CPUs:</td>
+                <td>{{ info.NCPU }}</td>
+            </tr>
+            <tr>
+                <td>Total Memory:</td>
+                <td>{{ info.MemTotal|humansize }}</td>
+            </tr>
+            <tr>
+                <td>Operating System:</td>
+                <td>{{ info.OperatingSystem }}</td>
+            </tr>
+            <tr>
+                <td>Kernel Version:</td>
+                <td>{{ info.KernelVersion }}</td>
+            </tr>
+            <tr>
+                <td>ID:</td>
+                <td>{{ info.ID }}</td>
+            </tr>
+            <tr>
+                <td>Labels:</td>
+                <td>{{ info.Labels }}</td>
+            </tr>
+            <tr>
+                <td>File Descriptors:</td>
+                <td>{{ info.NFd }}</td>
+            </tr>
+            <tr>
+                <td>Goroutines:</td>
+                <td>{{ info.NGoroutines }}</td>
+            </tr>
+            <tr>
+                <td>Storage Driver:</td>
+                <td>{{ info.Driver }}</td>
+            </tr>
+            <tr>
+                <td>Storage Driver Status:</td>
+                <td>{{ info.DriverStatus }}</td>
+            </tr>
+            <tr>
+                <td>Execution Driver:</td>
+                <td>{{ info.ExecutionDriver }}</td>
+            </tr>
+            <tr>
+                <td>IPv4 Forwarding:</td>
+                <td>{{ info.IPv4Forwarding }}</td>
+            </tr>
+            <tr>
+                <td>Index Server Address:</td>
+                <td>{{ info.IndexServerAddress }}</td>
+            </tr>
+            <tr>
+                <td>Init Path:</td>
+                <td>{{ info.InitPath }}</td>
+            </tr>
+            <tr>
+                <td>Docker Root Directory:</td>
+                <td>{{ info.DockerRootDir }}</td>
+            </tr>
+            <tr>
+                <td>Init SHA1</td>
+                <td>{{ info.InitSha1 }}</td>
+            </tr>
+            <tr>
+                <td>Memory Limit:</td>
+                <td>{{ info.MemoryLimit }}</td>
+            </tr>
+            <tr>
+                <td>Swap Limit:</td>
+                <td>{{ info.SwapLimit }}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>
diff --git a/app/components/settings/settingsController.js b/app/components/info/infoController.js
similarity index 71%
rename from app/components/settings/settingsController.js
rename to app/components/info/infoController.js
index 44f077c8e..1df5ca979 100644
--- a/app/components/settings/settingsController.js
+++ b/app/components/info/infoController.js
@@ -1,5 +1,5 @@
-angular.module('settings', [])
-.controller('SettingsController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
+angular.module('info', [])
+.controller('InfoController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
 function($scope, System, Docker, Settings, Messages) {
     $scope.info = {};
     $scope.docker = {};
diff --git a/app/components/masthead/masthead.html b/app/components/masthead/masthead.html
index 13029eded..d3a70783b 100644
--- a/app/components/masthead/masthead.html
+++ b/app/components/masthead/masthead.html
@@ -4,6 +4,6 @@
         <li><a href="#">Dashboard</a></li>
         <li><a href="#/containers/">Containers</a></li>
         <li><a href="#/images/">Images</a></li>
-        <li><a href="#/settings/">Settings</a></li>
+        <li><a href="#/info/">Info</a></li>
       </ul>
   </div>
diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html
deleted file mode 100644
index 83caa539f..000000000
--- a/app/components/settings/settings.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="detail">
-    <h2>Docker Information</h2>
-    <div>
-        <p class="lead">
-            <strong>Endpoint: </strong>{{ endpoint }}<br />
-            <strong>Api Version: </strong>{{ apiVersion }}<br />
-            <strong>Version: </strong>{{ docker.Version }}<br />
-            <strong>Git Commit: </strong>{{ docker.GitCommit }}<br />
-            <strong>Go Version: </strong>{{ docker.GoVersion }}<br />
-        </p>
-    </div>
-
-    <table class="table table-striped">
-         <tbody>
-            <tr>
-                <td>Containers:</td>
-                <td>{{ info.Containers }}</td>
-            </tr>
-            <tr>
-                <td>Images:</td>
-                <td>{{ info.Images }}</td>
-            </tr>
-            <tr>
-                <td>Debug:</td>
-                <td>{{ info.Debug }}</td>
-            </tr>
-            <tr>
-                <td>NFd:</td>
-                <td>{{ info.NFd }}</td>
-            </tr>
-            <tr>
-                <td>NGoroutines:</td>
-                <td>{{ info.NGoroutines }}</td>
-            </tr>
-            <tr>
-                <td>MemoryLimit:</td>
-                <td>{{ info.MemoryLimit }}</td>
-            </tr>
-            <tr>
-                <td>SwapLimit:</td>
-                <td>{{ info.SwapLimit }}</td>
-            </tr>
-            <tr>
-                <td>NFd:</td>
-                <td>{{ info.NFd }}</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
diff --git a/assets/css/app.css b/assets/css/app.css
index b7b7bd8f0..b2abc414c 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -113,3 +113,8 @@ body {
 .inline-four .form-control {
     max-width: 25%;
 }
+
+.dropdown {
+    cursor: pointer;
+}
+
diff --git a/dist/assets/css/app.css b/dist/assets/css/app.css
index b7b7bd8f0..b2abc414c 100644
--- a/dist/assets/css/app.css
+++ b/dist/assets/css/app.css
@@ -113,3 +113,8 @@ body {
 .inline-four .form-control {
     max-width: 25%;
 }
+
+.dropdown {
+    cursor: pointer;
+}
+
diff --git a/dist/dockerui.css b/dist/dockerui.css
index a12442daa..3a67a75df 100644
--- a/dist/dockerui.css
+++ b/dist/dockerui.css
@@ -113,4 +113,8 @@ body {
 
 .inline-four .form-control {
   max-width: 25%;
+}
+
+.dropdown {
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/dist/dockerui.js b/dist/dockerui.js
index dec3b4062..d2b2d10ef 100644
--- a/dist/dockerui.js
+++ b/dist/dockerui.js
@@ -1,9 +1,9 @@
-/*! dockerui - v0.6.0 - 2015-02-13
+/*! dockerui - v0.6.0 - 2015-02-14
  * https://github.com/crosbymichael/dockerui
  * Copyright (c) 2015 Michael Crosby & Kevan Ahlquist;
  * Licensed MIT
  */
-angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
+angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs'])
     .config(['$routeProvider', function ($routeProvider) {
         'use strict';
         $routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@@ -12,7 +12,7 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
         $routeProvider.when('/containers/:id/logs/', {templateUrl: 'app/components/containerLogs/containerlogs.html', controller: 'ContainerLogsController'});
         $routeProvider.when('/images/', {templateUrl: 'app/components/images/images.html', controller: 'ImagesController'});
         $routeProvider.when('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
-        $routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
+        $routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'});
         $routeProvider.otherwise({redirectTo: '/'});
     }])
     // This is your docker url that the api will use to make requests
@@ -502,13 +502,8 @@ function($scope, Image, ViewSpinner, Messages) {
     });
 }]);
 
-angular.module('masthead', [])
-.controller('MastheadController', ['$scope', function($scope) {
-    $scope.template = 'app/components/masthead/masthead.html';
-}]);
-
-angular.module('settings', [])
-.controller('SettingsController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
+angular.module('info', [])
+.controller('InfoController', ['$scope', 'System', 'Docker', 'Settings', 'Messages',
 function($scope, System, Docker, Settings, Messages) {
     $scope.info = {};
     $scope.docker = {};
@@ -519,6 +514,11 @@ function($scope, System, Docker, Settings, Messages) {
     System.get({}, function(d) { $scope.info = d; });
 }]);
 
+angular.module('masthead', [])
+.controller('MastheadController', ['$scope', function($scope) {
+    $scope.template = 'app/components/masthead/masthead.html';
+}]);
+
 angular.module('sidebar', [])
 .controller('SideBarController', ['$scope', 'Container', 'Settings',
 function($scope, Container, Settings) {
@@ -1009,7 +1009,7 @@ function ContainerViewModel(data) {
    this.Names = data.Names;
 }
 
-angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/masthead/masthead.html', 'app/components/settings/settings.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
+angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/info/info.html', 'app/components/masthead/masthead.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
 
 angular.module("app/components/builder/builder.html", []).run(["$templateCache", function($templateCache) {
   $templateCache.put("app/components/builder/builder.html",
@@ -1230,8 +1230,7 @@ angular.module("app/components/containers/containers.html", []).run(["$templateC
     "    </ul>\n" +
     "\n" +
     "    <div class=\"pull-right\">\n" +
-    "        <input type=\"checkbox\" ng-model=\"displayAll\" \n" +
-    "            ng-change=\"toggleGetAll()\"/> Display All\n" +
+    "        <input type=\"checkbox\" ng-model=\"displayAll\" id=\"displayAll\" ng-change=\"toggleGetAll()\"/> <label for=\"displayAll\">Display All</label>\n" +
     "    </div>\n" +
     "</div>\n" +
     "<table class=\"table table-striped\">\n" +
@@ -1348,40 +1347,40 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
     "         <tbody>\n" +
     "            <tr>\n" +
     "                <td>Created:</td>\n" +
-    "                <td>{{ image.created }}</td>\n" +
+    "                <td>{{ image.Created }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Parent:</td>\n" +
-    "                <td><a href=\"#/images/{{ image.parent }}/\">{{ image.parent }}</a></td>\n" +
+    "                <td><a href=\"#/images/{{ image.Parent }}/\">{{ image.Parent }}</a></td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>Size:</td>\n" +
-    "                <td>{{ image.Size|humansize }}</td>\n" +
+    "                <td>Size (Virtual Size):</td>\n" +
+    "                <td>{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})</td>\n" +
     "            </tr>\n" +
     "\n" +
     "            <tr>\n" +
     "                <td>Hostname:</td>\n" +
-    "                <td>{{ image.container_config.Hostname }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Hostname }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>User:</td>\n" +
-    "                <td>{{ image.container_config.User }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.User }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Cmd:</td>\n" +
-    "                <td>{{ image.container_config.Cmd }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Cmd }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Volumes:</td>\n" +
-    "                <td>{{ image.container_config.Volumes }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Volumes }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Volumes from:</td>\n" +
-    "                <td>{{ image.container_config.VolumesFrom }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.VolumesFrom }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>Comment:</td>\n" +
-    "                <td>{{ image.comment }}</td>\n" +
+    "                <td>Built with:</td>\n" +
+    "                <td>Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}</td>\n" +
     "            </tr>\n" +
     "\n" +
     "        </tbody>\n" +
@@ -1471,22 +1470,8 @@ angular.module("app/components/images/images.html", []).run(["$templateCache", f
     "");
 }]);
 
-angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("app/components/masthead/masthead.html",
-    "  <div class=\"masthead\">\n" +
-    "    <h3 class=\"text-muted\">DockerUI</h3>\n" +
-    "      <ul class=\"nav well\">\n" +
-    "        <li><a href=\"#\">Dashboard</a></li>\n" +
-    "        <li><a href=\"#/containers/\">Containers</a></li>\n" +
-    "        <li><a href=\"#/images/\">Images</a></li>\n" +
-    "        <li><a href=\"#/settings/\">Settings</a></li>\n" +
-    "      </ul>\n" +
-    "  </div>\n" +
-    "");
-}]);
-
-angular.module("app/components/settings/settings.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("app/components/settings/settings.html",
+angular.module("app/components/info/info.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("app/components/info/info.html",
     "<div class=\"detail\">\n" +
     "    <h2>Docker Information</h2>\n" +
     "    <div>\n" +
@@ -1514,31 +1499,97 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache
     "                <td>{{ info.Debug }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>NFd:</td>\n" +
+    "                <td>CPUs:</td>\n" +
+    "                <td>{{ info.NCPU }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Total Memory:</td>\n" +
+    "                <td>{{ info.MemTotal|humansize }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Operating System:</td>\n" +
+    "                <td>{{ info.OperatingSystem }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Kernel Version:</td>\n" +
+    "                <td>{{ info.KernelVersion }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>ID:</td>\n" +
+    "                <td>{{ info.ID }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Labels:</td>\n" +
+    "                <td>{{ info.Labels }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>File Descriptors:</td>\n" +
     "                <td>{{ info.NFd }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>NGoroutines:</td>\n" +
+    "                <td>Goroutines:</td>\n" +
     "                <td>{{ info.NGoroutines }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>MemoryLimit:</td>\n" +
+    "                <td>Storage Driver:</td>\n" +
+    "                <td>{{ info.Driver }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Storage Driver Status:</td>\n" +
+    "                <td>{{ info.DriverStatus }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Execution Driver:</td>\n" +
+    "                <td>{{ info.ExecutionDriver }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>IPv4 Forwarding:</td>\n" +
+    "                <td>{{ info.IPv4Forwarding }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Index Server Address:</td>\n" +
+    "                <td>{{ info.IndexServerAddress }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Init Path:</td>\n" +
+    "                <td>{{ info.InitPath }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Docker Root Directory:</td>\n" +
+    "                <td>{{ info.DockerRootDir }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Init SHA1</td>\n" +
+    "                <td>{{ info.InitSha1 }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Memory Limit:</td>\n" +
     "                <td>{{ info.MemoryLimit }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>SwapLimit:</td>\n" +
+    "                <td>Swap Limit:</td>\n" +
     "                <td>{{ info.SwapLimit }}</td>\n" +
     "            </tr>\n" +
-    "            <tr>\n" +
-    "                <td>NFd:</td>\n" +
-    "                <td>{{ info.NFd }}</td>\n" +
-    "            </tr>\n" +
     "        </tbody>\n" +
     "    </table>\n" +
     "</div>\n" +
     "");
 }]);
 
+angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("app/components/masthead/masthead.html",
+    "  <div class=\"masthead\">\n" +
+    "    <h3 class=\"text-muted\">DockerUI</h3>\n" +
+    "      <ul class=\"nav well\">\n" +
+    "        <li><a href=\"#\">Dashboard</a></li>\n" +
+    "        <li><a href=\"#/containers/\">Containers</a></li>\n" +
+    "        <li><a href=\"#/images/\">Images</a></li>\n" +
+    "        <li><a href=\"#/info/\">Info</a></li>\n" +
+    "      </ul>\n" +
+    "  </div>\n" +
+    "");
+}]);
+
 angular.module("app/components/sidebar/sidebar.html", []).run(["$templateCache", function($templateCache) {
   $templateCache.put("app/components/sidebar/sidebar.html",
     "<div class=\"well\">\n" +
diff --git a/dist/templates/app.js b/dist/templates/app.js
index 2ca118ea2..0b37aad0d 100644
--- a/dist/templates/app.js
+++ b/dist/templates/app.js
@@ -1,4 +1,4 @@
-angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/masthead/masthead.html', 'app/components/settings/settings.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
+angular.module('dockerui.templates', ['app/components/builder/builder.html', 'app/components/container/container.html', 'app/components/containerLogs/containerlogs.html', 'app/components/containers/containers.html', 'app/components/dashboard/dashboard.html', 'app/components/footer/statusbar.html', 'app/components/image/image.html', 'app/components/images/images.html', 'app/components/info/info.html', 'app/components/masthead/masthead.html', 'app/components/sidebar/sidebar.html', 'app/components/startContainer/startcontainer.html']);
 
 angular.module("app/components/builder/builder.html", []).run(["$templateCache", function($templateCache) {
   $templateCache.put("app/components/builder/builder.html",
@@ -219,8 +219,7 @@ angular.module("app/components/containers/containers.html", []).run(["$templateC
     "    </ul>\n" +
     "\n" +
     "    <div class=\"pull-right\">\n" +
-    "        <input type=\"checkbox\" ng-model=\"displayAll\" \n" +
-    "            ng-change=\"toggleGetAll()\"/> Display All\n" +
+    "        <input type=\"checkbox\" ng-model=\"displayAll\" id=\"displayAll\" ng-change=\"toggleGetAll()\"/> <label for=\"displayAll\">Display All</label>\n" +
     "    </div>\n" +
     "</div>\n" +
     "<table class=\"table table-striped\">\n" +
@@ -337,40 +336,40 @@ angular.module("app/components/image/image.html", []).run(["$templateCache", fun
     "         <tbody>\n" +
     "            <tr>\n" +
     "                <td>Created:</td>\n" +
-    "                <td>{{ image.created }}</td>\n" +
+    "                <td>{{ image.Created }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Parent:</td>\n" +
-    "                <td><a href=\"#/images/{{ image.parent }}/\">{{ image.parent }}</a></td>\n" +
+    "                <td><a href=\"#/images/{{ image.Parent }}/\">{{ image.Parent }}</a></td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>Size:</td>\n" +
-    "                <td>{{ image.Size|humansize }}</td>\n" +
+    "                <td>Size (Virtual Size):</td>\n" +
+    "                <td>{{ image.Size|humansize }} ({{ image.VirtualSize|humansize }})</td>\n" +
     "            </tr>\n" +
     "\n" +
     "            <tr>\n" +
     "                <td>Hostname:</td>\n" +
-    "                <td>{{ image.container_config.Hostname }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Hostname }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>User:</td>\n" +
-    "                <td>{{ image.container_config.User }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.User }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Cmd:</td>\n" +
-    "                <td>{{ image.container_config.Cmd }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Cmd }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Volumes:</td>\n" +
-    "                <td>{{ image.container_config.Volumes }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.Volumes }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
     "                <td>Volumes from:</td>\n" +
-    "                <td>{{ image.container_config.VolumesFrom }}</td>\n" +
+    "                <td>{{ image.ContainerConfig.VolumesFrom }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>Comment:</td>\n" +
-    "                <td>{{ image.comment }}</td>\n" +
+    "                <td>Built with:</td>\n" +
+    "                <td>Docker {{ image.DockerVersion }} on {{ image.Os}}, {{ image.Architecture }}</td>\n" +
     "            </tr>\n" +
     "\n" +
     "        </tbody>\n" +
@@ -460,22 +459,8 @@ angular.module("app/components/images/images.html", []).run(["$templateCache", f
     "");
 }]);
 
-angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("app/components/masthead/masthead.html",
-    "  <div class=\"masthead\">\n" +
-    "    <h3 class=\"text-muted\">DockerUI</h3>\n" +
-    "      <ul class=\"nav well\">\n" +
-    "        <li><a href=\"#\">Dashboard</a></li>\n" +
-    "        <li><a href=\"#/containers/\">Containers</a></li>\n" +
-    "        <li><a href=\"#/images/\">Images</a></li>\n" +
-    "        <li><a href=\"#/settings/\">Settings</a></li>\n" +
-    "      </ul>\n" +
-    "  </div>\n" +
-    "");
-}]);
-
-angular.module("app/components/settings/settings.html", []).run(["$templateCache", function($templateCache) {
-  $templateCache.put("app/components/settings/settings.html",
+angular.module("app/components/info/info.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("app/components/info/info.html",
     "<div class=\"detail\">\n" +
     "    <h2>Docker Information</h2>\n" +
     "    <div>\n" +
@@ -503,31 +488,97 @@ angular.module("app/components/settings/settings.html", []).run(["$templateCache
     "                <td>{{ info.Debug }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>NFd:</td>\n" +
+    "                <td>CPUs:</td>\n" +
+    "                <td>{{ info.NCPU }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Total Memory:</td>\n" +
+    "                <td>{{ info.MemTotal|humansize }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Operating System:</td>\n" +
+    "                <td>{{ info.OperatingSystem }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Kernel Version:</td>\n" +
+    "                <td>{{ info.KernelVersion }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>ID:</td>\n" +
+    "                <td>{{ info.ID }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Labels:</td>\n" +
+    "                <td>{{ info.Labels }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>File Descriptors:</td>\n" +
     "                <td>{{ info.NFd }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>NGoroutines:</td>\n" +
+    "                <td>Goroutines:</td>\n" +
     "                <td>{{ info.NGoroutines }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>MemoryLimit:</td>\n" +
+    "                <td>Storage Driver:</td>\n" +
+    "                <td>{{ info.Driver }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Storage Driver Status:</td>\n" +
+    "                <td>{{ info.DriverStatus }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Execution Driver:</td>\n" +
+    "                <td>{{ info.ExecutionDriver }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>IPv4 Forwarding:</td>\n" +
+    "                <td>{{ info.IPv4Forwarding }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Index Server Address:</td>\n" +
+    "                <td>{{ info.IndexServerAddress }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Init Path:</td>\n" +
+    "                <td>{{ info.InitPath }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Docker Root Directory:</td>\n" +
+    "                <td>{{ info.DockerRootDir }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Init SHA1</td>\n" +
+    "                <td>{{ info.InitSha1 }}</td>\n" +
+    "            </tr>\n" +
+    "            <tr>\n" +
+    "                <td>Memory Limit:</td>\n" +
     "                <td>{{ info.MemoryLimit }}</td>\n" +
     "            </tr>\n" +
     "            <tr>\n" +
-    "                <td>SwapLimit:</td>\n" +
+    "                <td>Swap Limit:</td>\n" +
     "                <td>{{ info.SwapLimit }}</td>\n" +
     "            </tr>\n" +
-    "            <tr>\n" +
-    "                <td>NFd:</td>\n" +
-    "                <td>{{ info.NFd }}</td>\n" +
-    "            </tr>\n" +
     "        </tbody>\n" +
     "    </table>\n" +
     "</div>\n" +
     "");
 }]);
 
+angular.module("app/components/masthead/masthead.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("app/components/masthead/masthead.html",
+    "  <div class=\"masthead\">\n" +
+    "    <h3 class=\"text-muted\">DockerUI</h3>\n" +
+    "      <ul class=\"nav well\">\n" +
+    "        <li><a href=\"#\">Dashboard</a></li>\n" +
+    "        <li><a href=\"#/containers/\">Containers</a></li>\n" +
+    "        <li><a href=\"#/images/\">Images</a></li>\n" +
+    "        <li><a href=\"#/info/\">Info</a></li>\n" +
+    "      </ul>\n" +
+    "  </div>\n" +
+    "");
+}]);
+
 angular.module("app/components/sidebar/sidebar.html", []).run(["$templateCache", function($templateCache) {
   $templateCache.put("app/components/sidebar/sidebar.html",
     "<div class=\"well\">\n" +