diff --git a/app/app.js b/app/app.js
index b1b59564b..c2e2758c7 100644
--- a/app/app.js
+++ b/app/app.js
@@ -4,7 +4,6 @@ angular.module('uifordocker', [
   'ui.router',
   'ui.select',
   'ngCookies',
-  'ngRoute',
   'ngSanitize',
   'dockerui.services',
   'dockerui.filters',
diff --git a/app/components/container/container.html b/app/components/container/container.html
index 61513b434..0c146d78c 100644
--- a/app/components/container/container.html
+++ b/app/components/container/container.html
@@ -61,8 +61,8 @@
             <button class="btn btn-danger" ng-click="remove()" ng-disabled="container.State.Running">Remove</button>
           </div>
           <div class="btn-group" role="group" aria-label="...">
-            <a class="btn btn-default" type="button" href="#/containers/{{ container.Id }}/stats">Stats</a>
-            <a class="btn btn-default" type="button" href="#/containers/{{ container.Id }}/logs">Logs</a>
+            <a class="btn btn-default" type="button" ui-sref="stats({id: container.Id})">Stats</a>
+            <a class="btn btn-default" type="button" ui-sref="logs({id: container.Id})">Logs</a>
           </div>
         </div>
         <div class="comment">
@@ -169,7 +169,7 @@
             </tr>
             <tr>
               <td>Image</td>
-              <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
+              <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
             </tr>
           </tbody>
         </table>
diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html
index cae437952..1a977a91e 100644
--- a/app/components/containers/containers.html
+++ b/app/components/containers/containers.html
@@ -34,35 +34,35 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()" /> Select</label></th>
               <th>
-                <a href="#/containers/" ng-click="order('Names')">
+                <a ui-sref="containers" ng-click="order('Names')">
                   Name
                   <span ng-show="sortType == 'Names' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Names' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Image')">
+                <a ui-sref="containers" ng-click="order('Image')">
                   Image
                   <span ng-show="sortType == 'Image' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Image' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Command')">
+                <a ui-sref="containers" ng-click="order('Command')">
                   Command
                   <span ng-show="sortType == 'Command' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Command' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Created')">
+                <a ui-sref="containers" ng-click="order('Created')">
                   Created
                   <span ng-show="sortType == 'Created' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Created' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Status')">
+                <a ui-sref="containers" ng-click="order('Status')">
                   Status
                   <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -73,8 +73,8 @@
           <tbody>
             <tr ng-repeat="container in (state.filteredContainers = ( containers | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="container.Checked" ng-change="selectItem(container)"/></td>
-              <td><a href="#/containers/{{ container.Id }}">{{ container|containername}}</a></td>
-              <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
+              <td><a ui-sref="container({id: container.Id})">{{ container|containername}}</a></td>
+              <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
               <td>{{ container.Command|truncate:40 }}</td>
               <td>{{ container.Created|getdate }}</td>
               <td><span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span></td>
diff --git a/app/components/image/image.html b/app/components/image/image.html
index 3c1a5dbd3..eeff8d7eb 100644
--- a/app/components/image/image.html
+++ b/app/components/image/image.html
@@ -61,7 +61,7 @@
             </tr>
             <tr>
               <td>Parent</td>
-              <td><a href="#/images/{{ image.Parent }}/">{{ image.Parent }}</a></td>
+              <td><a ui-sref="image({id: image.Parent})">{{ image.Parent }}</a></td>
             </tr>
             <tr>
               <td>Size (Virtual Size)</td>
diff --git a/app/components/images/images.html b/app/components/images/images.html
index ddaa8a574..4eb40b03e 100644
--- a/app/components/images/images.html
+++ b/app/components/images/images.html
@@ -27,28 +27,28 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()" /> Select</label></th>
               <th>
-                <a href="#/images/" ng-click="order('Id')">
+                <a ui-sref="images" ng-click="order('Id')">
                   Id
                   <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('RepoTags')">
+                <a ui-sref="images" ng-click="order('RepoTags')">
                   Repository
                   <span ng-show="sortType == 'RepoTags' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'RepoTags' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('VirtualSize')">
+                <a ui-sref="images" ng-click="order('VirtualSize')">
                   VirtualSize
                   <span ng-show="sortType == 'VirtualSize' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'VirtualSize' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('Created')">
+                <a ui-sref="images" ng-click="order('Created')">
                   Created
                   <span ng-show="sortType == 'Created' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Created' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -59,7 +59,7 @@
           <tbody>
             <tr ng-repeat="image in (state.filteredImages = (images | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="image.Checked" ng-change="selectItem(image)" /></td>
-              <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
+              <td><a ui-sref="image({id: image.Id})">{{ image.Id|truncate:20}}</a></td>
               <td>{{ image|repotag }}</td>
               <td>{{ image.VirtualSize|humansize }}</td>
               <td>{{ image.Created|getdate }}</td>
diff --git a/app/components/network/network.html b/app/components/network/network.html
index 7db1ce8d6..596dfc6bf 100644
--- a/app/components/network/network.html
+++ b/app/components/network/network.html
@@ -80,7 +80,7 @@
                 <table class="table table-striped" ng-repeat="(Id, container) in network.Containers">
                   <tr>
                     <td>Id</td>
-                    <td><a href="#/containers/{{ Id }}">{{ Id }}</a></td>
+                    <td><a ui-sref="container({id: Id})">{{ Id }}</a></td>
                   </tr>
                   <tr>
                     <td>EndpointID</td>
diff --git a/app/components/network/networkController.js b/app/components/network/networkController.js
index 19af7874f..cbfb7966c 100644
--- a/app/components/network/networkController.js
+++ b/app/components/network/networkController.js
@@ -1,5 +1,5 @@
-angular.module('network', []).config(['$routeProvider', function ($routeProvider) {
-}]).controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter',
+angular.module('network', [])
+.controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter',
 function ($scope, Network, ViewSpinner, Messages, $state, $stateParams, errorMsgFilter) {
 
   $scope.disconnect = function disconnect(networkId, containerId) {
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html
index 6cf6cd352..03dad45f6 100644
--- a/app/components/networks/networks.html
+++ b/app/components/networks/networks.html
@@ -28,49 +28,49 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()"/> Select</label></th>
               <th>
-                <a href="#/networks/" ng-click="order('Name')">
+                <a ui-sref="networks" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Id')">
+                <a ui-sref="networks" ng-click="order('Id')">
                   Id
                   <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Scope')">
+                <a ui-sref="networks" ng-click="order('Scope')">
                   Scope
                   <span ng-show="sortType == 'Scope' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Scope' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Driver')">
+                <a ui-sref="networks" ng-click="order('Driver')">
                   Driver
                   <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Driver')">
+                <a ui-sref="networks" ng-click="order('IPAM.Driver')">
                   IPAM Driver
                   <span ng-show="sortType == 'IPAM.Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Config[0].Subnet')">
+                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Subnet')">
                   IPAM Subnet
                   <span ng-show="sortType == 'IPAM.Config[0].Subnet' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Config[0].Subnet' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Config[0].Gateway')">
+                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Gateway')">
                   IPAM Gateway
                   <span ng-show="sortType == 'IPAM.Config[0].Gateway' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Config[0].Gateway' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -81,7 +81,7 @@
           <tbody>
             <tr ng-repeat="network in ( state.filteredNetworks = (networks | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="network.Checked" ng-change="selectItem(network)"/></td>
-              <td><a href="#/networks/{{ network.Id }}/">{{ network.Name|truncate:20}}</a></td>
+              <td><a ui-sref="network({id: network.Id})">{{ network.Name|truncate:20}}</a></td>
               <td>{{ network.Id }}</td>
               <td>{{ network.Scope }}</td>
               <td>{{ network.Driver }}</td>
diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html
index dae196656..d4a69b0d2 100644
--- a/app/components/swarm/swarm.html
+++ b/app/components/swarm/swarm.html
@@ -91,28 +91,28 @@
           <thead>
             <tr>
               <th>
-                <a href="#/swarm/" ng-click="order('Name')">
+                <a ui-sref="swarm" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('IP')">
+                <a ui-sref="swarm" ng-click="order('IP')">
                   IP
                   <span ng-show="sortType == 'IP' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IP' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('Containers')">
+                <a ui-sref="swarm" ng-click="order('Containers')">
                   Containers
                   <span ng-show="sortType == 'Containers' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Containers' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('Status')">
+                <a ui-sref="swarm" ng-click="order('Status')">
                   Status
                   <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html
index 1b3e84bd5..75db9fd3b 100644
--- a/app/components/volumes/volumes.html
+++ b/app/components/volumes/volumes.html
@@ -27,21 +27,21 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()"/> Select</label></th>
               <th>
-                <a href="#/volumes/" ng-click="order('Name')">
+                <a ui-sref="volumes" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/volumes/" ng-click="order('Driver')">
+                <a ui-sref="volumes" ng-click="order('Driver')">
                   Driver
                   <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/volumes/" ng-click="order('Mountpoint')">
+                <a ui-sref="volumes" ng-click="order('Mountpoint')">
                   Mountpoint
                   <span ng-show="sortType == 'Mountpoint' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Mountpoint' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js
index f7db7f797..750c683f7 100644
--- a/app/components/volumes/volumesController.js
+++ b/app/components/volumes/volumesController.js
@@ -1,6 +1,6 @@
 angular.module('volumes', [])
-.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', '$route', 'errorMsgFilter',
-function ($scope, Volume, ViewSpinner, Messages, $route, errorMsgFilter) {
+.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', 'errorMsgFilter',
+function ($scope, Volume, ViewSpinner, Messages, errorMsgFilter) {
   $scope.state = {};
   $scope.state.toggle = false;
   $scope.state.selectedItemCount = 0;
diff --git a/bower.json b/bower.json
index 147a4d56e..e7afb5e85 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,6 @@
     "angular-mocks": "~1.5.0",
     "angular-oboe": "*",
     "angular-resource": "~1.5.0",
-    "angular-route": "~1.5.0",
     "angular-ui-select": "~0.17.1",
     "bootstrap": "~3.3.6",
     "font-awesome": "~4.5.0",
diff --git a/gruntFile.js b/gruntFile.js
index 873b126c5..840ed3c6c 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -152,7 +152,6 @@ module.exports = function (grunt) {
                 src: ['bower_components/angular/angular.min.js',
                     'bower_components/angular-sanitize/angular-sanitize.min.js',
                     'bower_components/angular-cookies/angular-cookies.min.js',
-                    'bower_components/angular-route/angular-route.min.js',
                     'bower_components/angular-ui-router/release/angular-ui-router.min.js',
                     'bower_components/angular-resource/angular-resource.min.js',
                     'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
diff --git a/index.html b/index.html
index 3f92e0142..159c75c91 100644
--- a/index.html
+++ b/index.html
@@ -38,22 +38,22 @@
         </li>
         <li class="sidebar-title"><span>NAVIGATION</span></li>
         <li class="sidebar-list">
-          <a href="#">Dashboard <span class="menu-icon fa fa-tachometer"></span></a>
+          <a ui-sref="index">Dashboard <span class="menu-icon fa fa-tachometer"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/containers/">Containers <span class="menu-icon fa fa-server"></span></a>
+          <a ui-sref="containers">Containers <span class="menu-icon fa fa-server"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/images/">Images <span class="menu-icon fa fa-clone"></span></a>
+          <a ui-sref="images">Images <span class="menu-icon fa fa-clone"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/networks/">Networks <span class="menu-icon fa fa-sitemap"></span></a>
+          <a ui-sref="networks">Networks <span class="menu-icon fa fa-sitemap"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/volumes/">Volumes <span class="menu-icon fa fa-cubes"></span></a>
+          <a ui-sref="volumes">Volumes <span class="menu-icon fa fa-cubes"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/swarm/">Swarm <span class="menu-icon fa fa-object-group"></span></a>
+          <a ui-sref="swarm">Swarm <span class="menu-icon fa fa-object-group"></span></a>
         </li>
       </ul>
       <div class="sidebar-footer">