diff --git a/app/components/auth/authController.js b/app/components/auth/authController.js
index a20d0ccb7..81a7fc05d 100644
--- a/app/components/auth/authController.js
+++ b/app/components/auth/authController.js
@@ -1,6 +1,6 @@
 angular.module('auth', [])
-.controller('AuthenticationController', ['$scope', '$state', '$stateParams', '$window', '$timeout', '$sanitize', 'Authentication', 'Users', 'UserService', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'SettingsService',
-function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Authentication, Users, UserService, EndpointService, StateManager, EndpointProvider, Notifications, SettingsService) {
+.controller('AuthenticationController', ['$scope', '$state', '$transition$', '$window', '$timeout', '$sanitize', 'Authentication', 'Users', 'UserService', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'SettingsService',
+function ($scope, $state, $transition$, $window, $timeout, $sanitize, Authentication, Users, UserService, EndpointService, StateManager, EndpointProvider, Notifications, SettingsService) {
 
   $scope.logo = StateManager.getState().application.logo;
 
@@ -88,9 +88,9 @@ function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Authentica
   };
 
   function initView() {
-    if ($stateParams.logout || $stateParams.error) {
+    if ($transition$.params().logout || $transition$.params().error) {
       Authentication.logout();
-      $scope.state.AuthenticationError = $stateParams.error;
+      $scope.state.AuthenticationError = $transition$.params().error;
       return;
     }
 
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js
index 1908aa8d4..2ab871f48 100644
--- a/app/components/container/containerController.js
+++ b/app/components/container/containerController.js
@@ -1,6 +1,6 @@
 angular.module('container', [])
-.controller('ContainerController', ['$q', '$scope', '$state','$stateParams', '$filter', 'Container', 'ContainerCommit', 'ContainerHelper', 'ContainerService', 'ImageHelper', 'Network', 'NetworkService', 'Notifications', 'Pagination', 'ModalService', 'ResourceControlService', 'RegistryService', 'ImageService',
-function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit, ContainerHelper, ContainerService, ImageHelper, Network, NetworkService, Notifications, Pagination, ModalService, ResourceControlService, RegistryService, ImageService) {
+.controller('ContainerController', ['$q', '$scope', '$state','$transition$', '$filter', 'Container', 'ContainerCommit', 'ContainerHelper', 'ContainerService', 'ImageHelper', 'Network', 'NetworkService', 'Notifications', 'Pagination', 'ModalService', 'ResourceControlService', 'RegistryService', 'ImageService',
+function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit, ContainerHelper, ContainerService, ImageHelper, Network, NetworkService, Notifications, Pagination, ModalService, ResourceControlService, RegistryService, ImageService) {
   $scope.activityTime = 0;
   $scope.portBindings = [];
   $scope.config = {
@@ -16,7 +16,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   var update = function () {
     $('#loadingViewSpinner').show();
-    Container.get({id: $stateParams.id}, function (d) {
+    Container.get({id: $transition$.params().id}, function (d) {
       var container = new ContainerDetailsViewModel(d);
       $scope.container = container;
       $scope.container.edit = false;
@@ -52,7 +52,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
     $('#loadingViewSpinner').show();
     Container.start({id: $scope.container.Id}, {}, function (d) {
       update();
-      Notifications.success('Container started', $stateParams.id);
+      Notifications.success('Container started', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to start container');
@@ -61,9 +61,9 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.stop = function () {
     $('#loadingViewSpinner').show();
-    Container.stop({id: $stateParams.id}, function (d) {
+    Container.stop({id: $transition$.params().id}, function (d) {
       update();
-      Notifications.success('Container stopped', $stateParams.id);
+      Notifications.success('Container stopped', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to stop container');
@@ -72,9 +72,9 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.kill = function () {
     $('#loadingViewSpinner').show();
-    Container.kill({id: $stateParams.id}, function (d) {
+    Container.kill({id: $transition$.params().id}, function (d) {
       update();
-      Notifications.success('Container killed', $stateParams.id);
+      Notifications.success('Container killed', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to kill container');
@@ -86,10 +86,10 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
     var image = $scope.config.Image;
     var registry = $scope.config.Registry;
     var imageConfig = ImageHelper.createImageConfigForCommit(image, registry.URL);
-    ContainerCommit.commit({id: $stateParams.id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) {
+    ContainerCommit.commit({id: $transition$.params().id, tag: imageConfig.tag, repo: imageConfig.repo}, function (d) {
       $('#createImageSpinner').hide();
       update();
-      Notifications.success('Container commited', $stateParams.id);
+      Notifications.success('Container commited', $transition$.params().id);
     }, function (e) {
       $('#createImageSpinner').hide();
       update();
@@ -99,9 +99,9 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.pause = function () {
     $('#loadingViewSpinner').show();
-    Container.pause({id: $stateParams.id}, function (d) {
+    Container.pause({id: $transition$.params().id}, function (d) {
       update();
-      Notifications.success('Container paused', $stateParams.id);
+      Notifications.success('Container paused', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to pause container');
@@ -110,9 +110,9 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.unpause = function () {
     $('#loadingViewSpinner').show();
-    Container.unpause({id: $stateParams.id}, function (d) {
+    Container.unpause({id: $transition$.params().id}, function (d) {
       update();
-      Notifications.success('Container unpaused', $stateParams.id);
+      Notifications.success('Container unpaused', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to unpause container');
@@ -154,9 +154,9 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.restart = function () {
     $('#loadingViewSpinner').show();
-    Container.restart({id: $stateParams.id}, function (d) {
+    Container.restart({id: $transition$.params().id}, function (d) {
       update();
-      Notifications.success('Container restarted', $stateParams.id);
+      Notifications.success('Container restarted', $transition$.params().id);
     }, function (e) {
       update();
       Notifications.error('Failure', e, 'Unable to restart container');
@@ -165,7 +165,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.renameContainer = function () {
     var container = $scope.container;
-    Container.rename({id: $stateParams.id, 'name': container.newContainerName}, function (d) {
+    Container.rename({id: $transition$.params().id, 'name': container.newContainerName}, function (d) {
       if (d.message) {
         container.newContainerName = container.Name;
         Notifications.error('Unable to rename container', {}, d.message);
@@ -181,14 +181,14 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.containerLeaveNetwork = function containerLeaveNetwork(container, networkId) {
     $('#loadingViewSpinner').show();
-    Network.disconnect({id: networkId}, { Container: $stateParams.id, Force: false }, function (d) {
+    Network.disconnect({id: networkId}, { Container: $transition$.params().id, Force: false }, function (d) {
       if (container.message) {
         $('#loadingViewSpinner').hide();
         Notifications.error('Error', d, 'Unable to disconnect container from network');
       } else {
         $('#loadingViewSpinner').hide();
-        Notifications.success('Container left network', $stateParams.id);
-        $state.go('container', {id: $stateParams.id}, {reload: true});
+        Notifications.success('Container left network', $transition$.params().id);
+        $state.go('container', {id: $transition$.params().id}, {reload: true});
       }
     }, function (e) {
       $('#loadingViewSpinner').hide();
@@ -199,7 +199,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
   $scope.duplicate = function() {
     ModalService.confirmExperimentalFeature(function (experimental) {
       if(!experimental) { return; }
-      $state.go('actions.create.container', {from: $stateParams.id}, {reload: true});
+      $state.go('actions.create.container', {from: $transition$.params().id}, {reload: true});
     });
   };
 
@@ -280,14 +280,14 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerCommit,
 
   $scope.containerJoinNetwork = function containerJoinNetwork(container, networkId) {
     $('#joinNetworkSpinner').show();
-    Network.connect({id: networkId}, { Container: $stateParams.id }, function (d) {
+    Network.connect({id: networkId}, { Container: $transition$.params().id }, function (d) {
       if (container.message) {
         $('#joinNetworkSpinner').hide();
         Notifications.error('Error', d, 'Unable to connect container to network');
       } else {
         $('#joinNetworkSpinner').hide();
-        Notifications.success('Container joined network', $stateParams.id);
-        $state.go('container', {id: $stateParams.id}, {reload: true});
+        Notifications.success('Container joined network', $transition$.params().id);
+        $state.go('container', {id: $transition$.params().id}, {reload: true});
       }
     }, function (e) {
       $('#joinNetworkSpinner').hide();
diff --git a/app/components/containerConsole/containerConsoleController.js b/app/components/containerConsole/containerConsoleController.js
index aa37611f4..949a72f12 100644
--- a/app/components/containerConsole/containerConsoleController.js
+++ b/app/components/containerConsole/containerConsoleController.js
@@ -1,6 +1,6 @@
 angular.module('containerConsole', [])
-.controller('ContainerConsoleController', ['$scope', '$stateParams', 'Container', 'Image', 'EndpointProvider', 'Notifications', 'ContainerHelper', 'ContainerService', 'ExecService',
-function ($scope, $stateParams, Container, Image, EndpointProvider, Notifications, ContainerHelper, ContainerService, ExecService) {
+.controller('ContainerConsoleController', ['$scope', '$transition$', 'Container', 'Image', 'EndpointProvider', 'Notifications', 'ContainerHelper', 'ContainerService', 'ExecService',
+function ($scope, $transition$, Container, Image, EndpointProvider, Notifications, ContainerHelper, ContainerService, ExecService) {
   $scope.state = {};
   $scope.state.loaded = false;
   $scope.state.connected = false;
@@ -15,7 +15,7 @@ function ($scope, $stateParams, Container, Image, EndpointProvider, Notification
     }
   });
 
-  Container.get({id: $stateParams.id}, function(d) {
+  Container.get({id: $transition$.params().id}, function(d) {
     $scope.container = d;
     if (d.message) {
       Notifications.error('Error', d, 'Unable to retrieve container details');
@@ -43,7 +43,7 @@ function ($scope, $stateParams, Container, Image, EndpointProvider, Notification
     var command = $scope.formValues.isCustomCommand ?
                     $scope.formValues.customCommand : $scope.formValues.command;
     var execConfig = {
-      id: $stateParams.id,
+      id: $transition$.params().id,
       AttachStdin: true,
       AttachStdout: true,
       AttachStderr: true,
diff --git a/app/components/containerLogs/containerLogsController.js b/app/components/containerLogs/containerLogsController.js
index 86c2eb398..ced15ee57 100644
--- a/app/components/containerLogs/containerLogsController.js
+++ b/app/components/containerLogs/containerLogsController.js
@@ -1,6 +1,6 @@
 angular.module('containerLogs', [])
-.controller('ContainerLogsController', ['$scope', '$stateParams', '$anchorScroll', 'ContainerLogs', 'Container',
-function ($scope, $stateParams, $anchorScroll, ContainerLogs, Container) {
+.controller('ContainerLogsController', ['$scope', '$transition$', '$anchorScroll', 'ContainerLogs', 'Container',
+function ($scope, $transition$, $anchorScroll, ContainerLogs, Container) {
   $scope.state = {};
   $scope.state.displayTimestampsOut = false;
   $scope.state.displayTimestampsErr = false;
@@ -9,7 +9,7 @@ function ($scope, $stateParams, $anchorScroll, ContainerLogs, Container) {
   $scope.tailLines = 2000;
 
   $('#loadingViewSpinner').show();
-  Container.get({id: $stateParams.id}, function (d) {
+  Container.get({id: $transition$.params().id}, function (d) {
     $scope.container = d;
     $('#loadingViewSpinner').hide();
   }, function (e) {
@@ -25,7 +25,7 @@ function ($scope, $stateParams, $anchorScroll, ContainerLogs, Container) {
   }
 
   function getLogsStderr() {
-    ContainerLogs.get($stateParams.id, {
+    ContainerLogs.get($transition$.params().id, {
       stdout: 0,
       stderr: 1,
       timestamps: $scope.state.displayTimestampsErr,
@@ -41,7 +41,7 @@ function ($scope, $stateParams, $anchorScroll, ContainerLogs, Container) {
   }
 
   function getLogsStdout() {
-    ContainerLogs.get($stateParams.id, {
+    ContainerLogs.get($transition$.params().id, {
       stdout: 1,
       stderr: 0,
       timestamps: $scope.state.displayTimestampsOut,
diff --git a/app/components/containerStats/containerStatsController.js b/app/components/containerStats/containerStatsController.js
index a48383507..2992c04f5 100644
--- a/app/components/containerStats/containerStatsController.js
+++ b/app/components/containerStats/containerStatsController.js
@@ -1,6 +1,6 @@
 angular.module('containerStats', [])
-.controller('ContainerStatsController', ['$q', '$scope', '$stateParams', '$document', '$interval', 'ContainerService', 'ChartService', 'Notifications', 'Pagination',
-function ($q, $scope, $stateParams, $document, $interval, ContainerService, ChartService, Notifications, Pagination) {
+.controller('ContainerStatsController', ['$q', '$scope', '$transition$', '$document', '$interval', 'ContainerService', 'ChartService', 'Notifications', 'Pagination',
+function ($q, $scope, $transition$, $document, $interval, ContainerService, ChartService, Notifications, Pagination) {
 
   $scope.state = {
     refreshRate: '5'
@@ -79,8 +79,8 @@ function ($q, $scope, $stateParams, $document, $interval, ContainerService, Char
   function startChartUpdate(networkChart, cpuChart, memoryChart) {
     $('#loadingViewSpinner').show();
     $q.all({
-      stats: ContainerService.containerStats($stateParams.id),
-      top: ContainerService.containerTop($stateParams.id)
+      stats: ContainerService.containerStats($transition$.params().id),
+      top: ContainerService.containerTop($transition$.params().id)
     })
     .then(function success(data) {
       var stats = data.stats;
@@ -103,8 +103,8 @@ function ($q, $scope, $stateParams, $document, $interval, ContainerService, Char
     var refreshRate = $scope.state.refreshRate;
     $scope.repeater = $interval(function() {
       $q.all({
-        stats: ContainerService.containerStats($stateParams.id),
-        top: ContainerService.containerTop($stateParams.id)
+        stats: ContainerService.containerStats($transition$.params().id),
+        top: ContainerService.containerTop($transition$.params().id)
       })
       .then(function success(data) {
         var stats = data.stats;
@@ -139,7 +139,7 @@ function ($q, $scope, $stateParams, $document, $interval, ContainerService, Char
   function initView() {
     $('#loadingViewSpinner').show();
 
-    ContainerService.container($stateParams.id)
+    ContainerService.container($transition$.params().id)
     .then(function success(data) {
       $scope.container = data;
     })
diff --git a/app/components/createContainer/createContainerController.js b/app/components/createContainer/createContainerController.js
index 5997747f7..a9da83b59 100644
--- a/app/components/createContainer/createContainerController.js
+++ b/app/components/createContainer/createContainerController.js
@@ -1,8 +1,8 @@
 // @@OLD_SERVICE_CONTROLLER: this service should be rewritten to use services.
 // See app/components/templates/templatesController.js as a reference.
 angular.module('createContainer', [])
-.controller('CreateContainerController', ['$q', '$scope', '$state', '$stateParams', '$filter', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'NetworkService', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'FormValidator', 'ModalService', 'RegistryService',
-function ($q, $scope, $state, $stateParams, $filter, Container, ContainerHelper, Image, ImageHelper, Volume, NetworkService, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, FormValidator, ModalService, RegistryService) {
+.controller('CreateContainerController', ['$q', '$scope', '$state', '$transition$', '$filter', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'NetworkService', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'FormValidator', 'ModalService', 'RegistryService',
+function ($q, $scope, $state, $transition$, $filter, Container, ContainerHelper, Image, ImageHelper, Volume, NetworkService, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, FormValidator, ModalService, RegistryService) {
 
   $scope.formValues = {
     alwaysPull: true,
@@ -418,7 +418,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerHelper,
 
   function loadFromContainerSpec() {
     // Get container
-    Container.get({ id: $stateParams.from }).$promise
+    Container.get({ id: $transition$.params().from }).$promise
     .then(function success(d) {
       var fromContainer = new ContainerDetailsViewModel(d);
       if (!fromContainer.ResourceControl) {
@@ -472,7 +472,7 @@ function ($q, $scope, $state, $stateParams, $filter, Container, ContainerHelper,
     Container.query({}, function (d) {
       var containers = d;
       $scope.runningContainers = containers;
-      if ($stateParams.from !== '') {
+      if ($transition$.params().from !== '') {
         loadFromContainerSpec();
       } else {
         $scope.fromContainer = {};
diff --git a/app/components/endpoint/endpointController.js b/app/components/endpoint/endpointController.js
index bb3803f93..6b353c9d8 100644
--- a/app/components/endpoint/endpointController.js
+++ b/app/components/endpoint/endpointController.js
@@ -1,6 +1,6 @@
 angular.module('endpoint', [])
-.controller('EndpointController', ['$scope', '$state', '$stateParams', '$filter', 'EndpointService', 'Notifications',
-function ($scope, $state, $stateParams, $filter, EndpointService, Notifications) {
+.controller('EndpointController', ['$scope', '$state', '$transition$', '$filter', 'EndpointService', 'Notifications',
+function ($scope, $state, $transition$, $filter, EndpointService, Notifications) {
 
   if (!$scope.applicationState.application.endpointManagement) {
     $state.go('endpoints');
@@ -51,7 +51,7 @@ function ($scope, $state, $stateParams, $filter, EndpointService, Notifications)
 
   function initView() {
     $('#loadingViewSpinner').show();
-    EndpointService.endpoint($stateParams.id)
+    EndpointService.endpoint($transition$.params().id)
     .then(function success(data) {
       var endpoint = data;
       endpoint.URL = $filter('stripprotocol')(endpoint.URL);
diff --git a/app/components/endpointAccess/endpointAccessController.js b/app/components/endpointAccess/endpointAccessController.js
index 413fded43..06206418a 100644
--- a/app/components/endpointAccess/endpointAccessController.js
+++ b/app/components/endpointAccess/endpointAccessController.js
@@ -1,14 +1,14 @@
 angular.module('endpointAccess', [])
-.controller('EndpointAccessController', ['$scope', '$stateParams', 'EndpointService', 'Notifications',
-function ($scope, $stateParams, EndpointService, Notifications) {
+.controller('EndpointAccessController', ['$scope', '$transition$', 'EndpointService', 'Notifications',
+function ($scope, $transition$, EndpointService, Notifications) {
 
   $scope.updateAccess = function(authorizedUsers, authorizedTeams) {
-    return EndpointService.updateAccess($stateParams.id, authorizedUsers, authorizedTeams);
+    return EndpointService.updateAccess($transition$.params().id, authorizedUsers, authorizedTeams);
   };
 
   function initView() {
     $('#loadingViewSpinner').show();
-    EndpointService.endpoint($stateParams.id)
+    EndpointService.endpoint($transition$.params().id)
     .then(function success(data) {
       $scope.endpoint = data;
     })
diff --git a/app/components/image/imageController.js b/app/components/image/imageController.js
index d76dfb356..394c7956a 100644
--- a/app/components/image/imageController.js
+++ b/app/components/image/imageController.js
@@ -1,6 +1,6 @@
 angular.module('image', [])
-.controller('ImageController', ['$q', '$scope', '$stateParams', '$state', '$timeout', 'ImageService', 'RegistryService', 'Notifications',
-function ($q, $scope, $stateParams, $state, $timeout, ImageService, RegistryService, Notifications) {
+.controller('ImageController', ['$q', '$scope', '$transition$', '$state', '$timeout', 'ImageService', 'RegistryService', 'Notifications',
+function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryService, Notifications) {
 	$scope.formValues = {
 		Image: '',
 		Registry: ''
@@ -25,10 +25,10 @@ function ($q, $scope, $stateParams, $state, $timeout, ImageService, RegistryServ
 		var image = $scope.formValues.Image;
 		var registry = $scope.formValues.Registry;
 
-		ImageService.tagImage($stateParams.id, image, registry.URL)
+		ImageService.tagImage($transition$.params().id, image, registry.URL)
 		.then(function success(data) {
 			Notifications.success('Image successfully tagged');
-			$state.go('image', {id: $stateParams.id}, {reload: true});
+			$state.go('image', {id: $transition$.params().id}, {reload: true});
 		})
 		.catch(function error(err) {
 			Notifications.error('Failure', err, 'Unable to tag image');
@@ -83,7 +83,7 @@ function ($q, $scope, $stateParams, $state, $timeout, ImageService, RegistryServ
 				$state.go('images', {}, {reload: true});
 			} else {
 				Notifications.success('Tag successfully deleted', repository);
-				$state.go('image', {id: $stateParams.id}, {reload: true});
+				$state.go('image', {id: $transition$.params().id}, {reload: true});
 			}
 		})
 		.catch(function error(err) {
@@ -113,8 +113,8 @@ function ($q, $scope, $stateParams, $state, $timeout, ImageService, RegistryServ
 		$('#loadingViewSpinner').show();
 		var endpointProvider = $scope.applicationState.endpoint.mode.provider;
 		$q.all({
-			image: ImageService.image($stateParams.id),
-			history: endpointProvider !== 'VMWARE_VIC' ? ImageService.history($stateParams.id) : []
+			image: ImageService.image($transition$.params().id),
+			history: endpointProvider !== 'VMWARE_VIC' ? ImageService.history($transition$.params().id) : []
 		})
 		.then(function success(data) {
 			$scope.image = data.image;
diff --git a/app/components/network/networkController.js b/app/components/network/networkController.js
index 0af567512..f4ea325e5 100644
--- a/app/components/network/networkController.js
+++ b/app/components/network/networkController.js
@@ -1,16 +1,16 @@
 angular.module('network', [])
-.controller('NetworkController', ['$scope', '$state', '$stateParams', '$filter', 'Network', 'NetworkService', 'Container', 'ContainerHelper', 'Notifications',
-function ($scope, $state, $stateParams, $filter, Network, NetworkService, Container, ContainerHelper, Notifications) {
+.controller('NetworkController', ['$scope', '$state', '$transition$', '$filter', 'Network', 'NetworkService', 'Container', 'ContainerHelper', 'Notifications',
+function ($scope, $state, $transition$, $filter, Network, NetworkService, Container, ContainerHelper, Notifications) {
 
   $scope.removeNetwork = function removeNetwork(networkId) {
     $('#loadingViewSpinner').show();
-    Network.remove({id: $stateParams.id}, function (d) {
+    Network.remove({id: $transition$.params().id}, function (d) {
       if (d.message) {
         $('#loadingViewSpinner').hide();
         Notifications.error('Error', d, 'Unable to remove network');
       } else {
         $('#loadingViewSpinner').hide();
-        Notifications.success('Network removed', $stateParams.id);
+        Notifications.success('Network removed', $transition$.params().id);
         $state.go('networks', {});
       }
     }, function (e) {
@@ -21,13 +21,13 @@ function ($scope, $state, $stateParams, $filter, Network, NetworkService, Contai
 
   $scope.containerLeaveNetwork = function containerLeaveNetwork(network, containerId) {
     $('#loadingViewSpinner').show();
-    Network.disconnect({id: $stateParams.id}, { Container: containerId, Force: false }, function (d) {
+    Network.disconnect({id: $transition$.params().id}, { Container: containerId, Force: false }, function (d) {
       if (d.message) {
         $('#loadingViewSpinner').hide();
         Notifications.error('Error', d, 'Unable to disconnect container from network');
       } else {
         $('#loadingViewSpinner').hide();
-        Notifications.success('Container left network', $stateParams.id);
+        Notifications.success('Container left network', $transition$.params().id);
         $state.go('network', {id: network.Id}, {reload: true});
       }
     }, function (e) {
@@ -68,7 +68,7 @@ function ($scope, $state, $stateParams, $filter, Network, NetworkService, Contai
         });
       } else {
         Container.query({
-          filters: {network: [$stateParams.id]}
+          filters: {network: [$transition$.params().id]}
         }, function success(data) {
           filterContainersInNetwork(network, data);
           $('#loadingViewSpinner').hide();
@@ -82,7 +82,7 @@ function ($scope, $state, $stateParams, $filter, Network, NetworkService, Contai
 
   function initView() {
     $('#loadingViewSpinner').show();
-    NetworkService.network($stateParams.id)
+    NetworkService.network($transition$.params().id)
     .then(function success(data) {
       $scope.network = data;
       var endpointProvider = $scope.applicationState.endpoint.mode.provider;
diff --git a/app/components/node/nodeController.js b/app/components/node/nodeController.js
index a417c462d..524038c49 100644
--- a/app/components/node/nodeController.js
+++ b/app/components/node/nodeController.js
@@ -1,8 +1,8 @@
 // @@OLD_SERVICE_CONTROLLER: this service should be rewritten to use services.
 // See app/components/templates/templatesController.js as a reference.
 angular.module('node', [])
-.controller('NodeController', ['$scope', '$state', '$stateParams', 'LabelHelper', 'Node', 'NodeHelper', 'Task', 'Pagination', 'Notifications',
-function ($scope, $state, $stateParams, LabelHelper, Node, NodeHelper, Task, Pagination, Notifications) {
+.controller('NodeController', ['$scope', '$state', '$transition$', 'LabelHelper', 'Node', 'NodeHelper', 'Task', 'Pagination', 'Notifications',
+function ($scope, $state, $transition$, LabelHelper, Node, NodeHelper, Task, Pagination, Notifications) {
 
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('node_tasks');
@@ -80,7 +80,7 @@ function ($scope, $state, $stateParams, LabelHelper, Node, NodeHelper, Task, Pag
   function loadNodeAndTasks() {
     $scope.loading = true;
     if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
-      Node.get({ id: $stateParams.id}, function(d) {
+      Node.get({ id: $transition$.params().id}, function(d) {
         if (d.message) {
           Notifications.error('Failure', e, 'Unable to inspect the node');
         } else {
diff --git a/app/components/registry/registryController.js b/app/components/registry/registryController.js
index 38dbd1b27..9c5adb82c 100644
--- a/app/components/registry/registryController.js
+++ b/app/components/registry/registryController.js
@@ -1,6 +1,6 @@
 angular.module('registry', [])
-.controller('RegistryController', ['$scope', '$state', '$stateParams', '$filter', 'RegistryService', 'Notifications',
-function ($scope, $state, $stateParams, $filter, RegistryService, Notifications) {
+.controller('RegistryController', ['$scope', '$state', '$transition$', '$filter', 'RegistryService', 'Notifications',
+function ($scope, $state, $transition$, $filter, RegistryService, Notifications) {
 
   $scope.updateRegistry = function() {
     $('#updateRegistrySpinner').show();
@@ -20,7 +20,7 @@ function ($scope, $state, $stateParams, $filter, RegistryService, Notifications)
 
   function initView() {
     $('#loadingViewSpinner').show();
-    var registryID = $stateParams.id;
+    var registryID = $transition$.params().id;
     RegistryService.registry(registryID)
     .then(function success(data) {
       $scope.registry = data;
diff --git a/app/components/registryAccess/registryAccessController.js b/app/components/registryAccess/registryAccessController.js
index 9c6efe719..89ce007ea 100644
--- a/app/components/registryAccess/registryAccessController.js
+++ b/app/components/registryAccess/registryAccessController.js
@@ -1,14 +1,14 @@
 angular.module('registryAccess', [])
-.controller('RegistryAccessController', ['$scope', '$stateParams', 'RegistryService', 'Notifications',
-function ($scope, $stateParams, RegistryService, Notifications) {
+.controller('RegistryAccessController', ['$scope', '$transition$', 'RegistryService', 'Notifications',
+function ($scope, $transition$, RegistryService, Notifications) {
 
   $scope.updateAccess = function(authorizedUsers, authorizedTeams) {
-    return RegistryService.updateAccess($stateParams.id, authorizedUsers, authorizedTeams);
+    return RegistryService.updateAccess($transition$.params().id, authorizedUsers, authorizedTeams);
   };
 
   function initView() {
     $('#loadingViewSpinner').show();
-    RegistryService.registry($stateParams.id)
+    RegistryService.registry($transition$.params().id)
     .then(function success(data) {
       $scope.registry = data;
     })
diff --git a/app/components/secret/secretController.js b/app/components/secret/secretController.js
index 48bfe970e..93944f8c4 100644
--- a/app/components/secret/secretController.js
+++ b/app/components/secret/secretController.js
@@ -1,6 +1,6 @@
 angular.module('secret', [])
-.controller('SecretController', ['$scope', '$stateParams', '$state', 'SecretService', 'Notifications',
-function ($scope, $stateParams, $state, SecretService, Notifications) {
+.controller('SecretController', ['$scope', '$transition$', '$state', 'SecretService', 'Notifications',
+function ($scope, $transition$, $state, SecretService, Notifications) {
 
   $scope.removeSecret = function removeSecret(secretId) {
     $('#loadingViewSpinner').show();
@@ -19,7 +19,7 @@ function ($scope, $stateParams, $state, SecretService, Notifications) {
 
   function initView() {
     $('#loadingViewSpinner').show();
-    SecretService.secret($stateParams.id)
+    SecretService.secret($transition$.params().id)
     .then(function success(data) {
       $scope.secret = data;
     })
diff --git a/app/components/secrets/secretsController.js b/app/components/secrets/secretsController.js
index 055aa07ee..1aa890504 100644
--- a/app/components/secrets/secretsController.js
+++ b/app/components/secrets/secretsController.js
@@ -1,6 +1,6 @@
 angular.module('secrets', [])
-.controller('SecretsController', ['$scope', '$stateParams', '$state', 'SecretService', 'Notifications', 'Pagination',
-function ($scope, $stateParams, $state, SecretService, Notifications, Pagination) {
+.controller('SecretsController', ['$scope', '$transition$', '$state', 'SecretService', 'Notifications', 'Pagination',
+function ($scope, $transition$, $state, SecretService, Notifications, Pagination) {
   $scope.state = {};
   $scope.state.selectedItemCount = 0;
   $scope.state.pagination_count = Pagination.getPaginationCount('secrets');
diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js
index 775525aa1..cf54ae214 100644
--- a/app/components/service/serviceController.js
+++ b/app/components/service/serviceController.js
@@ -1,6 +1,6 @@
 angular.module('service', [])
-.controller('ServiceController', ['$q', '$scope', '$stateParams', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'SecretService', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService',
-function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll, ServiceService, SecretService, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, Notifications, Pagination, ModalService) {
+.controller('ServiceController', ['$q', '$scope', '$transition$', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'SecretService', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService',
+function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll, ServiceService, SecretService, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, Notifications, Pagination, ModalService) {
 
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('service_tasks');
@@ -307,7 +307,7 @@ function ($q, $scope, $stateParams, $state, $location, $timeout, $anchorScroll,
   function initView() {
     $('#loadingViewSpinner').show();
     var apiVersion = $scope.applicationState.endpoint.apiVersion;
-    ServiceService.service($stateParams.id)
+    ServiceService.service($transition$.params().id)
     .then(function success(data) {
       var service = data;
       $scope.isUpdating = $scope.lastVersion >= service.Version;
diff --git a/app/components/serviceLogs/serviceLogsController.js b/app/components/serviceLogs/serviceLogsController.js
index 9895bbb6e..0c25122ac 100644
--- a/app/components/serviceLogs/serviceLogsController.js
+++ b/app/components/serviceLogs/serviceLogsController.js
@@ -1,6 +1,6 @@
 angular.module('serviceLogs', [])
-.controller('ServiceLogsController', ['$scope', '$stateParams', '$anchorScroll', 'ServiceLogs', 'Service',
-function ($scope, $stateParams, $anchorScroll, ServiceLogs, Service) {
+.controller('ServiceLogsController', ['$scope', '$transition$', '$anchorScroll', 'ServiceLogs', 'Service',
+function ($scope, $transition$, $anchorScroll, ServiceLogs, Service) {
   $scope.state = {};
   $scope.state.displayTimestampsOut = false;
   $scope.state.displayTimestampsErr = false;
@@ -16,7 +16,7 @@ function ($scope, $stateParams, $anchorScroll, ServiceLogs, Service) {
   }
 
   function getLogsStderr() {
-    ServiceLogs.get($stateParams.id, {
+    ServiceLogs.get($transition$.params().id, {
       stdout: 0,
       stderr: 1,
       timestamps: $scope.state.displayTimestampsErr,
@@ -32,7 +32,7 @@ function ($scope, $stateParams, $anchorScroll, ServiceLogs, Service) {
   }
 
   function getLogsStdout() {
-    ServiceLogs.get($stateParams.id, {
+    ServiceLogs.get($transition$.params().id, {
       stdout: 1,
       stderr: 0,
       timestamps: $scope.state.displayTimestampsOut,
@@ -49,7 +49,7 @@ function ($scope, $stateParams, $anchorScroll, ServiceLogs, Service) {
 
   function getService() {
     $('#loadingViewSpinner').show();
-    Service.get({id: $stateParams.id}, function (d) {
+    Service.get({id: $transition$.params().id}, function (d) {
       $scope.service = d;
       $('#loadingViewSpinner').hide();
     }, function (e) {
diff --git a/app/components/services/servicesController.js b/app/components/services/servicesController.js
index 0a75cd441..339adb3d1 100644
--- a/app/components/services/servicesController.js
+++ b/app/components/services/servicesController.js
@@ -1,6 +1,6 @@
 angular.module('services', [])
-.controller('ServicesController', ['$q', '$scope', '$stateParams', '$state', 'Service', 'ServiceService', 'ServiceHelper', 'Notifications', 'Pagination', 'Task', 'Node', 'NodeHelper', 'ModalService', 'ResourceControlService',
-function ($q, $scope, $stateParams, $state, Service, ServiceService, ServiceHelper, Notifications, Pagination, Task, Node, NodeHelper, ModalService, ResourceControlService) {
+.controller('ServicesController', ['$q', '$scope', '$transition$', '$state', 'Service', 'ServiceService', 'ServiceHelper', 'Notifications', 'Pagination', 'Task', 'Node', 'NodeHelper', 'ModalService', 'ResourceControlService',
+function ($q, $scope, $transition$, $state, Service, ServiceService, ServiceHelper, Notifications, Pagination, Task, Node, NodeHelper, ModalService, ResourceControlService) {
   $scope.state = {};
   $scope.state.selectedItemCount = 0;
   $scope.state.pagination_count = Pagination.getPaginationCount('services');
diff --git a/app/components/task/taskController.js b/app/components/task/taskController.js
index 819c8c0d6..39c41feb7 100644
--- a/app/components/task/taskController.js
+++ b/app/components/task/taskController.js
@@ -1,10 +1,10 @@
 angular.module('task', [])
-.controller('TaskController', ['$scope', '$stateParams', 'TaskService', 'Service', 'Notifications',
-function ($scope, $stateParams, TaskService, Service, Notifications) {
+.controller('TaskController', ['$scope', '$transition$', 'TaskService', 'Service', 'Notifications',
+function ($scope, $transition$, TaskService, Service, Notifications) {
 
   function initView() {
     $('#loadingViewSpinner').show();
-    TaskService.task($stateParams.id)
+    TaskService.task($transition$.params().id)
     .then(function success(data) {
       var task = data;
       $scope.task = task;
diff --git a/app/components/team/teamController.js b/app/components/team/teamController.js
index 694432253..ae57c2813 100644
--- a/app/components/team/teamController.js
+++ b/app/components/team/teamController.js
@@ -1,6 +1,6 @@
 angular.module('team', [])
-.controller('TeamController', ['$q', '$scope', '$state', '$stateParams', 'TeamService', 'UserService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication',
-function ($q, $scope, $state, $stateParams, TeamService, UserService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication) {
+.controller('TeamController', ['$q', '$scope', '$state', '$transition$', 'TeamService', 'UserService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication',
+function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication) {
 
   $scope.state = {
     pagination_count_users: Pagination.getPaginationCount('team_available_users'),
@@ -208,9 +208,9 @@ function ($q, $scope, $state, $stateParams, TeamService, UserService, TeamMember
     $('#loadingViewSpinner').show();
     $scope.isAdmin = Authentication.getUserDetails().role === 1 ? true: false;
     $q.all({
-      team: TeamService.team($stateParams.id),
+      team: TeamService.team($transition$.params().id),
       users: UserService.users(false),
-      memberships: TeamService.userMemberships($stateParams.id)
+      memberships: TeamService.userMemberships($transition$.params().id)
     })
     .then(function success(data) {
       var users = data.users;
diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js
index 347b11d9e..52a3c9de0 100644
--- a/app/components/templates/templatesController.js
+++ b/app/components/templates/templatesController.js
@@ -1,10 +1,10 @@
 angular.module('templates', [])
-.controller('TemplatesController', ['$scope', '$q', '$state', '$stateParams', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'Pagination', 'ResourceControlService', 'Authentication', 'FormValidator',
-function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, Pagination, ResourceControlService, Authentication, FormValidator) {
+.controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'Pagination', 'ResourceControlService', 'Authentication', 'FormValidator',
+function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, Pagination, ResourceControlService, Authentication, FormValidator) {
   $scope.state = {
     selectedTemplate: null,
     showAdvancedOptions: false,
-    hideDescriptions: $stateParams.hide_descriptions,
+    hideDescriptions: $transition$.params().hide_descriptions,
     formValidationError: '',
     filters: {
       Categories: '!',
@@ -145,7 +145,7 @@ function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, ContainerSer
   }
 
   function initTemplates() {
-    var templatesKey = $stateParams.key;
+    var templatesKey = $transition$.params().key;
     var provider = $scope.applicationState.endpoint.mode.provider;
     var apiVersion = $scope.applicationState.endpoint.apiVersion;
 
diff --git a/app/components/user/userController.js b/app/components/user/userController.js
index dfb3c0489..fcb6c76b3 100644
--- a/app/components/user/userController.js
+++ b/app/components/user/userController.js
@@ -1,6 +1,6 @@
 angular.module('user', [])
-.controller('UserController', ['$q', '$scope', '$state', '$stateParams', 'UserService', 'ModalService', 'Notifications', 'SettingsService',
-function ($q, $scope, $state, $stateParams, UserService, ModalService, Notifications, SettingsService) {
+.controller('UserController', ['$q', '$scope', '$state', '$transition$', 'UserService', 'ModalService', 'Notifications', 'SettingsService',
+function ($q, $scope, $state, $transition$, UserService, ModalService, Notifications, SettingsService) {
 
   $scope.state = {
     updatePasswordError: ''
@@ -72,7 +72,7 @@ function ($q, $scope, $state, $stateParams, UserService, ModalService, Notificat
   function initView() {
     $('#loadingViewSpinner').show();
     $q.all({
-      user: UserService.user($stateParams.id),
+      user: UserService.user($transition$.params().id),
       settings: SettingsService.publicSettings()
     })
     .then(function success(data) {
diff --git a/app/components/volume/volumeController.js b/app/components/volume/volumeController.js
index 2753d1b19..16c165980 100644
--- a/app/components/volume/volumeController.js
+++ b/app/components/volume/volumeController.js
@@ -1,12 +1,12 @@
 angular.module('volume', [])
-.controller('VolumeController', ['$scope', '$state', '$stateParams', 'VolumeService', 'Notifications',
-function ($scope, $state, $stateParams, VolumeService, Notifications) {
+.controller('VolumeController', ['$scope', '$state', '$transition$', 'VolumeService', 'Notifications',
+function ($scope, $state, $transition$, VolumeService, Notifications) {
 
   $scope.removeVolume = function removeVolume() {
     $('#loadingViewSpinner').show();
     VolumeService.remove($scope.volume)
     .then(function success(data) {
-      Notifications.success('Volume successfully removed', $stateParams.id);
+      Notifications.success('Volume successfully removed', $transition$.params().id);
       $state.go('volumes', {});
     })
     .catch(function error(err) {
@@ -19,7 +19,7 @@ function ($scope, $state, $stateParams, VolumeService, Notifications) {
 
   function initView() {
     $('#loadingViewSpinner').show();
-    VolumeService.volume($stateParams.id)
+    VolumeService.volume($transition$.params().id)
     .then(function success(data) {
       var volume = data;
       $scope.volume = volume;
diff --git a/app/routes.js b/app/routes.js
index a0359ea07..15db71679 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -154,6 +154,9 @@ function configureRoutes($stateProvider) {
         templateUrl: 'app/components/sidebar/sidebar.html',
         controller: 'SidebarController'
       }
+    },
+    params: {
+      from: ''
     }
   })
   .state('actions.create.network', {
diff --git a/bower.json b/bower.json
index 764a9fb4d..afb3365e0 100644
--- a/bower.json
+++ b/bower.json
@@ -27,7 +27,6 @@
     "angular": "~1.5.0",
     "angular-cookies": "~1.5.0",
     "angular-bootstrap": "~2.5.0",
-    "angular-ui-router": "^0.2.15",
     "angular-sanitize": "~1.5.0",
     "angular-mocks": "~1.5.0",
     "angular-resource": "~1.5.0",
@@ -50,7 +49,8 @@
     "toastr": "~2.1.3",
     "xterm.js": "~2.8.1",
     "chart.js": "~2.6.0",
-    "angularjs-slider": "^6.4.0"
+    "angularjs-slider": "^6.4.0",
+    "angular-ui-router": "~1.0.6"
   },
   "resolutions": {
     "angular": "1.5.11"