diff --git a/gitversionconfig.yaml b/gitversionconfig.yaml
index 7d0f415ce9..57985c8254 100644
--- a/gitversionconfig.yaml
+++ b/gitversionconfig.yaml
@@ -1,2 +1,2 @@
 assembly-versioning-scheme: MajorMinorPatch
-next-version: 1.14.0
+next-version: 1.15.0
diff --git a/src/ServicePulse.Host/ServicePulse.Host.csproj b/src/ServicePulse.Host/ServicePulse.Host.csproj
index 3b9fe88988..3b61a69655 100644
--- a/src/ServicePulse.Host/ServicePulse.Host.csproj
+++ b/src/ServicePulse.Host/ServicePulse.Host.csproj
@@ -105,6 +105,8 @@
     <Content Include="app\js\polyfill\array.prototype.find.js" />
     <Content Include="app\modules\modules.webpackconfig.builder.js" />
     <Content Include="app\modules\monitoring\js\constant.diagrams.js" />
+    <Content Include="app\modules\monitoring\js\directives\ui.particular.monitoringConnectivityStatus.js" />
+    <Content Include="app\modules\monitoring\js\directives\ui.particular.monitoringConnectivityStatus.tpl.html" />
     <Content Include="app\modules\monitoring\js\directives\ui.particular.graphdecimal.js" />
     <Content Include="app\modules\monitoring\js\directives\ui.particular.graphduration.js" />
     <Content Include="app\modules\monitoring\js\directives\ui.particular.largeGraph.js" />
diff --git a/src/ServicePulse.Host/app/css/particular.css b/src/ServicePulse.Host/app/css/particular.css
index 6a7fba1075..dc786fd00b 100644
--- a/src/ServicePulse.Host/app/css/particular.css
+++ b/src/ServicePulse.Host/app/css/particular.css
@@ -72,10 +72,6 @@ a {
         border-bottom: 5px solid #00A3C4;
     }
 
