diff --git a/rd_ui/app/scripts/controllers/admin_controllers.js b/rd_ui/app/scripts/controllers/admin_controllers.js
index 11cc103c0..5ac740f31 100644
--- a/rd_ui/app/scripts/controllers/admin_controllers.js
+++ b/rd_ui/app/scripts/controllers/admin_controllers.js
@@ -43,6 +43,7 @@
   var AdminTasksCtrl = function ($scope, $location, Events, $http, $timeout, $filter) {
     Events.record(currentUser, "view", "page", "admin/tasks");
     $scope.$parent.pageTitle = "Running Queries";
+    $scope.autoUpdate = true;
 
     $scope.gridConfig = {
       isPaginationEnabled: true,
@@ -121,11 +122,13 @@
     $scope.setTab($location.hash() || 'in_progress');
 
     var refresh = function () {
-      $scope.refresh_time = moment().add(1, 'minutes');
-      $http.get('/api/admin/queries/tasks').success(function (data) {
-        $scope.tasks = data;
-        $scope.showingTasks = $scope.tasks[$scope.selectedTab];
-      });
+      if ($scope.autoUpdate) {
+        $scope.refresh_time = moment().add(1, 'minutes');
+        $http.get('/api/admin/queries/tasks').success(function (data) {
+          $scope.tasks = data;
+          $scope.showingTasks = $scope.tasks[$scope.selectedTab];
+        });
+      }
 
       var timer = $timeout(refresh, 5 * 1000);
 
@@ -142,6 +145,7 @@
   var AdminOutdatedQueriesCtrl = function ($scope, Events, $http, $timeout, $filter) {
     Events.record(currentUser, "view", "page", "admin/outdated_queries");
     $scope.$parent.pageTitle = "Outdated Queries";
+    $scope.autoUpdate = true;
 
     $scope.gridConfig = {
       isPaginationEnabled: true,
@@ -190,13 +194,16 @@
     ];
 
     var refresh = function () {
-      $scope.refresh_time = moment().add(1, 'minutes');
-      $http.get('/api/admin/queries/outdated').success(function (data) {
-        $scope.queries = data.queries;
-        $scope.updatedAt = data.updated_at * 1000.0;
-      });
+      if ($scope.autoUpdate) {
+        $scope.refresh_time = moment().add(1, 'minutes');
+        $http.get('/api/admin/queries/outdated').success(function (data) {
+          $scope.queries = data.queries;
+          $scope.updatedAt = data.updated_at * 1000.0;
+        });
+      }
 
-      var timer = $timeout(refresh, 59 * 1000);
+      // var timer = $timeout(refresh, 59 * 1000);
+      var timer = $timeout(refresh, 10 * 1000);
 
       $scope.$on("$destroy", function () {
         if (timer) {
diff --git a/rd_ui/app/views/admin/outdated_queries.html b/rd_ui/app/views/admin/outdated_queries.html
index 8614e2e4d..7ff0fae2e 100644
--- a/rd_ui/app/views/admin/outdated_queries.html
+++ b/rd_ui/app/views/admin/outdated_queries.html
@@ -15,5 +15,6 @@
     <div class="badge">
       Last update: <span am-time-ago="updatedAt"></span>
     </div>
+    (<label><input type="checkbox" ng-model="autoUpdate"> Auto Update</label>)
   </div>
 </div>
diff --git a/rd_ui/app/views/admin/tasks.html b/rd_ui/app/views/admin/tasks.html
index 6a3065d76..06f12d2fc 100644
--- a/rd_ui/app/views/admin/tasks.html
+++ b/rd_ui/app/views/admin/tasks.html
@@ -18,6 +18,8 @@
     <smart-table rows="showingTasks" columns="gridColumns"
                  config="gridConfig"
                  class="table table-condensed table-hover"></smart-table>
+
+    <label><input type="checkbox" ng-model="autoUpdate"> Auto Update</label>
   </div>
 </div>
 
diff --git a/rd_ui/app/views/admin_status.html b/rd_ui/app/views/admin_status.html
index aa6c5a195..0222a4dba 100644
--- a/rd_ui/app/views/admin_status.html
+++ b/rd_ui/app/views/admin_status.html
@@ -39,7 +39,7 @@
         <li class="list-group-item active">Queues</li>
         <li class="list-group-item" ng-repeat="(name, value) in manager.queues">
           <span class="badge">{{value.size}}</span>
-          {{name}} ({{value.data_sources}})
+          {{name}} <span popover="{{value.data_sources}}" popover-trigger="mouseenter"><i class="fa fa-question-circle"></i></span>
         </li>
       </ul>
     </div>