diff --git a/app/server-health/controllers/inventory-overview-controller.html b/app/server-health/controllers/inventory-overview-controller.html
index e9f0e1c..e47c7b1 100644
--- a/app/server-health/controllers/inventory-overview-controller.html
+++ b/app/server-health/controllers/inventory-overview-controller.html
@@ -1,3 +1,4 @@
+<loader loading="loading"></loader>
 <div class="inventory-overview">
 	<div class="row column no-padding">
 		<h1>Hardware status</h1>
@@ -18,7 +19,6 @@
 				<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
 			</div>
 		</div>
-
 	</section>
 	<!-- end search -->
 	<section id="inventory-categories" class="row column">
diff --git a/app/server-health/controllers/inventory-overview-controller.js b/app/server-health/controllers/inventory-overview-controller.js
index 81fd833..c5e6189 100644
--- a/app/server-health/controllers/inventory-overview-controller.js
+++ b/app/server-health/controllers/inventory-overview-controller.js
@@ -23,10 +23,13 @@
                 $scope.originalData = {};
                 $scope.customSearch = "";
                 $scope.searchTerms = [];
+                $scope.loading = false;
 
                 APIUtils.getHardwares(function(data, originalData){
+                    $scope.loading = true;
                     $scope.hardwares = data;
                     $scope.originalData = JSON.stringify(originalData);
+                    $scope.loading = false;
                 });
 
                 $scope.doSearchOnEnter = function (event) {
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 0975e7f..2e48093 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -1,3 +1,4 @@
+<loader loading="loading"></loader>
 <div id="event-log">
     <div class="row column">
         <h1>Event log</h1>
@@ -55,7 +56,7 @@
                     <button class="inline btn-delete" ng-show="selectedEvents.length || all" ng-click="confirm= ! confirm">
                         <img class="event__icon" src="assets/images/icon-trashcan-white.svg" alt="">Delete
                     </button>
-                    <button class="inline btn-resolve" ng-show="selectedEvents.length || all" ng-click="resolve()">
+                    <button class="inline btn-resolve" ng-class="{'disabled': ((selectedEvents|unResolvedCount) == 0)}" ng-show="selectedEvents.length || all" ng-click="resolve()" ng-disabled="(selectedEvents|unResolvedCount) == 0">
                         <img class="event__icon" src="assets/images/icon-check-white.svg" alt="">Mark as resolved
                     </button>
                     <a ng-href="data:text/json;charset=utf-8,{{export_data}}" class="inline btn-export"  download="{{export_name}}" ng-show="selectedEvents.length || all">Export</a>
diff --git a/app/server-health/controllers/log-controller.js b/app/server-health/controllers/log-controller.js
index cf3f248..b53dae0 100644
--- a/app/server-health/controllers/log-controller.js
+++ b/app/server-health/controllers/log-controller.js
@@ -17,11 +17,16 @@
             'APIUtils', 
             'dataService',
             'Constants',
-            function($scope, $window, APIUtils, dataService, Constants){
+            '$routeParams',
+            function($scope, $window, APIUtils, dataService, Constants, $routeParams){
                 $scope.dataService = dataService;
                 $scope.logs = [];
                 $scope.tmz = 'EDT';
                 $scope.itemsPerPage = Constants.PAGINATION.LOG_ITEMS_PER_PAGE;
+                $scope.loading = false;
+
+                var sensorType = $routeParams.type;
+
                 // priority buttons
                 $scope.selectedSeverity = {
                     all: true,
@@ -29,6 +34,12 @@
                     medium: false,
                     high: false
                 };
+
+                if(sensorType == 'high'){
+                    $scope.selectedSeverity.all = false;
+                    $scope.selectedSeverity.high = true;
+                }
+
                 $scope.selectedStatus = {
                     all: true,
                     resolved: false
@@ -39,9 +50,11 @@
                 $scope.selectedEvents = [];
 
                 $scope.loadLogs = function(){
-                    APIUtils.getLogs(function(data, originalData){
-                        $scope.logs = data;
-                        $scope.originalData = originalData;
+                    $scope.loading = true;
+                    APIUtils.getLogs().then(function(result){
+                        $scope.logs = result.data;
+                        $scope.originalData = result.original;
+                        $scope.loading = false;
                     });
                 };
                 $scope.jsonData = function(data){
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index a310b9d..8ee8d8a 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -1,3 +1,4 @@
+<loader loading="loading"></loader>
 <div id="sensors-overview">
 	<div class="row column">
 		<h1>Sensors</h1>
diff --git a/app/server-health/controllers/sensors-overview-controller.js b/app/server-health/controllers/sensors-overview-controller.js
index d68b31f..90616b1 100644
--- a/app/server-health/controllers/sensors-overview-controller.js
+++ b/app/server-health/controllers/sensors-overview-controller.js
@@ -32,6 +32,7 @@
                     critical: false
                 };
                 $scope.export_name = "sensors.json";
+                $scope.loading = false;
                 $scope.jsonData = function(data){
                     var dt = {};
                     data.data.forEach(function(item){
@@ -110,11 +111,13 @@
                 }
 
                 $scope.loadSensorData = function(){
+                    $scope.loading = true;
                     APIUtils.getAllSensorStatus(function(data, originalData){
                         $scope.data = data;
                         $scope.originalData = originalData;
                         dataService.sensorData = data;
                         $scope.export_data = JSON.stringify(originalData);
+                        $scope.loading = false;
                     });
                 };