diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/view.html b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
index 4ada52c03d..45f837c15d 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
@@ -10,7 +10,7 @@
             <div class="col-sm-12">
                 <div>
                     <span class="fake-link" aria-hidden="true">&#9664;</span>
-                    <a class="back-nav" ng-if="vm.selectedExceptionGroup.parentTitle" href="#/endpoint_details/{{vm.selectedExceptionGroup.parentTitle}}/{{vm.selectedExceptionGroup.parentGroupIndex}}/">{{vm.selectedExceptionGroup.parentTitle}} endpoint</a>
+                    <a class="back-nav" ng-if="vm.selectedExceptionGroup.parentTitle" href="#/monitoring/endpoint/{{vm.selectedExceptionGroup.parentTitle}}/{{vm.selectedExceptionGroup.parentGroupIndex}}/">{{vm.selectedExceptionGroup.parentTitle}} endpoint</a>
                     <a class="back-nav" ng-if="!vm.selectedExceptionGroup.parentTitle" href="#/failed-messages/groups">Failed message groups list</a>
                 </div>
                 <div ng-show="!vm.selectedExceptionGroup.id" class="active">All failed messages ({{vm.failedMessages.length}} / {{vm.selectedExceptionGroup.count}} | number)</div>
diff --git a/src/ServicePulse.Host/app/layout/navbar.html b/src/ServicePulse.Host/app/layout/navbar.html
index f06ffc0034..37d2a304a0 100644
--- a/src/ServicePulse.Host/app/layout/navbar.html
+++ b/src/ServicePulse.Host/app/layout/navbar.html
@@ -22,8 +22,8 @@
                 </li>
 
 
-                <li ng-if="isMonitoringEnabled" ng-class="{ active: isActive('/monitored_endpoints') || isActive('/endpoint_details') }">
-                    <a href="#/monitored_endpoints">
+                <li ng-if="isMonitoringEnabled" ng-class="{ active: isActive('/monitoring') || isActive('/monitoring/endpoint') }">
+                    <a href="#/monitoring">
                         <i class="fa fa-heartbeat icon-white"></i>
                         <span class="navbar-label">Monitoring</span>
                     </a>
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js
index b099aa51a3..20bca47672 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.controller.js
@@ -43,7 +43,7 @@
         }
 
         $scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) {
-            return `#/endpoint_details/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`;
+            return `#/monitoring/endpoint/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`;
         };
 
         $scope.showInstancesBreakdownTab = function(isVisible) {
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.route.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.route.js
index 5b7db915da..7c8ced8a4a 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.route.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.route.js
@@ -4,7 +4,7 @@
     function routeProvider($routeProvider) {
         let template = require('./../views/endpoint_details.html');
 
-        $routeProvider.when('/endpoint_details/:endpointName/:sourceIndex', {
+        $routeProvider.when('/monitoring/endpoint/:endpointName/:sourceIndex', {
             data: {
                 pageTitle: 'Endpoint Details'
             },
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.controller.js b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.controller.js
index 5289af6424..50822a9f50 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.controller.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.controller.js
@@ -27,7 +27,7 @@
         };
 
         $scope.getDetailsUrl = endpoint => {
-            return '#/endpoint_details/' + endpoint.name + '/' + (endpoint.sourceIndex | 0) + '?historyPeriod=' + $scope.selectedPeriod.value;
+            return '#/monitoring/endpoint/' + endpoint.name + '/' + (endpoint.sourceIndex | 0) + '?historyPeriod=' + $scope.selectedPeriod.value;
         };
 
         function fillDisplayValuesForEndpoint(endpoint) {
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.route.js b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.route.js
index 66b70679f7..21ef78f7a1 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.route.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.route.js
@@ -4,7 +4,7 @@
     function routeProvider($routeProvider) {
         let template = require('./../views/monitored_endpoints.html');
 
-        $routeProvider.when('/monitored_endpoints', {
+        $routeProvider.when('/monitoring', {
             data: {
                 pageTitle: 'Monitored Endpoints'
             },
diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
index f4a52216c3..a14931f1e1 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
+++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
@@ -5,7 +5,7 @@
     <div class="row monitoring-head" ng-if="!loading">
         <div class="back-nav">
             <span class="fake-link" aria-hidden="true">&#9664;</span>
-            <a href="/#/monitored_endpoints">All endpoints</a>
+            <a href="/#/monitoring">All endpoints</a>
         </div>
         <div class="col-xs-9 no-side-padding list-section ">
             <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
diff --git a/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html b/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
index f7fe4e0cb3..48ef1efbd9 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
+++ b/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
@@ -6,7 +6,7 @@ <h1>Endpoints overview</h1>
         <div class="col-xs-3 no-side-padding toolbar-menus">
             <ul class="nav nav-pills period-selector">
                 <li role="presentation" ng-repeat="period in periods" ng-class="(period.value == selectedPeriod.value ? 'active' : 'notselected')">
-                    <a ng-click="selectPeriod(period)" href="#/monitored_endpoints?historyPeriod={{period.value}}">{{period.text}}</a>
+                    <a ng-click="selectPeriod(period)" href="#/monitoring?historyPeriod={{period.value}}">{{period.text}}</a>
                 </li>
             </ul>
         </div>