-    .navbar-label {
-        display: none;
-    }
-
     .navbar-nav > li > a {
         padding-bottom: 15px;
         padding-top: 20px;
@@ -99,24 +95,13 @@ body {
     color: #181919;
     overflow-y: scroll;
     padding-top: 100px;
+    padding-bottom: 100px;
 }
 
 pre {
     white-space: pre-wrap;
 }
 
-footer {
-    color: #bcc6c2;
-    font-size: 14px;
-    font-weight: normal;
-    height: 60px;
-    margin-top: 100px;
-    padding: 5px 0;
-    text-align: left;
-    text-align: center;
-    width: 100%;
-}
-
     footer span {
         color: #777f7f;
         display: inline-block !important;
@@ -600,12 +585,20 @@ p.metadata {
     margin-bottom: 6px;
 }
 
+    p.metadata button {
+        position: absolute;
+        right: -35px;
+        top: 26px;
+    }
+
 span.metadata {
     display: inline-block;
     padding: 0px 20px 2px 0;
     color: #777f7f;
 }
 
+
+
 .metadata:first-child {
     padding-left: 0;
 }
@@ -868,6 +861,10 @@ p.endpoint-metadata {
     font-size: 24px;
 }
 
+.events {
+    margin-top: 30px;
+}
+
 .events .box {
     padding-bottom: 0;
 }
@@ -895,6 +892,7 @@ p.endpoint-metadata {
 
 .version-info-container {
     width: 100% !important;
+    margin-top: -4px;
 }
 
 .version-info {
@@ -1214,7 +1212,7 @@ a.btn-feedback, a.btn-feedback:visited, a.btn-feedback:focus {
     color: #fff !important;
     background-color: #00A3C4 !important;
     padding: 6px 16px !important;
-    margin: 14px 0 0 14px;
+    margin: 14px 0 0 0;
     border-radius: 3px;
     font-weight: bold;
 }
@@ -1495,6 +1493,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger {
         margin: 10px 15px 22px !important;
         padding-left: 20px !important;
     }
+
+    .navbar-collapse.collapse.in {
+        padding: 0 0 0 16px !important;
+    }
 }
 
 
@@ -1563,9 +1565,11 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger {
         margin: 7.5px -15px;
     }
 
-    .navbar-nav > li {
-        float: none;
-    }
+        .navbar-nav > li {
+            float: none;
+            float: none;
+            .navbar-label
+        }
 
     .navbar-nav > li > a {
         padding-top: 10px;
@@ -1576,9 +1580,10 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger {
         float: none;
         margin: 15px 0;
     }
-    /* since 3.1.0 */
+    
     .navbar-collapse.collapse.in {
         display: block !important;
+        padding: 0 32px 16px 32px;
     }
 
     .collapsing {
@@ -1586,23 +1591,29 @@ span.metadata.danger, i.fa.fa-trash-o.danger, sp-moment.danger {
     }
 }
 
-@media only screen and (min-width: 1200px) {
-    .container {
-        width: 92%;
-    }
+.table-head-row .col-xl-7, .endpoint-row .col-xl-7 {
+    width: 20%;
+}
+
+.table-head-row .col-xl-8, .endpoint-row .col-xl-8 {
+    width: 36%;
 }
 
-@media only screen and (min-width: 1440px) {
+.table-head-row .col-xl-1, .endpoint-row .col-xl-1 {
+    width: 16%;
+}
+
+@media only screen and (min-width: 1730px) {
     .table-head-row .col-xl-7, .endpoint-row .col-xl-7 {
-        width: 30% !important;
+        width: 30%;
     }
 
     .table-head-row .col-xl-8, .endpoint-row .col-xl-8 {
-        width: 44% !important;
+        width: 44%;
     }
 
     .table-head-row .col-xl-1, .endpoint-row .col-xl-1 {
-        width: 14% !important;
+        width: 14%;
     }
 }
 
@@ -1730,6 +1741,39 @@ hr.top-separator {
     font-size: 11px;
 }
 
+
+.sparkline-value.sec {
+    color: #0000FF;
+}
+
+.sparkline-value.sec span {
+    color: #007AFF;
+}
+
+.sparkline-value.min {
+    color: #8B00D0;
+}
+
+.sparkline-value.min span {
+    color: #B14AE4;
+}
+
+.sparkline-value.hr {
+    color: #D601DA;
+}
+
+.sparkline-value.hr span {
+    color: #D764D9;
+}
+
+.sparkline-value.d {
+    color: #AD0017;
+}
+
+.sparkline-value.d span {
+    color: #FF0004;
+}
+
 .graph-area {
     width: 33%;
     box-sizing: border-box;
@@ -1899,7 +1943,7 @@ h1 .endpoint-status i.fa-envelope, .endpoint-status i.fa-exclamation-triangle {
 }
 
 .monitoring-head .endpoint-status {
-    top: 0;
+    top: 4px;
 }
 
 .monitoring-head .endpoint-status a {
@@ -2105,7 +2149,7 @@ i.fa-exclamation-triangle {
     background-repeat: no-repeat;
 }
 
-.pa-monitoring-lost.endpoint-details {
+.pa-monitoring-lost.endpoint-details, .pa-connection-failed {
     background-image: url('../../../img/monitoring-lost.svg');
     background-position: center;
     background-repeat: no-repeat;
@@ -2166,6 +2210,7 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over
     font-weight: bold;
     background-color: initial;
     border-bottom: 3px solid #000;
+    padding-bottom: 10px;
 }
 
 .nav-pills.period-selector > li > a:hover {
@@ -2183,7 +2228,76 @@ i.fa.pa-endpoint-lost.endpoints-overview, i.fa.pa-monitoring-lost.endpoints-over
     padding: 10px 6px;
 }
 
-@media (min-width: 1200px) {
+footer {
+    color: #bcc6c2;
+    font-size: 14px;
+    font-weight: normal;
+    height: 35px;
+    margin-top: 100px;
+    padding: 5px 0;
+    text-align: left;
+    text-align: center;
+    width: 100%;
+    background-color: #fff;
+    position: fixed;
+    bottom: 0;
+    border: 1px solid #ddd;
+    box-shadow: 0px -10px 16px #f2f6f7;
+    padding-top: 7px;
+}
+
+footer .row {
+    display: flex;
+    justify-content: space-between;
+}
+
+footer span {
+    padding-left: 0;
+    padding-right: 32px;
+}
+
+    footer span.connected-status {
+        color: #000;
+    }
+
+    footer span.monitoring-connected, footer span.monitoring-connected span {
+        padding-right: 0;
+    }
+
+.connectivity-status div, .connectivity-status span {
+    display: inline-block;
+    color: #777f7f;
+}
+
+.connectivity-status i, .connectivity-status div.pa-connection-success {
+    width: 10px;
+    height: 10px;
+}
+
+
+
+.pa-connection-establishing {
+    background-image: url('../img/loader_spinner.gif');
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+}
+
+
+.connectivity-status .connection-failed {
+    color: #CE4844;
+}
+
+.connectivity-status .pa-connection-success {
+    border-radius: 50%;
+    background: #00C468;
+}
+
+@media (min-width: 0px) {
+    .container {
+        width: 92%;
+    }
+    
     .col-lg-max-8 {
         max-width: 66%;
         float: left;
@@ -2225,3 +2339,74 @@ div.alert.alert-warning strong {
     color: #00729C !important;
 }
 
+.pre-wrap {
+    white-space: pre-wrap;
+}
+
+@media (max-width: 1439px) {
+    html, body, nav {
+        min-width: 1440px !important;
+    }
+
+    nav.navbar {
+        width: 1440px;
+        position: sticky;
+        margin-top: -100px;
+        margin-bottom: 50px;
+    }
+
+    div.navbar-header {
+        float: left;
+    }
+
+    ul.navbar-nav {
+        margin: 0 8px 0 0;
+        padding-right: 16px;
+        display: bloc;
+    }
+
+    .navbar-nav > li > a {
+        padding-top: 18px;
+        padding-bottom: 17px;
+    }
+
+    .navbar-label {
+        display: inline !important;
+    }
+
+    .navbar-collapse.collapse {
+        display: block !important;
+    }
+
+    .navbar-nav > li, .navbar-nav {
+        float: left !important;
+        height: 59px;
+    }
+
+    .navbar-nav.navbar-right:last-child {
+        margin-right: -15px !important;
+    }
+
+    .navbar-right {
+        float: right !important;
+    }
+
+    .navbar-nav > li.active > a {
+        background: transparent !important;
+        border-bottom: 5px solid #00A3C4 !important;
+    }
+
+    .tabs h5 {
+        margin-bottom: 0;
+        padding-bottom: 10px;
+    }
+}
+
+@media (max-width: 1550px) {
+
+    footer {
+        height: 29px;
+        font-size: 12px;
+    }
+
+}
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/index.html b/src/ServicePulse.Host/app/index.html
index 0144cac6b6..668cf75814 100644
--- a/src/ServicePulse.Host/app/index.html
+++ b/src/ServicePulse.Host/app/index.html
@@ -15,7 +15,7 @@
     <meta charset="utf-8">
     <meta name="description" content="An Operations Manager’s Best Friend">
     <meta name="author" content="Particular Software">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=1440, initial-scale=1">
 
     <link rel="shortcut icon" href="img/ServicePulse.ico">
 
diff --git a/src/ServicePulse.Host/app/js/app.controller.js b/src/ServicePulse.Host/app/js/app.controller.js
index c5ebe09956..3d9c77664e 100644
--- a/src/ServicePulse.Host/app/js/app.controller.js
+++ b/src/ServicePulse.Host/app/js/app.controller.js
@@ -28,6 +28,7 @@
         $scope.SCVersion = '';
         $scope.is_compatible_with_sc = true;
         $scope.Version = version;
+        $scope.isSCConnecting = true;
 
         $scope.isActive = function(viewLocation) {
             var active = $location.path().startsWith(viewLocation);
@@ -118,10 +119,12 @@
 
             switch(data) {
                 case 'SignalR started':
-                    toastService.showInfo('Connected to ServiceControl');
+                    $scope.isSCConnected = true;
+                    $scope.isSCConnecting = false;
                     break;
                 case 'Reconnected':
-                    toastService.showInfo('Reconnected to ServiceControl');
+                    $scope.isSCConnected = true;
+                    $scope.isSCConnecting = false;
                     break;
                 default:
                     toastService.showWarning(data);
@@ -132,7 +135,11 @@
 
         notifier.subscribe($scope, function(event, data) {
             logit(event, data);
-            toastService.showError(data);
+            if ($scope.isSCConnected) {
+                toastService.showError(data);
+            }
+            $scope.isSCConnected = false;
+            $scope.isSCConnecting = false;
         }, 'SignalRError');
 
         notifier.subscribe($scope, function(event, data) {
diff --git a/src/ServicePulse.Host/app/js/directives/ui.particular.js b/src/ServicePulse.Host/app/js/directives/ui.particular.js
index 305a1d21b4..c488870572 100644
--- a/src/ServicePulse.Host/app/js/directives/ui.particular.js
+++ b/src/ServicePulse.Host/app/js/directives/ui.particular.js
@@ -22,6 +22,7 @@
         'ui.particular.graphdecimal',
         'ui.particular.multicheckboxList',
         'ui.particular.reindexingstatus',
+        'ui.particular.monitoringConnectivityStatus'
     ]);
 
 } (window, window.angular));
\ No newline at end of file
diff --git a/src/ServicePulse.Host/app/js/directives/ui.particular.productVersion.tpl.html b/src/ServicePulse.Host/app/js/directives/ui.particular.productVersion.tpl.html
index cd0b61b85d..e716794205 100644
--- a/src/ServicePulse.Host/app/js/directives/ui.particular.productVersion.tpl.html
+++ b/src/ServicePulse.Host/app/js/directives/ui.particular.productVersion.tpl.html
@@ -16,12 +16,6 @@
 
     </div>
 
-    <div class="version-info version-separator">
-
-        •
-
-    </div>
-
     <div class="version-info" ng-show="scversion !== ''">
 
 
diff --git a/src/ServicePulse.Host/app/js/services/service.formatter.js b/src/ServicePulse.Host/app/js/services/service.formatter.js
index cb65c10f1e..105cac4d63 100644
--- a/src/ServicePulse.Host/app/js/services/service.formatter.js
+++ b/src/ServicePulse.Host/app/js/services/service.formatter.js
@@ -12,11 +12,11 @@
 
             var time = { value: 0, unit: '' };
             if (duration >= dayDuration) {
-                time.value = duration.format('D [d] h [h]');
+                time.value = duration.format('D [d] h [hr]');
                 return time;
             } else if (duration >= hourDuration) {
                 time.value = moment(duration._data).format('HH:mm');
-                time.unit = 'h';
+                time.unit = 'hr';
                 return time;
             } else if (duration >= minuteDuration) {
                 time.value = duration.format('mm:ss');
@@ -24,7 +24,7 @@
                 return time;
             } else if (duration >= secondDuration) {
                 time.value = duration.format('ss');
-                time.unit = 's';
+                time.unit = 'sec';
                 return time;
             } else {
                 time.value = duration.format('s,SSS');
diff --git a/src/ServicePulse.Host/app/js/views/configuration/configuration.html b/src/ServicePulse.Host/app/js/views/configuration/configuration.html
index a0efb90569..0329425c70 100644
--- a/src/ServicePulse.Host/app/js/views/configuration/configuration.html
+++ b/src/ServicePulse.Host/app/js/views/configuration/configuration.html
@@ -16,13 +16,13 @@ <h1>Configuration</h1>
             <div class="col-sm-12">
 
                 <div class="alert alert-warning">
-                    <i class="fa fa-warning"></i> <strong>Warning:</strong> The list of endpoints below only contains endpoints with the hearbeats plug-in installed. Toggling heartbeat monitoring on/off won't toggle <a href="https://docs.particular.net/monitoring/metrics/in-servicepulse" target="_blank">performance monitoring</a> <i class="fa fa-external-link fake-link"></i>
+                    <i class="fa fa-warning"></i> <strong>Warning:</strong> The list of endpoints below only contains endpoints with the heartbeats plug-in installed. Toggling heartbeat monitoring won't toggle <a href="https://docs.particular.net/monitoring/metrics/in-servicepulse" target="_blank">performance monitoring</a> <i class="fa fa-external-link fake-link"></i>
                 </div>
 
                 <div class="row box box-no-click" ng-class="{'box-info': e.monitor_heartbeat, 'box-danger':  !e.monitor_heartbeat}" ng-repeat="e in model.endpoints | orderBy:'name'">
                     <div class="col-sm-12 no-side-padding">
                         <div class="row">
-                            <div class="col-xs-3 col-sm-2 col-lg-1">
+                            <div class="col-xs-1">
                                 <div class="onoffswitch">
                                     <input type="checkbox" id="onoffswitch{{$id}}" name="onoffswitch{{$id}}" class="onoffswitch-checkbox" ng-click="update(e.id, !e.monitor_heartbeat)" ng-checked="e.monitor_heartbeat">
                                     <label class="onoffswitch-label" for="onoffswitch{{$id}}">
diff --git a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html
index a276f9f38d..febb798407 100644
--- a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html
+++ b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html
@@ -25,7 +25,7 @@ <h1>Custom checks</h1>
                                 <div class="col-xs-10">
                                     <div class="row box-header">
                                         <div class="col-sm-12 no-side-padding">
-                                            <p class="lead">{{item.failure_reason}}</p>
+                                            <p class="lead pre-wrap">{{item.failure_reason}}</p>
                                             <p>{{item.custom_check_id}} </p>
                                             <p>
                                                 {{item.category}} reported by {{item.originating_endpoint.name}} on {{item.originating_endpoint.host}} <sp-moment date="{{item.reported_at}}"></sp-moment>
diff --git a/src/ServicePulse.Host/app/js/views/dashboard/dashboard.html b/src/ServicePulse.Host/app/js/views/dashboard/dashboard.html
index 8759b966ca..e170b4f18c 100644
--- a/src/ServicePulse.Host/app/js/views/dashboard/dashboard.html
+++ b/src/ServicePulse.Host/app/js/views/dashboard/dashboard.html
@@ -15,7 +15,7 @@ <h6>System status</h6>
             <div class="row box system-status">
                 <div class="col-sm-12">
                     <div class="row">
-                        <div class="col-sm-4">
+                        <div class="col-xs-4">
                             <a class="summary-item" ng-class="{  'summary-danger' : failedheartbeats > 0 , 'summary-info' : failedheartbeats === 0 || !failedheartbeats  }" href="#/endpoints">
                                 <i class="fa fa-heart fa-3x"></i>
                                 <span ng-show="failedheartbeats > 0" class="badge badge-important">{{failedheartbeats | largeNumber:0}}</span>
@@ -26,7 +26,7 @@ <h4>
                             </a>
 
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-xs-4">
                             <a class="summary-item" ng-class="{  'summary-danger'  : failedmessages > 0 , 'summary-info' : failedmessages === 0 || !failedmessages }" href="#/failed-messages/groups">
                                 <i class="fa fa-envelope fa-3x "></i>
                                 <span ng-show="failedmessages > 0" class="badge badge-important">{{failedmessages | largeNumber:0}}</span>
@@ -36,7 +36,7 @@ <h4>
                                 </h4>
                             </a>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-xs-4">
                             <a class="summary-item" ng-class="{  'summary-danger'  : failedcustomchecks > 0, 'summary-info' : failedcustomchecks === 0 || !failedcustomchecks }" href="#/custom-checks">
                                 <i class="fa fa-check  fa-3x "></i>
                                 <span ng-show="failedcustomchecks > 0" class="badge badge-important">{{failedcustomchecks | largeNumber:0}}</span>
@@ -51,14 +51,6 @@ <h4>
                 </div>
             </div>
 
-            <div class="row">
-                <div class="col-md-12 version-info version-info-container">
-                    <span>
-                        <product-version version="{{Version}}" scversion="{{SCVersion}}"></product-version>
-                    </span>
-                </div>
-            </div>
-
 
         </div>
     </div>
diff --git a/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html b/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
index b3dfe56bc7..44e8569a89 100644
--- a/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
+++ b/src/ServicePulse.Host/app/js/views/event_log_items/eventLogItems.tpl.html
@@ -7,7 +7,7 @@ <h6>Last 10 events</h6>
                 <div class="row box box-event-item" ng-repeat="eventLogItem in model | orderBy: '-raised_at' | limitTo: 10">
                     <div class="col-xs-12" ng-click="viewCategory(eventLogItem)">
                         <div class="row">
-                            <div class="col-xs-2 col-sm-1">
+                            <div class="col-xs-1">
 
                                 <span class="fa-stack fa-lg">
                                     <i title="{{eventLogItem.category}}" class="fa fa-stack-2x"
@@ -29,7 +29,7 @@ <h6>Last 10 events</h6>
                                        }"></i>
                                 </span>
                             </div>
-                            <div class="col-xs-8 col-sm-9">
+                            <div class="col-xs-9">
                                 <div class="row box-header">
                                     <div class="col-sm-12">
                                         <p class="lead">
diff --git a/src/ServicePulse.Host/app/js/views/failed_groups/controller.js b/src/ServicePulse.Host/app/js/views/failed_groups/controller.js
index 0db47a72b1..6032e648c6 100644
--- a/src/ServicePulse.Host/app/js/views/failed_groups/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_groups/controller.js
@@ -23,7 +23,8 @@
         notifyService,
         serviceControlService,
         failedMessageGroupsService,
-        toastService) {
+        toastService,
+        $routeParams) {
 
         var vm = this;
         var notifier = notifyService();
@@ -164,7 +165,12 @@
             $cookies.put("failed_groups_classification", classification);
         };
 
-        var getDefaultClassification = function(classifiers) {
+        var getDefaultClassification = function (classifiers) {
+            if ($routeParams.groupBy) {
+                saveSelectedClassification($routeParams.groupBy);
+                return $routeParams.groupBy;
+            }
+
             var storedClassification = $cookies.get("failed_groups_classification");
 
             if (typeof storedClassification === "undefined") {
@@ -378,7 +384,8 @@
         "notifyService",
         "serviceControlService",
         "failedMessageGroupsService",
-        "toastService"
+        "toastService",
+        '$routeParams'
     ];
 
     angular.module("sc")
diff --git a/src/ServicePulse.Host/app/js/views/failed_groups/view.html b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
index 214bc445b2..3761be42e7 100644
--- a/src/ServicePulse.Host/app/js/views/failed_groups/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_groups/view.html
@@ -44,11 +44,11 @@ <h6>
         </div>
 
         <div class="row">
-            <div class="col-xs-12 col-sm-6 list-section">
+            <div class="col-xs-6 list-section">
                 <h6>Failed message groups</h6>
             </div>
 
-            <div class="col-sm-6 col-xs-12 toolbar-menus no-side-padding">
+            <div class="col-xs-6 toolbar-menus no-side-padding">
 
                 <div class="msg-group-menu dropdown">
                     <label class="control-label">Group by:</label>
@@ -58,7 +58,7 @@ <h6>Failed message groups</h6>
                     </button>
                     <ul class="dropdown-menu">
                         <li ng-repeat="classifier in vm.availableClassifiers">
-                            <a href="#" ng-click="$event.preventDefault();vm.selectClassification(classifier)">{{classifier}}</a>
+                            <a href="/#/failed-messages/groups?groupBy={{classifier}}">{{classifier}}</a>
                         </li>
                     </ul>
                 </div>
diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
index 073f632633..3ace8a91e5 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
@@ -107,6 +107,27 @@
             vm.loadMoreResults(vm.selectedExceptionGroup);
         };
 
+        vm.viewMessage = function (message) {
+            $location.path(`/failed-messages/message/${message.id}`);
+        };
+
+        vm.retryMessage = function(message, $event) {
+            toastService.showInfo("Message retry requested");
+            serviceControlService.retryFailedMessages([message.id])
+                .then(function() {
+                        var indexOfMessage = vm.selectedIds.indexOf(message.id);
+                        if (indexOfMessage) {
+                            vm.selectedIds.splice(indexOfMessage, 1);
+                        }
+
+                        vm.failedMessages = vm.failedMessages.filter(function(item) {
+                            return item.id !== message.id;
+                        });
+                    }
+                );
+            $event.stopPropagation();
+        };
+
         vm.clipComplete = function(messageId) {
             toastService.showInfo(messageId + ' copied to clipboard');
         };
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..d3d42f31ef 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>
@@ -67,32 +67,32 @@ <h3 class="active group-title group-message-count">{{vm.selectedExceptionGroup.c
                     <multi-checkboxlist messages="vm.failedMessages" selected-ids="vm.selectedIds" message="message" multiselection="vm.multiselection"></multi-checkboxlist>
 
                     <div class="col-xs-11 failed-message-data" ng-mouseenter="message.hover2 = true" ng-mouseleave="message.hover2 = false">
-                        <a href="#/failed-messages/message/{{message.id}}">
+                        
+                        <div class="row" ng-class="{rowSelected: message.selected == true}" ng-click="vm.viewMessage(message)">
+                            <div class="col-sm-12">
+                                <div class="row box-header">
+                                    <div class="col-sm-12 no-side-padding">
+                                        <p class="lead break" ng-class="{'msg-type-hover': message.hover2}">{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}</p>
+                                        <p class="metadata">
+                                            <span ng-if="message.retried" tooltip="Message is being retried" class="label sidebar-label label-info metadata-label">Retried</span>
+                                            <span ng-if="message.archived" tooltip="Message is being archived" class="label sidebar-label label-warning metadata-label">Archived</span>
+                                            <span ng-if="message.number_of_processing_attempts > 1" tooltip="This message has already failed {{message.number_of_processing_attempts}} times" class="label sidebar-label label-important metadata-label">{{message.number_of_processing_attempts}} Retry Failures</span>
+
+                                            <span class="metadata"><i class="fa fa-clock-o"></i> Failed: <sp-moment date="{{message.time_of_failure}}"></sp-moment></span>
+                                            <span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{message.receiving_endpoint.name}}</span>
+                                            <span class="metadata"><i class="fa fa-laptop"></i> Machine: {{message.receiving_endpoint.host}}</span>
+                                            <span class="metadata" ng-show="message.redirect"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{message.redirect}}</span>
+                                            <button type="button" class="btn btn-link btn-sm" ng-click="vm.retryMessage(message, $event)" ng-hide="!message.hover2" >
+                                                <i aria-hidden="true" class="fa fa-repeat no-link-underline">&nbsp</i>Request retry
+                                            </button>
+                                        </p>
+
+                                        <pre class="stacktrace-preview" isolate-click ng-show="message.panel === 0">{{ message.exception.message }}</pre>
 
-                            <div class="row" ng-class="{rowSelected: message.selected == true}">
-
-                                <div class="col-sm-12">
-                                    <div class="row box-header">
-                                        <div class="col-sm-12 no-side-padding">
-                                            <p class="lead break" ng-class="{'msg-type-hover': message.hover2}">{{message.message_type || 'Message Type Unknown - missing metadata EnclosedMessageTypes'}}</p>
-                                            <p class="metadata">
-                                                <span ng-if="message.retried" tooltip="Message is being retried" class="label sidebar-label label-info metadata-label">Retried</span>
-                                                <span ng-if="message.archived" tooltip="Message is being archived" class="label sidebar-label label-warning metadata-label">Archived</span>
-                                                <span ng-if="message.number_of_processing_attempts > 1" tooltip="This message has already failed {{message.number_of_processing_attempts}} times" class="label sidebar-label label-important metadata-label">{{message.number_of_processing_attempts}} Retry Failures</span>
-
-                                                <span class="metadata"><i class="fa fa-clock-o"></i> Failed: <sp-moment date="{{message.time_of_failure}}"></sp-moment></span>
-                                                <span class="metadata"><i class="fa pa-endpoint"></i> Endpoint: {{message.receiving_endpoint.name}}</span>
-                                                <span class="metadata"><i class="fa fa-laptop"></i> Machine: {{message.receiving_endpoint.host}}</span>
-                                                <span class="metadata" ng-show="message.redirect"><i class="fa pa-redirect-source pa-redirect-small"></i> Redirect: {{message.redirect}}</span>
-                                            </p>
-
-                                            <pre class="stacktrace-preview" isolate-click ng-show="message.panel === 0">{{ message.exception.message }}</pre>
-
-                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </a>
+                        </div>
                     </div>
                 </div>
 
diff --git a/src/ServicePulse.Host/app/layout/footer.html b/src/ServicePulse.Host/app/layout/footer.html
index fb9901a6d3..ae189c62f8 100644
--- a/src/ServicePulse.Host/app/layout/footer.html
+++ b/src/ServicePulse.Host/app/layout/footer.html
@@ -1,29 +1,29 @@
-<footer class="footer visible-md-block visible-lg-block">
+<footer class="footer">
     <div class="container">
         <div class="row">
-            <div class="col-sm-12">
-                <div class="row">
-                    <div>
-                        
-                        <span>
-                            <script>document.write(new Date().getFullYear())</script> © Particular Software
-                        </span>
-
-                        •
-
-                        <span>
-                            <i class="fa fa-external-link fake-link"></i> <a href="http://docs.particular.net/servicepulse" target="_blank">ServicePulse documentation</a>
-                        </span>
-
-                        •
-
-                        <span>
-                            <i class="fa fa-envelope fake-link"></i> <a href="mailto:support@particular.net" target="_blank">support@particular.net</a>
-                        </span>
-
+            <span>
+                <product-version version="{{Version}}" scversion="{{SCVersion}}"></product-version>
+            </span><span>
+                <i class="fa fa-envelope fake-link"></i> <a href="mailto:support@particular.net" target="_blank">support@particular.net</a>
+            </span>
+            <span>
+                <i class="fa fa-external-link fake-link"></i> <a href="http://docs.particular.net/servicepulse" target="_blank">Documentation</a>
+            </span>
+            <div class="connectivity-status">
+                <div>
+                    Service Control:
+                    <span class="connected-status" ng-if="isSCConnected && !isSCConnecting">
+                        <div class="fa pa-connection-success"></div> Connected
+                    </span>
+                    <span ng-if="!isSCConnected && !isSCConnecting" class="connection-failed">
+                        <i class="fa pa-connection-failed"></i> Not connected
+                    </span>
+                    <span ng-if="isSCConnecting" class="connection-establishing">
+                        <i class="fa pa-connection-establishing"></i> Connecting
+                    </span>
                 </div>
+                <monitoring-connectivity-status></monitoring-connectivity-status>
             </div>
-        </div>
     </div>
   </div>
 </footer>
diff --git a/src/ServicePulse.Host/app/layout/navbar.html b/src/ServicePulse.Host/app/layout/navbar.html
index 63d82f2121..37d2a304a0 100644
--- a/src/ServicePulse.Host/app/layout/navbar.html
+++ b/src/ServicePulse.Host/app/layout/navbar.html
@@ -1,16 +1,6 @@
 <nav class="navbar navbar-inverse navbar-fixed-top">
     <div class="container-fluid">
         <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span ng-show="showAlertBadgeOnCollapsedMenu()" class="badge badge-important " 
-                      style="top: 0;
-                        right: 0;
-                        position: absolute;">!</span>
-            </button>
             <a class="navbar-brand" href="#/">
                 <img alt="Service Pulse" src="img/logo.svg">
             </a>
@@ -32,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/directives/ui.particular.graph.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js
index 55a2ca7761..5d46e68c60 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.graph.js
@@ -34,6 +34,9 @@
                                 var horizontalMargin = 2;
 
                                 var points = scope.plotData.points;
+                                if (points.length === 0) {
+                                    points = new Array(10).fill(0);
+                                }
                                 var average = scope.plotData.average || 0;
                                 var minimumYaxis = !isNaN(scope.minimumYaxis) ? Number(scope.minimumYaxis) : 10;
                                 var max = points && points.length ? Math.max(average * 1.5, d3.max(points), minimumYaxis) : 1;
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js
index ffba901922..77c0ae1514 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js
@@ -110,8 +110,10 @@
                             var firstSeries = scope.firstDataSeries;
                             var secondSeries = scope.secondDataSeries;
 
-                            var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0);
-
+                            var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0) || 10;
+                            if (firstSeries.points.length === 0) {
+                                firstSeries.points = new Array(amountOfValues).fill(0);
+                            }
                             var scaleX = d3.scaleLinear()
                                 .domain([0, amountOfValues - 1])
                                 .range([leftMargin, width]);
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.js b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.js
new file mode 100644
index 0000000000..3346142cf6
--- /dev/null
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.js
@@ -0,0 +1,56 @@
+
+; (function (window, angular, $, undefined) {
+    'use strict';
+
+
+    function controller($scope, connectivityNotifier, monitoringService, $interval) {
+        $scope.isSCMonitoringConnecting = true;
+        connectivityNotifier.getConnectionStatusSource().subscribe(value => {
+            $scope.isSCMonitoringConnected = value;
+            $scope.isSCMonitoringConnecting = false;
+        });
+
+        var scMonitoringConnectionPing = $interval(function () {
+            var promises = monitoringService.getMonitoredEndpoints().map((request, index) => {
+                request.then(r => {
+                    connectivityNotifier.reportSuccessfulConnection(index);
+                }, e => {
+                    connectivityNotifier.reportFailedConnection(index);
+                });
+            });
+        }, 10000);
+
+        // Cancel interval on page changes
+        $scope.$on('$destroy', function () {
+            if (angular.isDefined(scMonitoringConnectionPing)) {
+                $interval.cancel(scMonitoringConnectionPing);
+                scMonitoringConnectionPing = undefined;
+            }
+        });
+    }
+
+    
+
+    
+
+    controller.$inject = ['$scope', 'connectivityNotifier', 'monitoringService', '$interval'];
+
+    function directive() {
+        return {
+            scope: {},
+            restrict: 'E',
+            replace: true,
+            templateUrl: 'modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.tpl.html',
+            controller: controller,
+            link: function (scope, element) { }
+        };
+    }
+
+    directive.$inject = [];
+
+    angular
+        .module('ui.particular.monitoringConnectivityStatus', [])
+        .directive('monitoringConnectivityStatus', directive);
+
+}(window, window.angular, window.jQuery));
+
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.tpl.html b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.tpl.html
new file mode 100644
index 0000000000..b9256ac105
--- /dev/null
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.monitoringConnectivityStatus.tpl.html
@@ -0,0 +1,12 @@
+<span class="monitoring-connected">
+    SC Monitoring:
+    <span class="connected-status" ng-if="isSCMonitoringConnected && !isSCMonitoringConnecting">
+        <div class="fa pa-connection-success"></div> Connected
+    </span>
+    <span ng-if="!isSCMonitoringConnected && !isSCMonitoringConnecting" class="connection-failed">
+        <i class="fa pa-connection-failed"></i> Not connected
+    </span>
+    <span ng-if="isSCMonitoringConnecting" class="connection-establishing">
+        <i class="fa pa-connection-establishing"></i> Connecting
+    </span>
+</span>
\ No newline at end of file
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 ef585e7678..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
@@ -18,8 +18,8 @@
 
         $scope.endpointName = $routeParams.endpointName;
         $scope.sourceIndex = $routeParams.sourceIndex;
+        $scope.showInstancesBreakdown = $routeParams.tab === 'instancesBreakdown'; 
         $scope.loading = true;
-        $scope.showInstancesBreakdown = false;
         $scope.largeGraphsMinimumYAxis = largeGraphsMinimumYAxis;
         $scope.smallGraphsMinimumYAxis = smallGraphsMinimumYAxis;
 
@@ -42,6 +42,14 @@
             }
         }
 
+        $scope.buildUrl = function (selectedPeriodValue, showInstancesBreakdownTab) {
+            return `#/monitoring/endpoint/${$scope.endpointName}/${$scope.sourceIndex}?historyPeriod=${selectedPeriodValue}&tab=${$scope.showInstancesBreakdown ? 'instancesBreakdown' : 'messageTypeBreakdown'}`;
+        };
+
+        $scope.showInstancesBreakdownTab = function(isVisible) {
+            $scope.showInstancesBreakdown = isVisible;
+        };
+
         function updateUI() {
             if (subscription) {
                 subscription.dispose();
@@ -142,4 +150,4 @@
     angular.module('endpoint_details')
         .controller('endpointDetailsCtrl', controller);
 
-}(window, window.angular));
\ No newline at end of file
+}(window, window.angular));
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.module.js b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.module.js
index 5fe8dd02fb..fbdf651623 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.module.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/endpoint_details.module.js
@@ -9,6 +9,7 @@
     require('./endpoint_details.route.js');
     require('./constant.diagrams.js');
 
+    require('./directives/ui.particular.monitoringConnectivityStatus.js');
     require('./directives/ui.particular.graph.js');
     require('./directives/ui.particular.graphdecimal.js');
     require('./directives/ui.particular.duration.js');
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.module.js b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.module.js
index 7d9158e47d..8265c484e7 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.module.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/monitored_endpoints.module.js
@@ -8,6 +8,7 @@
     require('./monitored_endpoints.route.js');
     require('./constant.diagrams.js');
 
+    require('./directives/ui.particular.monitoringConnectivityStatus.js');
     require('./directives/ui.particular.graph.js');
     require('./directives/ui.particular.graphdecimal.js');
     require('./directives/ui.particular.graphduration.js');
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/js/services/services.connectivityNotifier.js b/src/ServicePulse.Host/app/modules/monitoring/js/services/services.connectivityNotifier.js
index 25355fb7a8..6d35c1a256 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/services/services.connectivityNotifier.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/services/services.connectivityNotifier.js
@@ -5,7 +5,9 @@
     function Service(toastService, scConfig) {
 
         var isConnectedToSourceIndex = Array(scConfig.monitoring_urls.length).fill(true);
-        
+        var connectivitySource = new Rx.Subject();
+        var shouldShowFailedMessage = true;
+
         function reportFailedConnection(sourceIndex) {
 
             if (isConnectedToSourceIndex[sourceIndex]) {
@@ -13,9 +15,14 @@
                 if (scConfig.monitoring_urls.length > 1) {
                     message = 'Could not connect to the ServiceControl Monitoring service at' + scConfig.monitoring_urls[sourceIndex] + '.';
                 }
-                toastService.showError(message);
+                console.log(message);
+                if (shouldShowFailedMessage) {
+                    toastService.showError(message);
+                    shouldShowFailedMessage = false;
+                }
             }
             isConnectedToSourceIndex[sourceIndex] = false;
+            emitChange(isConnectedToSourceIndex);
         }
 
         function reportSuccessfulConnection(sourceIndex) {
@@ -24,15 +31,28 @@
                 if (scConfig.monitoring_urls.length > 1) {
                     message = 'Connection to ServiceControl Monitoring service was successful ' + scConfig.monitoring_urls[sourceIndex] +'.';
                 }
-                toastService.showInfo(message, 'Info', true);
+                console.log(message);
+                shouldShowFailedMessage = true;
             }
             isConnectedToSourceIndex[sourceIndex] = true;
+            emitChange(isConnectedToSourceIndex);
+        }
+
+        function emitChange(connectedToSourceIndex) {
+            var result = connectedToSourceIndex.every(item => item);
+            connectivitySource.onNext(result);
+        };
+
+        function getConnectionStatusSource() {
+            return connectivitySource;
         }
 
         var service = {
             reportFailedConnection: reportFailedConnection,
-            reportSuccessfulConnection: reportSuccessfulConnection
+            reportSuccessfulConnection: reportSuccessfulConnection,
+            getConnectionStatusSource: getConnectionStatusSource,
         };
+        
 
         return service;
     }
diff --git a/src/ServicePulse.Host/app/modules/monitoring/js/services/services.monitoring.js b/src/ServicePulse.Host/app/modules/monitoring/js/services/services.monitoring.js
index cad39b6395..fcd597245c 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/js/services/services.monitoring.js
+++ b/src/ServicePulse.Host/app/modules/monitoring/js/services/services.monitoring.js
@@ -41,12 +41,20 @@
         function loadEndpointDetailsFromMonitoringService(endpointName, sourceIndex, historyPeriod) {
             return $http.get(uri.join(scConfig.monitoring_urls[sourceIndex], 'monitored-endpoints', endpointName) + "?history=" + historyPeriod)
                 .then(function (result) {
+                    filterOutSystemMessage(result.data);
                     return result.data;
                 }, function (error) {
                     return { error: error };
                 });
         }
 
+        function filterOutSystemMessage(data)
+        {
+            data.messageTypes = data.messageTypes.filter(mt => {
+                return mt.id;
+            });
+        }
+
         function createEndpointDetailsSource(endpointName, sourceIndex, historyPeriod, refreshInterval) {
             return Rx.Observable.interval(refreshInterval).startWith(0)
                 .flatMap(function (i) {
@@ -54,9 +62,16 @@
                 });
         }
 
+        function getMonitoredEndpoints() {
+            return scConfig.monitoring_urls.map(function (url) {
+                return $http.get(uri.join(url, 'monitored-endpoints') + '?history=1');
+            });
+        }
+
         var service = {
             createEndpointsSource: createEndpointsSource,
-            createEndpointDetailsSource: createEndpointDetailsSource
+            createEndpointDetailsSource: createEndpointDetailsSource,
+            getMonitoredEndpoints: getMonitoredEndpoints,
         };
 
         return service;
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 2f9cd892b1..24a54953ab 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
+++ b/src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
@@ -5,13 +5,13 @@
     <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-sm-9 no-side-padding list-section ">
+        <div class="col-xs-9 no-side-padding list-section ">
             <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                 {{endpointName}}
             </h1>
-            <div class="endpoint-status col-lg-2">
+            <div class="endpoint-status col-xs-2">
                 <span ng-if="endpoint.isStale" class="warning">
                     <i class="fa pa-endpoint-lost endpoint-details" uib-tooltip="Unable to connect to endpoint"></i>
                 </span>
@@ -24,10 +24,10 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                 </a>
             </div>
         </div>
-        <div class="col-sm-3 no-side-padding toolbar-menus">
+        <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="#/endpoint_details/{{endpointName}}/{{sourceIndex}}?historyPeriod={{period.value}}">{{period.text}}</a>
+                    <a ng-click="selectPeriod(period)" ng-href="{{buildUrl(period.value)}}">{{period.text}}</a>
                 </li>
             </ul>
         </div>
@@ -37,7 +37,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
 <div class="container large-graphs" ng-if="!loading">
     <div class="container">
         <div class="row">
-            <div class="col-sm-4 no-side-padding list-section graph-area graph-queue-length">
+            <div class="col-xs-4 no-side-padding list-section graph-area graph-queue-length">
                 <!-- here goes diagram -->
                 <large-graph ng-if="endpoint.metricDetails.metrics.queueLength"
                                 first-data-series="endpoint.metricDetails.metrics.queueLength"
@@ -49,7 +49,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                                 class="large-graph pull-left">
                 </large-graph>
 
-                <div class="col-sm-12 no-side-padding graph-values">
+                <div class="col-xs-12 no-side-padding graph-values">
                     <div class="queue-length-values">
                         <div class="row">
                             <span class="metric-digest-header" uib-tooltip="Queue length: The number of messages waiting to be processed in the input queue(s) of the endpoint.">
@@ -73,7 +73,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                 </div>
             </div>
 
-            <div class="col-sm-4 no-side-padding list-section graph-area graph-message-retries-throughputs">
+            <div class="col-xs-4 no-side-padding list-section graph-area graph-message-retries-throughputs">
                 <!-- here goes diagram -->
                 <large-graph ng-if="endpoint.metricDetails.metrics.throughput"
                              first-data-series="endpoint.metricDetails.metrics.throughput"
@@ -88,8 +88,8 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                              class="large-graph pull-left">
                 </large-graph>
 
-                <div class="col-sm-12 no-side-padding graph-values">
-                    <div class="col-sm-6 no-side-padding throughput-values">
+                <div class="col-xs-12 no-side-padding graph-values">
+                    <div class="col-xs-6 no-side-padding throughput-values">
                         <div class="row">
                             <span class="metric-digest-header" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
                                 Throughput
@@ -109,7 +109,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                             <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="metric-digest-value-suffix"> AVG</span>
                         </div>
                     </div>
-                    <div class="col-sm-6 no-side-padding scheduled-retries-rate-values">
+                    <div class="col-xs-6 no-side-padding scheduled-retries-rate-values">
                         <div class="row">
                             <span class="metric-digest-header" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
                                 Scheduled Retries Rate
@@ -133,7 +133,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                 </div>
             </div>
 
-            <div class="col-sm-4 no-side-padding list-section graph-area graph-critical-processing-times">
+            <div class="col-xs-4 no-side-padding list-section graph-area graph-critical-processing-times">
                 <!-- here goes diagram -->
                 <large-graph ng-if="endpoint.metricDetails.metrics.processingTime"
                              first-data-series="endpoint.metricDetails.metrics.criticalTime"
@@ -149,8 +149,8 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                              class="large-graph pull-left">
                 </large-graph>
 
-                <div class="col-sm-12 no-side-padding graph-values">
-                    <div class="col-sm-6 no-side-padding processing-time-values">
+                <div class="col-xs-12 no-side-padding graph-values">
+                    <div class="col-xs-6 no-side-padding processing-time-values">
                         <div class="row">
                             <span class="metric-digest-header" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
                                 Processing Time
@@ -171,7 +171,7 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
                         </div>
                     </div>
 
-                    <div class="col-sm-6 no-side-padding critical-time-values">
+                    <div class="col-xs-6 no-side-padding critical-time-values">
                         <div class="row">
                             <span class="metric-digest-header" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
                                 Critical Time
@@ -202,69 +202,71 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
     <busy ng-show="loading" message="Loading details"></busy>
     <div class="tabs">
         <h5 ng-class="{active: !showInstancesBreakdown}">
-            <a ng-click="showInstancesBreakdown = false" class="ng-binding">Message Types</a>
+            <a ng-click="showInstancesBreakdownTab(false)" ng-href="{{buildUrl(selectedPeriod.value, 'messageTypeBreakdown')}}" class="ng-binding">Message Types</a>
         </h5>
         <h5 ng-class="{active: showInstancesBreakdown}">
-            <a ng-click="showInstancesBreakdown = true" class="ng-binding">Instances</a>
+            <a ng-click="showInstancesBreakdownTab(true)" ng-href="{{buildUrl(selectedPeriod.value, 'instancesBreakdown')}}" class="ng-binding">Instances</a>
         </h5>
     </div>
 
     <section ng-if="showInstancesBreakdown" class="endpoint-instances">
         <div class="row">
-            <div class="col-sm-12 no-side-padding">
+            <div class="col-xs-12 no-side-padding">
 
                 <!-- Breakdown by instance -->
                 <busy ng-show="loading" message="Loading details"></busy>
 
                 <div ng-show="!loading" class="row box box-no-click table-head-row">
-                    <div class="col-sm-4 col-xl-8">
+                    <div class="col-xs-8">
                         <div class="row box-header">
-                            <div class="col-sm-12">
+                            <div class="col-xs-12">
                                 Instance Name
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
                                 Throughput <span class="table-header-unit">(msgs/s)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
                                 Scheduled retry rate <span class="table-header-unit">(msgs/s)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
                                 Processing Time <span class="table-header-unit">(t)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
                                 Critical Time <span class="table-header-unit">(t)</span>
                             </div>
                         </div>
                     </div>
                 </div>
+                
+                <no-data ng-show="endpoint.instances.length == 0" message="No messages processed in this period of time."></no-data>
 
                 <div class="row">
-                    <div class="col-sm-12 no-side-padding">
+                    <div class="col-xs-12 no-side-padding">
                         <div class="row box endpoint-row" ng-repeat="instance in endpoint.instances">
-                            <div class="col-sm-12 no-side-padding">
+                            <div class="col-xs-12 no-side-padding">
                                 <div class="row">
-                                    <div class="col-sm-4 col-xl-8 endpoint-name">
+                                    <div class="col-xs-8 endpoint-name">
                                         <div class="row box-header">
                                             <div class="col-lg-max-9 no-side-padding lead righ-side-ellipsis" uib-tooltip="{{instance.name}}">
                                                 {{instance.name}}
                                             </div>
-                                            <div class="col-lg-4 endpoint-status">
+                                            <div class="col-xs-4 endpoint-status">
                                                 <span class="warning" ng-if="instance.isScMonitoringDisconnected">
                                                     <i class="fa pa-monitoring-lost endpoint-details" uib-tooltip="Unable to connect to monitoring server"></i>
                                                 </span>
@@ -280,7 +282,7 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="instance.metrics.throughput" minimum-YAxis="{{smallGraphsMinimumYAxis.throughput}}" class="graph throughput pull-left"></graph>
@@ -291,7 +293,7 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-2 col-xs-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="instance.metrics.retries" minimum-YAxis="{{smallGraphsMinimumYAxis.retries}}" class="graph retries pull-left"></graph>
@@ -302,27 +304,31 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="instance.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
                                             </div>
-                                            <div class="no-side-padding sparkline-value">
+                                            <div class="no-side-padding sparkline-value" ng-class="instance.metrics.processingTime.displayValue.unit">
                                                 {{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.processingTime.displayValue.value}}
                                                 <strong ng-if="instance.isStale || instance.isScMonitoringDisconnected">?</strong>
-                                                <span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false">{{instance.metrics.processingTime.displayValue.unit}}</span>
+                                                <span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false" class="unit">
+                                                    {{instance.metrics.processingTime.displayValue.unit}}
+                                                </span>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="instance.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
                                             </div>
-                                            <div class="no-side-padding sparkline-value">
+                                            <div class="no-side-padding sparkline-value" ng-class="instance.metrics.criticalTime.displayValue.unit">
                                                 {{(instance.isStale == true || instance.isScMonitoringDisconnected == true) ? "" : instance.metrics.criticalTime.displayValue.value}}
                                                 <strong ng-if="instance.isStale || instance.isScMonitoringDisconnected">?</strong>
-                                                <span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false">{{instance.metrics.criticalTime.displayValue.unit}}</span>
+                                                <span ng-if="instance.isStale == false && instance.isScMonitoringDisconnected == false" class="unit">
+                                                    {{instance.metrics.criticalTime.displayValue.unit}}
+                                                </span>
                                             </div>
                                         </div>
                                     </div>
@@ -337,54 +343,56 @@ <h5 ng-class="{active: showInstancesBreakdown}">
 
     <section ng-if="!showInstancesBreakdown" class="endpoint-message-types">
         <div class="row">
-            <div class="col-sm-12 no-side-padding">
+            <div class="col-xs-12 no-side-padding">
                 <!-- Breakdown by message type-->
                 <busy ng-show="loading" message="Loading details"></busy>
 
                 <div ng-show="!loading" class="row box box-no-click table-head-row">
-                    <div class="col-sm-4 col-xl-8">
+                    <div class="col-xs-4 col-xl-8">
                         <div class="row box-header">
-                            <div class="col-sm-12">
+                            <div class="col-xs-12">
                                 Message type name
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-2 col-xl-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
                                 Throughput <span class="table-header-unit">(msgs/s)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-2 col-xl-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
                                 Scheduled retry rate <span class="table-header-unit">(msgs/s)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-2 col-xl-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
                                 Processing Time <span class="table-header-unit">(t)</span>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                    <div class="col-xs-2 col-xl-1 no-side-padding">
                         <div class="row box-header">
-                            <div class="col-sm-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
+                            <div class="col-xs-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
                                 Critical Time <span class="table-header-unit">(t)</span>
                             </div>
                         </div>
                     </div>
                 </div>
+                
+                <no-data ng-show="endpoint.messageTypes.length == 0" message="No messages processed in this period of time."></no-data>
 
                 <div class="row">
-                    <div class="col-sm-12 no-side-padding">
+                    <div class="col-xs-12 no-side-padding">
                         <div class="row box endpoint-row" ng-repeat="messageType in endpoint.messageTypes">
-                            <div class="col-sm-12 no-side-padding">
+                            <div class="col-xs-12 no-side-padding">
                                 <div class="row">
-                                    <div class="col-sm-4 col-xl-8 endpoint-name" uib-tooltip-html="messageType.tooltipText">
+                                    <div class="col-xs-4 col-xl-8 endpoint-name" uib-tooltip-html="messageType.tooltipText">
                                         <div class="row box-header">
                                             <div class="col-lg-max-9 no-side-padding lead message-type-label righ-side-ellipsis">
                                                 <div class="lead" >
@@ -411,7 +419,7 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             <div ng-show="{{messageType.publicKeyToken && messageType.publicKeyToken != 'null'}}" class="message-type-part">{{'PublicKeyToken=' + messageType.publicKeyToken}}</div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-2 col-xl-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="messageType.metrics.throughput" minimum-YAxis="{{smallGraphsMinimumYAxis.throughput}}" class="graph throughput pull-left"></graph>
@@ -422,7 +430,7 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-2 col-xl-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="messageType.metrics.retries" minimum-YAxis="{{smallGraphsMinimumYAxis.retries}}" class="graph retries pull-left"></graph>
@@ -433,27 +441,31 @@ <h5 ng-class="{active: showInstancesBreakdown}">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-2 col-xl-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="messageType.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
                                             </div>
-                                            <div class="no-side-padding sparkline-value">
+                                            <div class="no-side-padding sparkline-value" ng-class="messageType.metrics.processingTime.displayValue.unit">
                                                 {{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.processingTime.displayValue.value}}
                                                 <strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
-                                                <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false">{{messageType.metrics.processingTime.displayValue.unit}}</span>
+                                                <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit">
+                                                    {{messageType.metrics.processingTime.displayValue.unit}}
+                                                </span>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="col-sm-2 col-xl-1 no-side-padding">
+                                    <div class="col-xs-2 col-xl-1 no-side-padding">
                                         <div class="row box-header">
                                             <div class="no-side-padding">
                                                 <graph plot-data="messageType.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
                                             </div>
-                                            <div class="no-side-padding sparkline-value">
+                                            <div class="no-side-padding sparkline-value" ng-class="messageType.metrics.criticalTime.displayValue.unit">
                                                 {{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : messageType.metrics.criticalTime.displayValue.value}}
                                                 <strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
-                                                <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false">{{messageType.metrics.criticalTime.displayValue.unit}}</span>
+                                                <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit">
+                                                    {{messageType.metrics.criticalTime.displayValue.unit}}
+                                                </span>
                                             </div>
                                         </div>
                                     </div>
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 df1d8e033d..70763b43cd 100644
--- a/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
+++ b/src/ServicePulse.Host/app/modules/monitoring/views/monitored_endpoints.html
@@ -1,12 +1,12 @@
 <div class="container" ng-show="endpoints.length">
     <div class="row monitoring-head">
-        <div class="col-sm-9 no-side-padding list-section">
+        <div class="col-xs-9 no-side-padding list-section">
             <h1>Endpoints overview</h1>
         </div>
-        <div class="col-sm-3 no-side-padding toolbar-menus">
+        <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>
@@ -17,44 +17,44 @@ <h1>Endpoints overview</h1>
     <section ng-show="true">
         <div ng-include="'modules/monitoring/views/monitoring_not_available.html'" ng-show="!endpoints.length"></div>
         <div ng-show="endpoints.length" class="row box box-no-click table-head-row">
-            <div class="col-sm-2 col-xl-7">
+            <div class="col-xs-2 col-xl-7">
                 <div class="row box-header">
-                    <div class="col-sm-12">
+                    <div class="col-xs-12">
                         Endpoint name
                     </div>
                 </div>
             </div>
-            <div class="col-sm-2 col-xl-1 no-side-padding">
+            <div class="col-xs-2 col-xl-1 no-side-padding">
                 <div class="row box-header">
-                    <div class="col-sm-12 no-side-padding" uib-tooltip="Queue length: The number of messages waiting to be processed in the input queue(s) of the endpoint.">
+                    <div class="col-xs-12 no-side-padding" uib-tooltip="Queue length: The number of messages waiting to be processed in the input queue(s) of the endpoint.">
                         Queue Length <span class="table-header-unit">(msgs)</span>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-2 col-xl-1 no-side-padding">
+            <div class="col-xs-2 col-xl-1 no-side-padding">
                 <div class="row box-header">
-                    <div class="col-sm-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
+                    <div class="col-xs-12 no-side-padding" uib-tooltip="Throughput: The number of messages per second successfully processed by a receiving endpoint.">
                         Throughput <span class="table-header-unit">(msgs/s)</span>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-2 col-xl-1 no-side-padding">
+            <div class="col-xs-2 col-xl-1 no-side-padding">
                 <div class="row box-header">
-                    <div class="col-sm-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
+                    <div class="col-xs-12 no-side-padding" uib-tooltip="Scheduled retry rate: The number of messages per second scheduled for retries (immediate or delayed).">
                         Scheduled retry rate <span class="table-header-unit">(msgs/s)</span>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-2 col-xl-1 no-side-padding">
+            <div class="col-xs-2 col-xl-1 no-side-padding">
                 <div class="row box-header">
-                    <div class="col-sm-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
+                    <div class="col-xs-12 no-side-padding" uib-tooltip="Processing time: The time taken for a receiving endpoint to successfully process a message.">
                         Processing Time <span class="table-header-unit">(t)</span>
                     </div>
                 </div>
             </div>
-            <div class="col-sm-2 col-xl-1 no-side-padding">
+            <div class="col-xs-2 col-xl-1 no-side-padding">
                 <div class="row box-header">
-                    <div class="col-sm-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
+                    <div class="col-xs-12 no-side-padding" uib-tooltip="Critical time: The elapsed time from when a message was sent, until it was successfully processed by a receiving endpoint.">
                         Critical Time <span class="table-header-unit">(t)</span>
                     </div>
                 </div>
@@ -62,16 +62,16 @@ <h1>Endpoints overview</h1>
         </div>
 
         <div class="row">
-            <div class="col-sm-12 no-side-padding">
+            <div class="col-xs-12 no-side-padding">
                 <div class="row box endpoint-row" ng-repeat="endpoint in endpoints" ng-mouseenter="endpoint.hover1=true" ng-mouseleave="endpoint.hover1=false">
-                    <div class="col-sm-12 no-side-padding">
+                    <div class="col-xs-12 no-side-padding">
                         <div class="row">
-                                <div class="col-sm-2 col-xl-7 endpoint-name name-overview">
+                                <div class="col-xs-2 col-xl-7 endpoint-name name-overview">
                                     <div class="row box-header">
                                         <div class="col-lg-max-8 no-side-padding lead righ-side-ellipsis" uib-tooltip="{{endpoint.name}}">
                                             <a ng-click="endpoint.isExpanded = !endpoint.isExpanded" ng-href="{{getDetailsUrl(endpoint)}}">{{endpoint.name}}</a>
                                         </div>
-                                        <div class="col-lg-5 no-side-padding endpoint-status">
+                                        <div class="col-xs-5 no-side-padding endpoint-status">
                                             <span class="warning" ng-if="endpoint.isScMonitoringDisconnected">
                                                 <i class="fa pa-monitoring-lost endpoints-overview" uib-tooltip="Unable to connect to monitoring server"></i>
                                             </span>
@@ -87,7 +87,7 @@ <h1>Endpoints overview</h1>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-2 col-xl-1 no-side-padding">
+                                <div class="col-xs-2 col-xl-1 no-side-padding">
                                     <div class="row box-header">
                                         <div class="no-side-padding">
                                             <graph plot-data="endpoint.metrics.queueLength" minimum-YAxis="{{smallGraphsMinimumYAxis.queueLength}}" class="graph queue-length pull-left"></graph>
@@ -98,7 +98,7 @@ <h1>Endpoints overview</h1>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-2 col-xl-1 no-side-padding">
+                                <div class="col-xs-2 col-xl-1 no-side-padding">
                                     <div class="row box-header">
                                         <div class="no-side-padding">
                                             <graph plot-data="endpoint.metrics.throughput" minimum-YAxis="{{smallGraphsMinimumYAxis.throughput}}" class="graph throughput pull-left"></graph>
@@ -109,7 +109,7 @@ <h1>Endpoints overview</h1>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-2 col-xl-1 no-side-padding">
+                                <div class="col-xs-2 col-xl-1 no-side-padding">
                                     <div class="row box-header">
                                         <div class="no-side-padding">
                                             <graph plot-data="endpoint.metrics.retries" minimum-YAxis="{{smallGraphsMinimumYAxis.retries}}" class="graph retries pull-left"></graph>
@@ -120,27 +120,27 @@ <h1>Endpoints overview</h1>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-2 col-xl-1 no-side-padding">
+                                <div class="col-xs-2 col-xl-1 no-side-padding">
                                     <div class="row box-header">
                                         <div class="no-side-padding">
                                             <graph plot-data="endpoint.metrics.processingTime" minimum-YAxis="{{smallGraphsMinimumYAxis.processingTime}}" class="graph processing-time pull-left"></graph>
                                         </div>
-                                        <div class="no-side-padding sparkline-value">
+                                        <div class="no-side-padding sparkline-value" ng-class="endpoint.metrics.processingTime.displayValue.unit">
                                             {{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.processingTime.displayValue.value}}
                                             <strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
-                                            <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false"> {{endpoint.metrics.processingTime.displayValue.unit}}</span>
+                                            <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit"> {{endpoint.metrics.processingTime.displayValue.unit}}</span>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-sm-2 col-xl-1 no-side-padding">
+                                <div class="col-xs-2 col-xl-1 no-side-padding">
                                     <div class="row box-header">
                                         <div class="no-side-padding">
                                             <graph plot-data="endpoint.metrics.criticalTime" minimum-YAxis="{{smallGraphsMinimumYAxis.criticalTime}}" class="graph critical-time pull-left"></graph>
                                         </div>
-                                        <div class="no-side-padding sparkline-value">
+                                        <div class="no-side-padding sparkline-value" ng-class="endpoint.metrics.criticalTime.displayValue.unit">
                                             {{(endpoint.isStale == true || endpoint.isScMonitoringDisconnected == true) ? "" : endpoint.metrics.criticalTime.displayValue.value}}
                                             <strong ng-if="endpoint.isStale || endpoint.isScMonitoringDisconnected">?</strong>
-                                            <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false"> {{endpoint.metrics.criticalTime.displayValue.unit}}</span>
+                                            <span ng-if="endpoint.isStale == false && endpoint.isScMonitoringDisconnected == false" class="unit"> {{endpoint.metrics.criticalTime.displayValue.unit}}</span>
                                         </div>
                                     </div>
                                 </div>
diff --git a/src/ServicePulse.Install.CustomActions/CustomAction.cs b/src/ServicePulse.Install.CustomActions/CustomAction.cs
index 8030d2a857..677c33000b 100644
--- a/src/ServicePulse.Install.CustomActions/CustomAction.cs
+++ b/src/ServicePulse.Install.CustomActions/CustomAction.cs
@@ -1,4 +1,6 @@
-namespace ServicePulse.Install.CustomActions
+using System.Management;
+
+namespace ServicePulse.Install.CustomActions
 {
     using System;
     using System.Diagnostics;
@@ -168,7 +170,51 @@ public static ActionResult CheckPulsePort(Session session)
                 Log(session, "End custom action CheckPulsePort");
             }
         }
-       
+
+        [CustomAction]
+        public static ActionResult DetectExistingPulseInstancePort(Session session)
+        {
+            try
+            {
+                Log(session, "Start custom action DetectExistingPulseInstancePort");
+
+                var managementClass = new ManagementClass("Win32_Service");
+
+                foreach (var wmiService in managementClass.GetInstances())
+                {
+                    if (wmiService["Name"].ToString() == "Particular.ServicePulse")
+                    {
+                        var pathName = wmiService["PathName"].ToString();
+
+                        var match = Regex.Match(pathName, @".*--url=""(?<serviceurl>.+)"".*");
+                        var serviceUrlGroup = match.Groups["serviceurl"];
+
+                        if (serviceUrlGroup.Success)
+                        {
+                            var url = serviceUrlGroup.Value;
+
+                            if (Uri.TryCreate(url, UriKind.Absolute, out var uri))
+                            {
+                                var port = uri.Port;
+
+                                session.Set("INST_PORT_PULSE", port.ToString());
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log(session, ex.ToString());
+            }
+            finally 
+            {
+                Log(session, "End custom action DetectExistingPulseInstancePort");
+            }
+
+            return ActionResult.Success;
+        }
+
         [CustomAction]
         public static ActionResult ReadServiceControlUrlFromConfigJS(Session session)
         {
diff --git a/src/ServicePulse.Install.CustomActions/ServicePulse.Install.CustomActions.csproj b/src/ServicePulse.Install.CustomActions/ServicePulse.Install.CustomActions.csproj
index aeb8e985d4..c7cdcd09c1 100644
--- a/src/ServicePulse.Install.CustomActions/ServicePulse.Install.CustomActions.csproj
+++ b/src/ServicePulse.Install.CustomActions/ServicePulse.Install.CustomActions.csproj
@@ -40,7 +40,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject />
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
@@ -48,6 +49,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Setup/ServicePulse.aip b/src/Setup/ServicePulse.aip
index 9e0520d63e..655cec4974 100644
--- a/src/Setup/ServicePulse.aip
+++ b/src/Setup/ServicePulse.aip
@@ -38,8 +38,6 @@
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ServicePulse"/>
     <ROW Property="ProductVersion" Value="1.0.0" Type="32"/>
-    <ROW Property="SC_CONFIG_VALID" Value="FALSE"/>
-    <ROW Property="SC_MONITORING_CONFIG_VALID" Value="FALSE"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{7682150C-DFE3-4CF0-B565-1C4BEF9A787E}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -214,17 +212,22 @@
     <ROW Dialog_="FeatureConfiguration" Control="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Attributes="3" Text="[ButtonText_Back]" Order="300" TextLocId="-"/>
     <ROW Dialog_="FeatureConfiguration" Control="BottomLine" Type="Line" X="0" Y="234" Width="372" Height="0" Attributes="1" Order="400"/>
     <ROW Dialog_="FeatureConfiguration" Control="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Attributes="1048577" Text="[BannerBitmap]" Order="500"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Text_1" Type="Text" X="20" Y="96" Width="53" Height="31" Attributes="65539" Property="TEXT_1_PROP_1" Text="Port" TextStyle="DlgFontBold8" Order="600"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Edit_1" Type="Edit" X="45" Y="94" Width="32" Height="15" Attributes="3" Property="INST_PORT_PULSE" Text="{260}" Order="700"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Edit_2" Type="Edit" X="99" Y="149" Width="247" Height="15" Attributes="3" Property="INST_URI" Text="{260}" Order="800"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Text_2" Type="Text" X="23" Y="152" Width="89" Height="15" Attributes="65539" Property="TEXT_2_PROP_2" Text="ServiceControl URI" Order="900"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Text_3" Type="Text" X="20" Y="74" Width="272" Height="16" Attributes="65539" Property="TEXT_3_PROP_2" Text="Specify the port number ServicePulse will listen on" Order="1000"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_1" Type="Text" X="20" Y="81" Width="53" Height="31" Attributes="65539" Property="TEXT_1_PROP_1" Text="Port" TextStyle="DlgFontBold8" Order="600"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Edit_1" Type="Edit" X="45" Y="79" Width="32" Height="15" Attributes="3" Property="INST_PORT_PULSE" Text="{260}" Order="700"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Edit_2" Type="Edit" X="99" Y="124" Width="218" Height="15" Attributes="3" Property="INST_URI" Text="{260}" Order="800"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_2" Type="Text" X="23" Y="127" Width="89" Height="15" Attributes="65539" Property="TEXT_2_PROP_2" Text="ServiceControl URI" Order="900"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_3" Type="Text" X="20" Y="59" Width="272" Height="16" Attributes="65539" Property="TEXT_3_PROP_2" Text="Specify the port number ServicePulse will listen on" Order="1000"/>
     <ROW Dialog_="FeatureConfiguration" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="ServicePulse Configuration" TextStyle="[DlgTitleFont]" Order="1100" TextLocId="Control.Text.FolderDlg#Title"/>
     <ROW Dialog_="FeatureConfiguration" Control="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Attributes="196611" Text="Adjust configuration settings" Order="1200" TextLocId="Control.Text.FolderDlg#Description"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Edit_3" Type="Edit" X="100" Y="201" Width="246" Height="15" Attributes="3" Property="INST_SC_MONITORING_URI" Text="{260}" Order="1300"/>
-    <ROW Dialog_="FeatureConfiguration" Control="Text_5" Type="Text" X="25" Y="204" Width="89" Height="53" Attributes="65539" Property="TEXT_2_PROP_1_1" Text="Monitoring URI" Order="1400"/>
-    <ROW Dialog_="FeatureConfiguration" Control="CheckBox_1" Type="CheckBox" X="20" Y="127" Width="216" Height="21" Attributes="3" Property="ENABLE_SERVICECONTROL" Text="Enable Recoverability and Auditing features" TextStyle="DlgFontBold8" Order="1500"/>
-    <ROW Dialog_="FeatureConfiguration" Control="CheckBox_2" Type="CheckBox" X="20" Y="181" Width="142" Height="19" Attributes="3" Property="ENABLE_MONITORING" Text="Enable endpoint monitoring" TextStyle="DlgFontBold8" Order="1600"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Edit_3" Type="Edit" X="100" Y="167" Width="217" Height="15" Attributes="3" Property="INST_SC_MONITORING_URI" Text="{260}" Order="1300"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_5" Type="Text" X="25" Y="169" Width="89" Height="18" Attributes="65539" Property="TEXT_2_PROP_1_1" Text="Monitoring URI" Order="1400"/>
+    <ROW Dialog_="FeatureConfiguration" Control="CheckBox_1" Type="CheckBox" X="20" Y="102" Width="216" Height="21" Attributes="3" Property="ENABLE_SERVICECONTROL" Text="Enable Recoverability and Auditing features" TextStyle="DlgFontBold8" Order="1500"/>
+    <ROW Dialog_="FeatureConfiguration" Control="CheckBox_2" Type="CheckBox" X="20" Y="147" Width="142" Height="19" Attributes="3" Property="ENABLE_MONITORING" Text="Enable endpoint monitoring" TextStyle="DlgFontBold8" Order="1600"/>
+    <ROW Dialog_="FeatureConfiguration" Control="TestSCConnectivity" Type="PushButton" X="323" Y="123" Width="37" Height="17" Attributes="3" Text="Test" Order="1700"/>
+    <ROW Dialog_="FeatureConfiguration" Control="TestSCMonitoringConnectivity" Type="PushButton" X="323" Y="166" Width="37" Height="17" Attributes="3" Text="Test" Order="1800"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_4" Type="Text" X="46" Y="197" Width="301" Height="23" Attributes="65539" Property="TEXT_4_PROP" Text="if you don&apos;t yet have a ServiceControl and/or Monitoring instance, it is recommended " Order="1900"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_6" Type="Text" X="20" Y="197" Width="28" Height="19" Attributes="65539" Property="TEXT_6_PROP" Text="Note:" TextStyle="DlgFontBold8" Order="2000"/>
+    <ROW Dialog_="FeatureConfiguration" Control="Text_7" Type="Text" X="46" Y="209" Width="302" Height="12" Attributes="65539" Property="TEXT_7_PROP" Text="to note down the above URIs and use them when later creating those instances." Order="2100"/>
     <ROW Dialog_="FilesInUse" Control="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Attributes="196611" Text="Files in Use" TextStyle="[DlgTitleFont]" Order="600" TextLocId="Control.Text.FilesInUse#Title" MsiKey="FilesInUse#Title"/>
     <ROW Dialog_="FilesInUse" Control="Text" Type="Text" X="20" Y="55" Width="330" Height="30" Attributes="3" Text="The following applications are using files that need to be updated by this setup. You can either close the applications and then click &quot;Retry&quot;, or click &quot;Ignore&quot; so that the installer continues the installation and replaces these files when your system restarts." Order="700" TextLocId="Control.Text.FilesInUse#Text" MsiKey="FilesInUse#Text"/>
     <ROW Dialog_="FilesInUse" Control="List" Type="ListBox" X="20" Y="87" Width="330" Height="130" Attributes="7" Property="FileInUseProcess" Order="800" MsiKey="FilesInUse#List"/>
@@ -300,6 +303,10 @@
     <ROW Dialog_="FeatureConfiguration" Control_="Text_5" Action="Disable" Condition="NOT ENABLE_MONITORING"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Edit_3" Action="Enable" Condition="ENABLE_MONITORING"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Edit_3" Action="Disable" Condition="NOT ENABLE_MONITORING"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Action="Enable" Condition="ENABLE_SERVICECONTROL"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Action="Disable" Condition="NOT ENABLE_SERVICECONTROL"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Action="Enable" Condition="ENABLE_MONITORING"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Action="Disable" Condition="NOT ENABLE_MONITORING"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
     <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="LicenseAgreementDlg" Condition="AI_INSTALL" Ordering="1"/>
@@ -333,46 +340,51 @@
     <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="Check_SC_URL" Condition="AI_INSTALL AND ( VALID_PORT = &quot;TRUE&quot; )" Ordering="7"/>
     <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="Check_SP_PORT" Condition="AI_INSTALL" Ordering="4"/>
     <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="Connect_SC" Condition="AI_INSTALL AND ( VALID_CONTROL_URL=&quot;TRUE&quot; )" Ordering="8"/>
-    <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="Warning_ServiceControl_Unavail_msg" Condition="AI_INSTALL AND ( CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="14"/>
     <ROW Dialog_="LicenseAgreementDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
     <ROW Dialog_="LicenseAgreementDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
-    <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_1" Condition="AI_INSTALL AND ( CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="13"/>
     <ROW Dialog_="Configuration" Control_="TemplateSeqDlgDialogInitializer" Event="DoAction" Argument="ReadServiceControlUrlFromConfigJS" Condition="AI_INSTALL" Ordering="1"/>
     <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="Invalid_ServiceControlUrl_Msg" Condition="AI_INSTALL AND ( VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="12"/>
     <ROW Dialog_="Configuration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_4" Condition="AI_INSTALL AND ( VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="11"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Invalid_ServiceControlUrl_Msg" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="13"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_4" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="12"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Check_SC_URL" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot;)" Ordering="8"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Warning_ServiceControl_Unavail_msg" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="16"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_1" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="15"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Warning_ServiceControlMonitoring_Unavail_msg" Condition="AI_INSTALL AND (ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;FALSE&quot; )" Ordering="31"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_6" Condition="AI_INSTALL AND (ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;FALSE&quot; )" Ordering="30"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Check_SP_PORT" Condition="AI_INSTALL" Ordering="4"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Invalid_ServicePulseUrl_Msg" Condition="AI_INSTALL AND ( VALID_PORT = &quot;FALSE&quot; )" Ordering="7"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_3" Condition="AI_INSTALL AND ( VALID_PORT = &quot;FALSE&quot; )" Ordering="6"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Connect_SC" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; )" Ordering="14"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Connect_SC_Monitoring" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; )" Ordering="29"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Check_SC_Monitoring_URL" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; )" Ordering="26"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="Invalid_ServiceControlMonitoringUrl_Msg" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;FALSE&quot; )" Ordering="28"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="DoAction" Argument="AI_DATA_SETTER_5" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;FALSE&quot; )" Ordering="27"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Cancel" Event="SpawnDialog" Argument="CancelDlg" Condition="1" Ordering="100"/>
     <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="FeatureConfiguration" Condition="AI_INSTALL AND ( ENABLE_FEATURE_SELECTION=&quot;TRUE&quot; )" Ordering="201"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="(VALID_PORT=&quot;TRUE&quot;) AND (ENABLE_SERVICECONTROL OR ENABLE_MONITORING) AND (NOT ENABLE_SERVICECONTROL OR SC_CONFIG_VALID=&quot;TRUE&quot;) AND (NOT ENABLE_MONITORING OR SC_MONITORING_CONFIG_VALID=&quot;TRUE&quot;)" Ordering="34"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="(VALID_PORT=&quot;TRUE&quot;) AND (ENABLE_SERVICECONTROL OR ENABLE_MONITORING)" Ordering="34"/>
     <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FeatureConfiguration" Condition="AI_INSTALL AND ( ENABLE_FEATURE_SELECTION=&quot;TRUE&quot; )" Ordering="201"/>
     <ROW Dialog_="Configuration" Control_="TemplateSeqDlgDialogInitializer" Event="[INST_SC_MONITORING_URI]" Argument="&quot;&quot;" Condition="AI_INSTALL" Ordering="2"/>
     <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="DoAction" Argument="ReadServiceControlUrlFromConfigJS" Condition="1" Ordering="0"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_SERVICECONTROL]" Argument="TRUE" Condition="INST_URI" Ordering="8"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_SERVICECONTROL]" Argument="TRUE" Condition="INST_URI" Ordering="10"/>
     <ROW Dialog_="FeatureConfiguration" Control_="CheckBox_1" Event="[INST_URI]" Argument="[DEFAULT_SC_URI]" Condition="( ENABLE_SERVICECONTROL ) AND (NOT INST_URI)" Ordering="0"/>
     <ROW Dialog_="FeatureConfiguration" Control_="CheckBox_2" Event="[INST_SC_MONITORING_URI]" Argument="[DEFAULT_SC_MONITORING_URI]" Condition="( ENABLE_MONITORING ) AND (NOT INST_SC_MONITORING_URI)" Ordering="0"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_MONITORING]" Argument="TRUE" Condition="INST_SC_MONITORING_URI" Ordering="5"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_MONITORING]" Argument="TRUE" Condition="INST_SC_MONITORING_URI" Ordering="8"/>
     <ROW Dialog_="FeatureConfiguration" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="1" Ordering="1"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_MONITORING]" Argument="[INST_SC_MONITORING_URI]" Condition="( NOT INST_SC_MONITORING_URI )" Ordering="7"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_SERVICECONTROL]" Argument="INST_URI" Condition="( NOT INST_URI )" Ordering="9"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_MONITORING]" Argument="[INST_SC_MONITORING_URI]" Condition="( NOT INST_SC_MONITORING_URI )" Ordering="9"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="[ENABLE_SERVICECONTROL]" Argument="INST_URI" Condition="( NOT INST_URI )" Ordering="11"/>
     <ROW Dialog_="Configuration" Control_="TemplateSeqDlgDialogInitializer" Event="[INST_URI]" Argument="[DEFAULT_SC_URI]" Condition="AI_INSTALL AND ( NOT INST_URI )" Ordering="3"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="[SC_MONITORING_CONFIG_VALID]" Argument="FALSE" Condition="1" Ordering="32"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="[SC_MONITORING_CONFIG_VALID]" Argument="TRUE" Condition="VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND (CONTACT_SERVICECONTROL_MONITORING=&quot;TRUE&quot; OR IGNORE_SERVICECONTROLMONITORING_OFFLINE&lt;&gt;&quot;IDNO&quot;)" Ordering="33"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="[SC_CONFIG_VALID]" Argument="FALSE" Condition="1" Ordering="24"/>
-    <ROW Dialog_="FeatureConfiguration" Control_="Next" Event="[SC_CONFIG_VALID]" Argument="TRUE" Condition="VALID_CONTROL_URL=&quot;TRUE&quot; AND (CONTACT_SERVICECONTROL=&quot;TRUE&quot; OR IGNORE_SERVICECONTROL_OFFLINE&lt;&gt;&quot;IDNO&quot;)" Ordering="25"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="Check_SC_URL" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; )" Ordering="0"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="Invalid_ServiceControlUrl_Msg" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="2"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_4" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;FALSE&quot; )" Ordering="1"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="Connect_SC" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; )" Ordering="3"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="Warning_ServiceControl_Unavail_msg" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="5"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_1" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;FALSE&quot; )" Ordering="4"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="Success_ServiceControl_Avail_msg" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;TRUE&quot; )" Ordering="7"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_7" Condition="AI_INSTALL AND ( ENABLE_SERVICECONTROL=&quot;TRUE&quot; AND VALID_CONTROL_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL=&quot;TRUE&quot; )" Ordering="6"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="Check_SC_Monitoring_URL" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; )" Ordering="0"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="Invalid_ServiceControlMonitoringUrl_Msg" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;FALSE&quot; )" Ordering="2"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_5" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;FALSE&quot; )" Ordering="1"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="Connect_SC_Monitoring" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; )" Ordering="3"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="Warning_ServiceControlMonitoring_Unavail_msg" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;FALSE&quot; )" Ordering="5"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_6" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;FALSE&quot; )" Ordering="4"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="Success_ServiceControlMonitoring_Avail_msg" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;TRUE&quot; )" Ordering="7"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="TestSCMonitoringConnectivity" Event="DoAction" Argument="AI_DATA_SETTER_8" Condition="AI_INSTALL AND ( ENABLE_MONITORING=&quot;TRUE&quot; AND  VALID_CONTROL_MONITORING_URL=&quot;TRUE&quot; AND CONTACT_SERVICECONTROL_MONITORING=&quot;TRUE&quot; )" Ordering="6"/>
+    <ROW Dialog_="FeatureConfiguration" Control_="FeatureConfigurationDialogInitializer" Event="DoAction" Argument="DetectExistingPulseIntancePort" Condition="1" Ordering="7"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
@@ -381,12 +393,14 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_DATA_SETTER" Type="51" Source="AI_ExtractFiles" Target="[AI_SETUPEXEPATH]"/>
-    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="Could not connect to ServiceControl using the URI specified.  Do you wish to proceed with the install anyway?&#13;\n |ServicePulse[ProductVersion] |MB_YESNO,MB_ICONWARNING,MB_DEFBUTTON2|IGNORE_SERVICECONTROL_OFFLINE|[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="Could not connect to ServiceControl using the specified URI.&#13;\n |ServicePulse [ProductVersion] |MB_OK,MB_ICONWARNING,MB_DEFBUTTON1||[CLIENTPROCESSID]"/>
     <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="Particular.ServicePulse"/>
     <ROW Action="AI_DATA_SETTER_3" Type="51" Source="CustomActionData" Target="The specified port  for ServicePulse is invalid. Please choose port between 1 and 49151 |ServicePulse[ProductVersion] |MB_OK,MB_ICONWARNING,MB_DEFBUTTON1|BTN_PRESSED|[CLIENTPROCESSID]"/>
     <ROW Action="AI_DATA_SETTER_4" Type="51" Source="CustomActionData" Target="The URL specified for ServiceControl is invalid. |ServicePulse[ProductVersion] |MB_OK,MB_ICONWARNING,MB_DEFBUTTON1|BTN_PRESSED|[CLIENTPROCESSID]"/>
     <ROW Action="AI_DATA_SETTER_5" Type="51" Source="CustomActionData" Target="The URL specified for ServiceControl Monitoring is invalid. |ServicePulse[ProductVersion] |MB_OK,MB_ICONWARNING,MB_DEFBUTTON1|BTN_PRESSED|[CLIENTPROCESSID]"/>
-    <ROW Action="AI_DATA_SETTER_6" Type="51" Source="CustomActionData" Target="Could not connect to ServiceControl Monitoring using the URI specified.  Do you wish to proceed with the install anyway?&#13;\n |ServicePulse[ProductVersion] |MB_YESNO,MB_ICONWARNING,MB_DEFBUTTON2|IGNORE_SERVICECONTROLMONITORING_OFFLINE|[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DATA_SETTER_6" Type="51" Source="CustomActionData" Target="Could not connect to ServiceControl Monitoring using the specified URI.&#13;\n |ServicePulse[ProductVersion] |MB_OK,MB_ICONWARNING,MB_DEFBUTTON1|IGNORE_SERVICECONTROLMONITORING_OFFLINE|[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DATA_SETTER_7" Type="51" Source="CustomActionData" Target="Successfully connected to ServiceControl.&#13;\n |ServicePulse [ProductVersion] |MB_OK,MB_ICONINFORMATION,MB_DEFBUTTON1||[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DATA_SETTER_8" Type="51" Source="CustomActionData" Target="Successfully connected to ServiceControl Monitoring&#13;\n |ServicePulse [ProductVersion] |MB_OK,MB_ICONINFORMATION,MB_DEFBUTTON1||[CLIENTPROCESSID]"/>
     <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
     <ROW Action="AI_DeleteCadLzma" Type="51" Source="AI_DeleteLzma" Target="[AI_SETUPEXEPATH]"/>
     <ROW Action="AI_DeleteLzma" Type="1025" Source="lzmaextractor.dll" Target="DeleteLZMAFiles"/>
@@ -415,6 +429,7 @@
     <ROW Action="Check_SP_PORT" Type="1" Source="ServicePulse.Install.CustomActions.CA.dll_1" Target="CheckPulsePort" WithoutSeq="true"/>
     <ROW Action="Connect_SC" Type="1" Source="ServicePulse.Install.CustomActions.CA.dll_1" Target="ContactServiceControl" WithoutSeq="true"/>
     <ROW Action="Connect_SC_Monitoring" Type="1" Source="ServicePulse.Install.CustomActions.CA.dll_1" Target="ContactServiceControlMonitoring" WithoutSeq="true"/>
+    <ROW Action="DetectExistingPulseIntancePort" Type="1" Source="ServicePulse.Install.CustomActions.CA.dll_1" Target="DetectExistingPulseInstancePort" WithoutSeq="true"/>
     <ROW Action="DetectService" Type="1" Source="aicustact.dll" Target="DetectService" Options="3" AdditionalSeq="AI_DATA_SETTER_2"/>
     <ROW Action="Install_Service" Type="3074" Source="viewer.exe" Target="/HideWindow &quot;[#ServicePulse.Host.exe]&quot; --install --serviceName=&quot;Particular.ServicePulse&quot; --description=&quot;Monitoring and operations for NServiceBus&quot; --url=http://localhost:[INST_PORT_PULSE] --serviceControlUrl=[INST_URI] --serviceControlMonitoringUrl=[INST_SC_MONITORING_URI] --autostart" Options="1"/>
     <ROW Action="Invalid_ServiceControlMonitoringUrl_Msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_5"/>
@@ -429,6 +444,8 @@
     <ROW Action="SetUrlAcl" Type="1" Source="ServicePulse.Install.CustomActions.CA.dll_1" Target="SetUrlAcl"/>
     <ROW Action="Start_Service" Type="3138" Source="viewer.exe" Target="/HideWindow &quot;[SystemFolder]net.exe&quot; start Particular.ServicePulse"/>
     <ROW Action="Stop_Service" Type="66" Source="viewer.exe" Target="/HideWindow &quot;[SystemFolder]net.exe&quot; stop Particular.ServicePulse"/>
+    <ROW Action="Success_ServiceControlMonitoring_Avail_msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_8"/>
+    <ROW Action="Success_ServiceControl_Avail_msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="1" AdditionalSeq="AI_DATA_SETTER_7"/>
     <ROW Action="Uninstall_Service" Type="3074" Source="viewer.exe" Target="/HideWindow &quot;[#ServicePulse.Host.exe]&quot; --uninstall --serviceName=&quot;Particular.ServicePulse&quot;"/>
     <ROW Action="Warning_ServiceControlMonitoring_Unavail_msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="3" AdditionalSeq="AI_DATA_SETTER_6"/>
     <ROW Action="Warning_ServiceControl_Unavail_msg" Type="1" Source="aicustact.dll" Target="MsgBox" WithoutSeq="true" Options="3" AdditionalSeq="AI_DATA_SETTER_1"/>