diff --git a/app/scripts/controllers/builds.js b/app/scripts/controllers/builds.js
index d9d4c2fd40..ac855828fe 100644
--- a/app/scripts/controllers/builds.js
+++ b/app/scripts/controllers/builds.js
@@ -24,9 +24,10 @@ angular.module('openshiftConsole')
     $scope.unfilteredBuildConfigs = {};
     $scope.buildConfigs = undefined;
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Loading...";
     $scope.latestByConfig = {};
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var buildConfigForBuild = $filter('buildConfigForBuild');
 
@@ -43,9 +44,9 @@ angular.module('openshiftConsole')
         var isPipeline = $filter('isJenkinsPipelineStrategy');
 
         watches.push(DataService.watch(buildsVersion, context, function(builds) {
+          $scope.buildsLoaded = true;
           // Filter out pipeline builds, which have a separate page.
           $scope.builds = _.omitBy(builds.by("metadata.name"), isPipeline);
-          $scope.emptyMessage = "No builds to show";
           associateBuildsToBuildConfig();
           LabelFilter.addLabelSuggestionsFromResources($scope.builds, $scope.labelSuggestions);
 
@@ -59,7 +60,7 @@ angular.module('openshiftConsole')
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
           $scope.buildConfigs = LabelFilter.getLabelSelector().select($scope.unfilteredBuildConfigs);
           associateBuildsToBuildConfig();
-          updateFilterWarning();
+          updateFilterMessage();
           Logger.log("buildconfigs (subscribe)", $scope.buildConfigs);
         }));
 
@@ -113,27 +114,17 @@ angular.module('openshiftConsole')
           });
         }
 
-        function updateFilterWarning() {
+        function updateFilterMessage() {
           var visibleBuilds = _.omitBy($scope.latestByConfig, _.isNull);
-          if (!LabelFilter.getLabelSelector().isEmpty() &&
-              _.isEmpty($scope.buildConfigs) &&
-              _.isEmpty(visibleBuilds)) {
-            $scope.alerts["builds"] = {
-              type: "warning",
-              details: "The active filters are hiding all builds."
-            };
-          }
-          else {
-            delete $scope.alerts["builds"];
-          }
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.buildConfigs) && _.isEmpty(visibleBuilds);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.buildConfigs = labelSelector.select($scope.unfilteredBuildConfigs);
             associateBuildsToBuildConfig();
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/configMaps.js b/app/scripts/controllers/configMaps.js
index d72aef0133..4c33c6448e 100644
--- a/app/scripts/controllers/configMaps.js
+++ b/app/scripts/controllers/configMaps.js
@@ -16,24 +16,17 @@ angular.module('openshiftConsole')
                         LabelFilter,
                         ProjectsService) {
     $scope.projectName = $routeParams.project;
-    $scope.alerts = $scope.alerts || {};
     $scope.loaded = false;
     $scope.labelSuggestions = {};
     $scope.configMapsVersion = APIService.getPreferredVersion('configmaps');
+    $scope.clearFilter = function () {
+      LabelFilter.clear();
+    };
     var watches = [];
     var configMaps;
 
-    var updateFilterWarning = function() {
-      if (!LabelFilter.getLabelSelector().isEmpty() &&
-          _.isEmpty($scope.configMaps) &&
-          !_.isEmpty(configMaps)) {
-        $scope.alerts["config-maps"] = {
-          type: "warning",
-          details: "The active filters are hiding all config maps."
-        };
-      } else {
-        delete $scope.alerts["config-maps"];
-      }
+    var updateFilterMessage = function() {
+      $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.configMaps) && !_.isEmpty(configMaps);
     };
 
     var updateLabelSuggestions = function() {
@@ -44,7 +37,7 @@ angular.module('openshiftConsole')
     var updateConfigMaps = function() {
       var filteredConfigMaps = LabelFilter.getLabelSelector().select(configMaps);
       $scope.configMaps = _.sortBy(filteredConfigMaps, 'metadata.name');
-      updateFilterWarning();
+      updateFilterMessage();
     };
 
     ProjectsService
@@ -60,7 +53,7 @@ angular.module('openshiftConsole')
         }));
 
         LabelFilter.onActiveFiltersChanged(function() {
-          $scope.$apply(updateConfigMaps);
+          $scope.$evalAsync(updateConfigMaps);
         });
 
         $scope.$on('$destroy', function(){
diff --git a/app/scripts/controllers/deployments.js b/app/scripts/controllers/deployments.js
index 6120536278..1f1923d92c 100644
--- a/app/scripts/controllers/deployments.js
+++ b/app/scripts/controllers/deployments.js
@@ -24,11 +24,14 @@ angular.module('openshiftConsole')
     $scope.unfilteredDeployments = {};
     $scope.replicationControllersByDC = {};
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
     $scope.emptyMessage = "Loading...";
     $scope.expandedDeploymentConfigRow = {};
     $scope.unfilteredReplicaSets = {};
     $scope.unfilteredReplicationControllers = {};
+    $scope.showEmptyState = true;
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var replicaSets, deploymentsByUID;
     var annotation = $filter('annotation');
@@ -38,6 +41,26 @@ angular.module('openshiftConsole')
     var replicationControllersVersion = APIService.getPreferredVersion('replicationcontrollers');
     var replicaSetsVersion = APIService.getPreferredVersion('replicasets');
 
+    function updateFilterMessage() {
+
+      var unfilteredDeploymentsEmpty =
+        _.isEmpty($scope.unfilteredDeploymentConfigs) &&
+        _.isEmpty($scope.unfilteredReplicationControllers) &&
+        _.isEmpty($scope.unfilteredDeployments) &&
+        _.isEmpty($scope.unfilteredReplicaSets);
+
+      var isFiltering = !LabelFilter.getLabelSelector().isEmpty();
+
+      var filteredDeploymentsEmpty =
+        _.isEmpty($scope.deploymentConfigs) &&
+        _.isEmpty($scope.replicationControllersByDC['']) &&
+        _.isEmpty($scope.deployments) &&
+        _.isEmpty($scope.replicaSets);
+
+      $scope.showEmptyState = unfilteredDeploymentsEmpty;
+      $scope.filterWithZeroResults = isFiltering && filteredDeploymentsEmpty && !unfilteredDeploymentsEmpty;
+    }
+
     var groupReplicaSets = function() {
       if (!replicaSets || !deploymentsByUID) {
         return;
@@ -58,6 +81,7 @@ angular.module('openshiftConsole')
         $scope.latestReplicaSetByDeploymentUID[deploymentUID] =
           DeploymentsService.getActiveReplicaSet(replicaSets, deploymentsByUID[deploymentUID]);
       });
+      updateFilterMessage();
     };
 
     var watches = [];
@@ -82,7 +106,7 @@ angular.module('openshiftConsole')
             LabelFilter.setLabelSuggestions($scope.labelSuggestions);
             $scope.replicationControllersByDC[''] = LabelFilter.getLabelSelector().select($scope.replicationControllersByDC['']);
           }
-          updateFilterWarning();
+          updateFilterMessage();
 
           if (!action) {
             // Loading of the page that will create deploymentConfigDeploymentsInProgress structure, which will associate running deployment to his deploymentConfig.
@@ -121,6 +145,7 @@ angular.module('openshiftConsole')
         }));
 
         watches.push(DataService.watch(deploymentConfigsVersion, context, function(deploymentConfigs) {
+          $scope.deploymentConfigsLoaded = true;
           $scope.unfilteredDeploymentConfigs = deploymentConfigs.by("metadata.name");
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredDeploymentConfigs, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
@@ -131,7 +156,7 @@ angular.module('openshiftConsole')
             $scope.unfilteredReplicationControllers = $scope.replicationControllersByDC[''];
             $scope.replicationControllersByDC[''] = LabelFilter.getLabelSelector().select($scope.replicationControllersByDC['']);
           }
-          updateFilterWarning();
+          updateFilterMessage();
           Logger.log("deploymentconfigs (subscribe)", $scope.deploymentConfigs);
         }));
 
@@ -144,54 +169,15 @@ angular.module('openshiftConsole')
           Logger.log("deployments (subscribe)", $scope.unfilteredDeployments);
         }));
 
-        function updateFilterWarning() {
-          var isFiltering = !LabelFilter.getLabelSelector().isEmpty();
-          if (!isFiltering) {
-            delete $scope.alerts["deployments"];
-            return;
-          }
-
-          var unfilteredDeploymentsEmpty =
-            _.isEmpty($scope.unfilteredDeploymentConfigs) &&
-            _.isEmpty($scope.unfilteredReplicationControllers) &&
-            _.isEmpty($scope.unfilteredDeployments) &&
-            _.isEmpty($scope.unfilteredReplicaSets);
-          if (unfilteredDeploymentsEmpty) {
-            delete $scope.alerts["deployments"];
-            return;
-          }
-
-          var filteredDeploymentsEmpty =
-            _.isEmpty($scope.deploymentConfigs) &&
-            _.isEmpty($scope.replicationControllersByDC['']) &&
-            _.isEmpty($scope.deployments) &&
-            _.isEmpty($scope.replicaSets);
-          if (!filteredDeploymentsEmpty) {
-            delete $scope.alerts["deployments"];
-            return;
-          }
-
-          $scope.alerts["deployments"] = {
-            type: "warning",
-            details: "The active filters are hiding all deployments."
-          };
-        }
-
-        $scope.showEmptyMessage = function() {
-          if ($filter('hashSize')($scope.replicationControllersByDC) === 0) {
-            return true;
-          }
-
-          if ($filter('hashSize')($scope.replicationControllersByDC) === 1 && $scope.replicationControllersByDC['']) {
-            return true;
-          }
-
-          return false;
+        // Does the deployment config table have content?
+        $scope.showDeploymentConfigTable = function() {
+          var size = _.size($scope.replicationControllersByDC);
+          return size > 1 || (size === 1 && !$scope.replicationControllersByDC['']);
         };
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.deploymentConfigs = labelSelector.select($scope.unfilteredDeploymentConfigs);
             $scope.replicationControllersByDC = DeploymentsService.associateDeploymentsToDeploymentConfig($scope.replicationControllers, $scope.deploymentConfigs, true);
             if ($scope.replicationControllersByDC['']) {
@@ -200,7 +186,7 @@ angular.module('openshiftConsole')
             }
             $scope.deployments = labelSelector.select($scope.unfilteredDeployments);
             $scope.replicaSets = labelSelector.select($scope.unfilteredReplicaSets);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/images.js b/app/scripts/controllers/images.js
index b7ca7a4379..56162c4e11 100644
--- a/app/scripts/controllers/images.js
+++ b/app/scripts/controllers/images.js
@@ -23,8 +23,9 @@ angular.module('openshiftConsole')
     $scope.missingStatusTagsByImageStream = {};
     $scope.builds = {};
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Loading...";
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var imageStreamsVersion = APIService.getPreferredVersion('imagestreams');
 
@@ -35,13 +36,13 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
         watches.push(DataService.watch(imageStreamsVersion, context, function(imageStreams) {
+          $scope.imageStreamsLoaded = true;
           $scope.unfilteredImageStreams = imageStreams.by("metadata.name");
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredImageStreams, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
           $scope.imageStreams = LabelFilter.getLabelSelector().select($scope.unfilteredImageStreams);
-          $scope.emptyMessage = "No image streams to show";
           updateMissingStatusTags();
-          updateFilterWarning();
+          updateFilterMessage();
           Logger.log("image streams (subscribe)", $scope.imageStreams);
         }));
 
@@ -71,23 +72,15 @@ angular.module('openshiftConsole')
           });
         }
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.imageStreams) && !$.isEmptyObject($scope.unfilteredImageStreams)) {
-            $scope.alerts["imageStreams"] = {
-              type: "warning",
-              details: "The active filters are hiding all image streams."
-            };
-          }
-          else {
-            delete $scope.alerts["imageStreams"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.imageStreams) && !_.isEmpty($scope.unfilteredImageStreams);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.imageStreams = labelSelector.select($scope.unfilteredImageStreams);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/otherResources.js b/app/scripts/controllers/otherResources.js
index c715cb0135..1869df3d9e 100644
--- a/app/scripts/controllers/otherResources.js
+++ b/app/scripts/controllers/otherResources.js
@@ -14,8 +14,6 @@ angular.module('openshiftConsole')
     APIService) {
     $scope.projectName = $routeParams.project;
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Select a resource from the list above ...";
     $scope.kindSelector = {disabled: true};
     $scope.kinds = _.filter(APIService.availableKinds(), function(kind) {
       switch (kind.kind) {
@@ -47,6 +45,9 @@ angular.module('openshiftConsole')
           return true;
       }
     });
+    $scope.clearFilter = function () {
+      LabelFilter.clear();
+    };
 
     var isListable = function(kind) {
       if(!kind) {
@@ -125,16 +126,8 @@ angular.module('openshiftConsole')
         }
       }));
 
-    function updateFilterWarning() {
-      if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.resources)  && !$.isEmptyObject($scope.unfilteredResources)) {
-        $scope.alerts["resources"] = {
-          type: "warning",
-          details: "The active filters are hiding all " + APIService.kindToResource($scope.kindSelector.selected.kind, true) + "."
-        };
-      }
-      else {
-        delete $scope.alerts["resources"];
-      }
+    function updateFilterMessage() {
+      $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.resources)  && !_.isEmpty($scope.unfilteredResources);
     }
 
     function loadKind() {
@@ -158,13 +151,13 @@ angular.module('openshiftConsole')
         LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredResources, $scope.labelSuggestions);
         LabelFilter.setLabelSuggestions($scope.labelSuggestions);
         $scope.resources = LabelFilter.getLabelSelector().select($scope.unfilteredResources);
-        $scope.emptyMessage = "No " + APIService.kindToResource(selected.kind, true) + " to show";
-        updateFilterWarning();
+        $scope.resourceName = APIService.kindToResource(selected.kind, true);
+        updateFilterMessage();
       });
     }
     $scope.loadKind = loadKind;
     $scope.$watch("kindSelector.selected", function() {
-      $scope.alerts = {};
+      LabelFilter.clear();
       loadKind();
     });
 
@@ -175,9 +168,9 @@ angular.module('openshiftConsole')
 
     LabelFilter.onActiveFiltersChanged(function(labelSelector) {
       // trigger a digest loop
-      $scope.$apply(function() {
+      $scope.$evalAsync(function() {
         $scope.resources = labelSelector.select($scope.unfilteredResources);
-        updateFilterWarning();
+        updateFilterMessage();
       });
     });
   });
diff --git a/app/scripts/controllers/pods.js b/app/scripts/controllers/pods.js
index df16f54f20..c9f512b950 100644
--- a/app/scripts/controllers/pods.js
+++ b/app/scripts/controllers/pods.js
@@ -17,9 +17,9 @@ angular.module('openshiftConsole')
     // $scope.imagesByDockerReference = {};
     // $scope.imageStreamImageRefByDockerReference = {}; // lets us determine if a particular container's docker image reference belongs to an imageStream
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Loading...";
-
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
     var watches = [];
 
     ProjectsService
@@ -27,14 +27,14 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
         watches.push(DataService.watch("pods", context, function(pods) {
+          $scope.podsLoaded = true;
           $scope.unfilteredPods = pods.by("metadata.name");
           $scope.pods = LabelFilter.getLabelSelector().select($scope.unfilteredPods);
-          $scope.emptyMessage = "No pods to show";
           // TODO should we add links to the image streams the pod is using
           //ImageStreamResolver.fetchReferencedImageStreamImages($scope.pods, $scope.imagesByDockerReference, $scope.imageStreamImageRefByDockerReference, $scope);
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredPods, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
-          updateFilterWarning();
+          updateFilterMessage();
           Logger.log("pods (subscribe)", $scope.unfilteredPods);
         }));
 
@@ -47,23 +47,15 @@ angular.module('openshiftConsole')
         //   Logger.log("imagestreams (subscribe)", $scope.imageStreams);
         // }));
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.pods) && !$.isEmptyObject($scope.unfilteredPods)) {
-            $scope.alerts["pods"] = {
-              type: "warning",
-              details: "The active filters are hiding all pods."
-            };
-          }
-          else {
-            delete $scope.alerts["pods"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.pods) && !_.isEmpty($scope.unfilteredPods);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.pods = labelSelector.select($scope.unfilteredPods);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/routes.js b/app/scripts/controllers/routes.js
index ae58b00445..a530898721 100644
--- a/app/scripts/controllers/routes.js
+++ b/app/scripts/controllers/routes.js
@@ -13,8 +13,9 @@ angular.module('openshiftConsole')
     $scope.unfilteredRoutes = {};
     $scope.routes = {};
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Loading...";
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var watches = [];
 
@@ -23,12 +24,12 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
         watches.push(DataService.watch("routes", context, function(routes) {
+          $scope.routesLoaded = true;
           $scope.unfilteredRoutes = routes.by("metadata.name");
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredRoutes, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
           $scope.routes = LabelFilter.getLabelSelector().select($scope.unfilteredRoutes);
-          $scope.emptyMessage = "No routes to show";
-          updateFilterWarning();
+          updateFilterMessage();
         }));
 
         // Watch services to display route warnings.
@@ -36,23 +37,15 @@ angular.module('openshiftConsole')
           $scope.services = services.by("metadata.name");
         }));
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.routes)  && !$.isEmptyObject($scope.unfilteredRoutes)) {
-            $scope.alerts["routes"] = {
-              type: "warning",
-              details: "The active filters are hiding all routes."
-            };
-          }
-          else {
-            delete $scope.alerts["routes"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.routes)  && !_.isEmpty($scope.unfilteredRoutes);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.routes = labelSelector.select($scope.unfilteredRoutes);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/secrets.js b/app/scripts/controllers/secrets.js
index 66f19b13b2..c4fba463c6 100644
--- a/app/scripts/controllers/secrets.js
+++ b/app/scripts/controllers/secrets.js
@@ -11,7 +11,6 @@ angular.module('openshiftConsole')
   .controller('SecretsController', function ($routeParams, $scope, DataService, ProjectsService) {
     $scope.projectName = $routeParams.project;
     $scope.secretsByType = {};
-    $scope.alerts = $scope.alerts || {};
 
     ProjectsService
       .get($routeParams.project)
diff --git a/app/scripts/controllers/serviceInstances.js b/app/scripts/controllers/serviceInstances.js
index 479912f9c5..fbee5bae98 100644
--- a/app/scripts/controllers/serviceInstances.js
+++ b/app/scripts/controllers/serviceInstances.js
@@ -11,14 +11,15 @@ angular.module('openshiftConsole')
                                                       LabelFilter,
                                                       Logger,
                                                       ProjectsService) {
-    $scope.alerts = {};
     $scope.bindingsByInstanceRef = {};
-    $scope.emptyMessage = "Loading...";
     $scope.labelSuggestions = {};
     $scope.projectName = $routeParams.project;
     $scope.serviceClasses = {};
     $scope.serviceInstances = {};
     $scope.unfilteredServiceInstances = {};
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var watches = [];
 
@@ -49,12 +50,12 @@ angular.module('openshiftConsole')
 
         var serviceInstancesVersion = APIService.getPreferredVersion('serviceinstances');
         watches.push(DataService.watch(serviceInstancesVersion, context, function(serviceInstances) {
-          $scope.emptyMessage = "No provisioned services to show";
+          $scope.serviceInstancesLoaded = true;
           $scope.unfilteredServiceInstances = serviceInstances.by('metadata.name');
 
           sortServiceInstances();
           updateFilter();
-          updateFilterWarning();
+          updateFilterMessage();
 
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredServiceInstances, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
@@ -69,23 +70,15 @@ angular.module('openshiftConsole')
           updateFilter();
         });
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.serviceInstances)  && !_.isEmpty($scope.unfilteredServiceInstances)) {
-            $scope.alerts["all-instances-filtered"] = {
-              type: "warning",
-              details: "The active filters are hiding all provisioned services."
-            };
-          }
-          else {
-            delete $scope.alerts["all-instances-filtered"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.serviceInstances)  && !_.isEmpty($scope.unfilteredServiceInstances);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
           $scope.$evalAsync(function() {
             $scope.serviceInstances = labelSelector.select($scope.unfilteredServiceInstances);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/services.js b/app/scripts/controllers/services.js
index ad25279384..97e4e15173 100644
--- a/app/scripts/controllers/services.js
+++ b/app/scripts/controllers/services.js
@@ -15,9 +15,9 @@ angular.module('openshiftConsole')
     $scope.routesByService = {};
     $scope.routes = {};
     $scope.labelSuggestions = {};
-    $scope.alerts = $scope.alerts || {};
-    $scope.emptyMessage = "Loading...";
-    $scope.emptyMessageRoutes = "Loading...";
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var watches = [];
 
@@ -26,33 +26,25 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
          watches.push(DataService.watch("services", context, function(services) {
+          $scope.servicesLoaded = true;
           $scope.unfilteredServices = services.by("metadata.name");
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredServices, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
           $scope.services = LabelFilter.getLabelSelector().select($scope.unfilteredServices);
-          $scope.emptyMessage = "No services to show";
-          updateFilterWarning();
+          updateFilterMessage();
 
           Logger.log("services (subscribe)", $scope.unfilteredServices);
         }));
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.services)  && !$.isEmptyObject($scope.unfilteredServices)) {
-            $scope.alerts["services"] = {
-              type: "warning",
-              details: "The active filters are hiding all services."
-            };
-          }
-          else {
-            delete $scope.alerts["services"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.services)  && !_.isEmpty($scope.unfilteredServices);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.services = labelSelector.select($scope.unfilteredServices);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/statefulSets.js b/app/scripts/controllers/statefulSets.js
index e44a66eb4c..b5fb927c1c 100644
--- a/app/scripts/controllers/statefulSets.js
+++ b/app/scripts/controllers/statefulSets.js
@@ -9,8 +9,10 @@ angular.module('openshiftConsole')
                        LabelFilter,
                        PodsService) {
     $scope.projectName = $routeParams.project;
-    $scope.alerts = $scope.alerts || {};
     $scope.labelSuggestions = {};
+    $scope.clearFilter = function() {
+      LabelFilter.clear();
+    };
 
     var watches = [];
     ProjectsService
@@ -30,7 +32,7 @@ angular.module('openshiftConsole')
           $scope.statefulSets = LabelFilter.getLabelSelector().select($scope.unfilteredStatefulSets);
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredStatefulSets, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
-          updateFilterWarning();
+          updateFilterMessage();
         }));
 
         // TODO: 1.6 eliminate this block, we dont actually need pods on this page,
@@ -40,23 +42,15 @@ angular.module('openshiftConsole')
           $scope.podsByOwnerUID = PodsService.groupByOwnerUID($scope.pods);
         }));
 
-        function updateFilterWarning() {
-          if (!LabelFilter.getLabelSelector().isEmpty() && $.isEmptyObject($scope.statefulSets) && !$.isEmptyObject($scope.unfilteredStatefulSets)) {
-            $scope.alerts["statefulsets"] = {
-              type: "warning",
-              details: "The active filters are hiding all stateful sets."
-            };
-          }
-          else {
-            delete $scope.alerts["statefulsets"];
-          }
+        function updateFilterMessage() {
+          $scope.filterWithZeroResults = !LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.statefulSets) && !_.isEmpty($scope.unfilteredStatefulSets);
         }
 
         LabelFilter.onActiveFiltersChanged(function(labelSelector) {
           // trigger a digest loop
-          $scope.$apply(function() {
+          $scope.$evalAsync(function() {
             $scope.statefulSets = labelSelector.select($scope.unfilteredStatefulSets);
-            updateFilterWarning();
+            updateFilterMessage();
           });
         });
 
diff --git a/app/scripts/controllers/storage.js b/app/scripts/controllers/storage.js
index 1dbe2df1fd..1414827ea9 100644
--- a/app/scripts/controllers/storage.js
+++ b/app/scripts/controllers/storage.js
@@ -15,7 +15,6 @@ angular.module('openshiftConsole')
     $scope.labelSuggestions = {};
     $scope.alerts = $scope.alerts || {};
     $scope.outOfClaims = false;
-    $scope.emptyMessage = "Loading...";
 
     var setOutOfClaimsWarning = function() {
       var isHidden = AlertMessageService.isAlertPermanentlyHidden("storage-quota-limit-reached", $scope.projectName);
@@ -55,11 +54,11 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
          watches.push(DataService.watch("persistentvolumeclaims", context, function(pvcs) {
+          $scope.pvcsLoaded = true;
           $scope.unfilteredPVCs = pvcs.by("metadata.name");
           LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredPVCs, $scope.labelSuggestions);
           LabelFilter.setLabelSuggestions($scope.labelSuggestions);
           $scope.pvcs = LabelFilter.getLabelSelector().select($scope.unfilteredPVCs);
-          $scope.emptyMessage = "No persistent volume claims to show";
           updateFilterWarning();
           Logger.log("pvcs (subscribe)", $scope.unfilteredPVCs);
         }));
@@ -70,9 +69,11 @@ angular.module('openshiftConsole')
               type: "warning",
               details: "The active filters are hiding all persistent volume claims."
             };
+            $scope.filterWithZeroResults = true;
           }
           else {
             delete $scope.alerts["storage"];
+            $scope.filterWithZeroResults = false;
           }
         }
 
diff --git a/app/styles/_data-toolbar.less b/app/styles/_data-toolbar.less
index b3141e943e..96b551889c 100644
--- a/app/styles/_data-toolbar.less
+++ b/app/styles/_data-toolbar.less
@@ -56,6 +56,13 @@
       margin-bottom: 0;
     }
   }
+  .header-toolbar & {
+    background-color: @panel-light;
+    border-bottom: 1px solid @page-header-border-color;
+    margin: 0 -(@grid-gutter-width / 2);
+    padding-left: (@grid-gutter-width / 2);
+    padding-right: (@grid-gutter-width / 2);
+  }
   .vertical-divider + .data-toolbar-filter {
     margin-top: 10px;
     @media (min-width: @screen-sm-min) {
diff --git a/app/styles/_layouts.less b/app/styles/_layouts.less
index 95c0a4e9a3..95165040c4 100644
--- a/app/styles/_layouts.less
+++ b/app/styles/_layouts.less
@@ -2,10 +2,6 @@
 // Layouts (substructure)
 // ------------------------------------
 
-.header-toolbar {
-  background-color: @panel-light;
-  border-bottom: 1px solid @page-header-border-color;
-}
 .layout-pf.layout-pf-fixed {
   height: 1px;
   body {
diff --git a/app/styles/_overview.less b/app/styles/_overview.less
index ad46f73c3a..1f5b9fd4c0 100644
--- a/app/styles/_overview.less
+++ b/app/styles/_overview.less
@@ -464,6 +464,7 @@
     margin-bottom: 30px;
   }
   .toolbar-container {
+    border-bottom: 1px solid @page-header-border-color;
     padding-bottom: 13px;
     padding-top: 13px;
     .surface-shaded();
diff --git a/app/views/browse/config-maps.html b/app/views/browse/config-maps.html
index 5a161f4837..a300212e67 100644
--- a/app/views/browse/config-maps.html
+++ b/app/views/browse/config-maps.html
@@ -2,7 +2,7 @@
   <div class="middle-header header-toolbar">
     <div class="container-fluid">
       <div class="page-header page-header-bleed-right page-header-bleed-left">
-        <div class="pull-right" ng-if="project && (configMapsVersion | canI : 'create')">
+        <div class="pull-right" ng-if="project && (configMapsVersion | canI : 'create') && ((configMaps | hashSize) > 0 || filterWithZeroResults)">
           <a ng-href="project/{{project.metadata.name}}/create-config-map" class="btn btn-default">Create Config Map</a>
         </div>
         <h1>
@@ -14,7 +14,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="(configMaps | hashSize) > 0 || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -23,41 +23,51 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <div ng-if="!loaded">Loading...</div>
-          <div ng-if="loaded">
-            <table class="table table-bordered table-mobile table-layout-fixed">
-              <colgroup>
-                <col class="col-sm-5">
-              </colgroup>
-              <thead>
-                <tr>
-                  <th>Name</th>
-                  <th>Created</th>
-                  <th>Labels</th>
-                </tr>
-              </thead>
-              <tbody ng-if="(configMaps | hashSize) == 0">
-                <tr><td colspan="3"><em>No config maps to show</em></td></tr>
-              </tbody>
-              <tbody ng-if="(configMaps | hashSize) > 0">
-                <tr ng-repeat="configMap in configMaps">
-                  <td data-title="Name">
-                    <a href="{{configMap | navigateResourceURL}}">{{configMap.metadata.name}}</a>
-                  </td>
-                  <td data-title="Created">
-                    <span am-time-ago="configMap.metadata.creationTimestamp"></span>
-                  </td>
-                  <td data-title="Labels">
-                    <em ng-if="(configMap.metadata.labels | hashSize) === 0">none</em>
-                    <labels labels="configMap.metadata.labels" clickable="true" kind="Config Map" project-name="{{configMap.metadata.namespace}}" limit="3" filter-current-page="true"></labels>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
+          <div ng-if="(configMaps | hashSize) == 0">
+            <p ng-if="!loaded">
+              Loading...
+            </p>
+            <div ng-if="loaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No config maps.</h2>
+                <p>No config maps have been added to project {{projectName}}.</p>
+                <p ng-if="project && (configMapsVersion | canI : 'create')">
+                  <a ng-href="project/{{project.metadata.name}}/create-config-map" class="btn btn-primary btn-lg">Create Config Map</a>
+                </p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all config maps. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
           </div>
+          <table ng-if="(configMaps | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
+            <colgroup>
+              <col class="col-sm-5">
+            </colgroup>
+            <thead>
+              <tr>
+                <th>Name</th>
+                <th>Created</th>
+                <th>Labels</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr ng-repeat="configMap in configMaps">
+                <td data-title="Name">
+                  <a href="{{configMap | navigateResourceURL}}">{{configMap.metadata.name}}</a>
+                </td>
+                <td data-title="Created">
+                  <span am-time-ago="configMap.metadata.creationTimestamp"></span>
+                </td>
+                <td data-title="Labels">
+                  <em ng-if="(configMap.metadata.labels | hashSize) === 0">none</em>
+                  <labels labels="configMap.metadata.labels" clickable="true" kind="Config Map" project-name="{{configMap.metadata.namespace}}" limit="3" filter-current-page="true"></labels>
+                </td>
+              </tr>
+            </tbody>
+          </table>
         </div><!-- /col-* -->
       </div>
     </div>
diff --git a/app/views/browse/routes.html b/app/views/browse/routes.html
index 26012ef0d3..0adde83ed7 100644
--- a/app/views/browse/routes.html
+++ b/app/views/browse/routes.html
@@ -2,7 +2,7 @@
   <div class="middle-header header-toolbar">
     <div class="container-fluid">
       <div class="page-header page-header-bleed-right page-header-bleed-left">
-        <div class="pull-right" ng-if="project && ('routes' | canI : 'create')">
+        <div class="pull-right" ng-if="project && ('routes' | canI : 'create') && ((routes | hashSize) > 0 || filterWithZeroResults)">
           <a ng-href="project/{{project.metadata.name}}/create-route" class="btn btn-default">Create Route</a>
         </div>
         <h1>
@@ -14,7 +14,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="(routes | hashSize) > 0 || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -23,10 +23,26 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed">
+          <div ng-if="(routes | hashSize) == 0">
+            <p ng-if="!routesLoaded">
+              Loading...
+            </p>
+            <div ng-if="routesLoaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No routes.</h2>
+                <p>No routes have been added to project {{projectName}}.</p>
+                <p ng-if="project && ('routes' | canI : 'create') && !filterWithZeroResults">
+                  <a ng-href="project/{{project.metadata.name}}/create-route" class="btn btn-primary btn-lg">Create Route</a>
+                </p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all routes. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table ng-if="(routes | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-3">
               <col class="col-sm-3">
@@ -47,10 +63,7 @@ <h1>
                 <th>TLS Termination</th>
               </tr>
             </thead>
-            <tbody ng-if="(routes | hashSize) == 0">
-              <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(routes | hashSize) > 0">
+            <tbody>
               <tr ng-repeat="route in routes | orderObjectsByDate : true">
                 <td data-title="{{ customNameHeader || 'Name' }}">
                   <a href="{{route | navigateResourceURL}}">{{route.metadata.name}}</a>
diff --git a/app/views/browse/stateful-sets.html b/app/views/browse/stateful-sets.html
index ca0724b56a..80e0ba6920 100644
--- a/app/views/browse/stateful-sets.html
+++ b/app/views/browse/stateful-sets.html
@@ -15,7 +15,7 @@ <h1>
           -->
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="((statefulSets | hashSize) > 0) || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -24,11 +24,23 @@ <h1>
   </div>
   <div class="middle-content" persist-tab-state>
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
-      <div ng-if="!loaded">Loading...</div>
       <div class="row" ng-if="loaded">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed">
+          <div ng-if="(statefulSets | hashSize) == 0">
+            <p ng-if="!loaded">
+              Loading...
+            </p>
+            <div ng-if="loaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No stateful sets.</h2>
+                <p>No stateful sets have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all stateful sets. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table ng-if="(statefulSets | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-5">
             </colgroup>
@@ -39,11 +51,6 @@ <h1>
                 <th>Created</th>
               </tr>
             </thead>
-            <tbody ng-if="(statefulSets | hashSize) == 0">
-              <tr>
-                <td colspan="3"><em>No stateful sets to show</em></td>
-              </tr>
-            </tbody>
             <tbody ng-repeat="(statefulSetName, statefulSet) in statefulSets">
               <tr>
                 <td data-title="Name">
diff --git a/app/views/builds.html b/app/views/builds.html
index cfb06bac67..9b73600723 100644
--- a/app/views/builds.html
+++ b/app/views/builds.html
@@ -11,7 +11,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="(((latestByConfig | hashSize) || (buildsNoConfig | hashSize)) || filterWithZeroResults)" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -20,10 +20,23 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed">
+          <div ng-if="!(latestByConfig | hashSize) && !(buildsNoConfig | hashSize)">
+            <p ng-if="!buildsLoaded">
+              Loading...
+            </p>
+            <div ng-if="buildsLoaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No builds.</h2>
+                <p>No builds have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all builds. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table class="table table-bordered table-mobile table-layout-fixed" ng-if="(latestByConfig | hashSize) || (buildsNoConfig | hashSize)">
             <colgroup>
               <col class="col-sm-2">
               <col class="col-sm-1">
@@ -44,10 +57,7 @@ <h1>
                 <th ng-class="{'hidden-sm' : (latestByConfig | hashSize)}">Source</th>
               </tr>
             </thead>
-            <tbody ng-if="!(latestByConfig | hashSize) && !(buildsNoConfig | hashSize)">
-              <tr><td colspan="7"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(latestByConfig | hashSize) || (buildsNoConfig | hashSize)">
+            <tbody>
               <tr ng-repeat="(buildConfigName, latestBuild) in latestByConfig" ng-if="buildConfigName !== ''">
                 <!-- Build config with no builds-->
                 <td ng-if-start="!latestBuild" data-title="Name">
diff --git a/app/views/deployments.html b/app/views/deployments.html
index d126f26b36..ef334cdf18 100644
--- a/app/views/deployments.html
+++ b/app/views/deployments.html
@@ -11,7 +11,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="!showEmptyState || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -20,101 +20,29 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <h3 ng-if="(deployments | size) || (replicaSets | size)">Deployment Configurations</h3>
-          <table class="table table-bordered table-mobile table-layout-fixed">
-            <colgroup>
-              <col class="col-sm-3">
-              <col class="col-sm-2">
-              <col class="col-sm-3">
-              <col class="col-sm-2">
-              <col class="col-sm-2">
-            </colgroup>
-            <thead>
-              <tr>
-                <th>Name</th>
-                <th>Last Version</th>
-                <th>Status</th>
-                <th>Created</th>
-                <th>Trigger</th>
-              </tr>
-            </thead>
-            <!-- message doesn't show right when there are both dcs and rcs and they are all filtered -->
-            <tbody ng-if="showEmptyMessage()">
-              <!-- If there are no deployment configs and no replication controllers owned by a deployment config -->
-              <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="!showEmptyMessage()">
-              <tr ng-repeat-start="(dcName, replicationControllersForDC) in replicationControllersByDC" ng-if="dcName && (deploymentConfigs[dcName] || !unfilteredDeploymentConfigs[dcName])" style="display: none;"></tr>
-              <!-- Deployment config with no replication controllers -->
-              <tr ng-if="(replicationControllersForDC | hashSize) == 0 && dcName">
-                <td data-title="Name">
-                  <a ng-if="deploymentConfigs[dcName]" href="{{dcName | navigateResourceURL : 'DeploymentConfig' : projectName}}">{{dcName}}</a>
-                  <span ng-if="deploymentConfigs[dcName].status.details.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{deploymentConfigs[dcName].status.details.message}}"></span>
-                </td>
-                <td data-title="Last Version"><em>No deployments</em></td>
-                <td class="hidden-xs">&nbsp;</td>
-                <td class="hidden-xs">&nbsp;</td>
-                <td class="hidden-xs">&nbsp;</td>
-              </tr>
-              <!-- Deployment config with replication controllers, or replication controllers from a deployment config which has since been deleted -->
-              <tr ng-repeat="replicationController in replicationControllersForDC | orderObjectsByDate : true | limitTo : 1" ng-if="dcName">
-                <td data-title="Name">
-                  <a ng-href="{{replicationController | configURLForResource}}">{{dcName}}</a>
-                  <!-- <span ng-if="deploymentConfigs[dcName].status.details.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{deploymentConfigs[dcName].status.details.message}}"></span> -->
-                  <span ng-if="deploymentConfigs && !deploymentConfigs[dcName]" class="pficon pficon-warning-triangle-o" data-toggle="tooltip" title="This deployment config no longer exists" style="cursor: help;"></span>
-                </td>
-                <td data-title="Last Version">
-                  <!-- Deployment number and link -->
-                  <span ng-if="replicationController | annotation : 'deploymentVersion'">
-                    <a ng-href="{{replicationController | navigateResourceURL}}">#{{replicationController | annotation : 'deploymentVersion'}}</a>
-                  </span>
-                  <span ng-if="!(replicationController | annotation : 'deploymentVersion')">
-                    <a ng-href="{{replicationController | navigateResourceURL}}">{{replicationController.metadata.name}}</a>
-                  </span>
-                </td>
-                <td data-title="Status">
-                  <div row class="status">
-                    <status-icon status="replicationController | deploymentStatus" disable-animation></status-icon>
-                    <span flex>
-                      {{replicationController | deploymentStatus}}<span ng-if="(replicationController | deploymentStatus) == 'Active' || (replicationController | deploymentStatus) == 'Running'">,
-                      <span ng-if="replicationController.spec.replicas !== replicationController.status.replicas">{{replicationController.status.replicas}}/</span>{{replicationController.spec.replicas}} replica<span ng-if="replicationController.spec.replicas != 1">s</span></span>
-                    </span>
-                  </div>
-                  <!-- TODO would be nice to have the deploymentStatusReason in a popup, when there is one -->
-                </td>
-                <td data-title="Created">
-                  <span am-time-ago="replicationController.metadata.creationTimestamp"></span>
-                </td>
-                <td data-title="Trigger">
-                  <span ng-if="!replicationController.causes.length">Unknown</span>
-                  <span ng-if="replicationController.causes.length">
-                    <span ng-repeat="cause in replicationController.causes">
-                      <span ng-switch="cause.type">
-                        <span ng-switch-when="ImageChange">
-                          <span ng-if="cause.imageTrigger.from">
-                            <abbr title="{{cause.imageTrigger.from | imageObjectRef : null : true}}">Image</abbr> change
-                          </span>
-                        </span>
-                        <span ng-switch-when="ConfigChange">Config change</span>
-                        <span ng-switch-default>{{cause.type}}</span>
-                      </span>
-                    </span>
-                  </span>
-                </td>
-              </tr>
-              <tr ng-repeat-end style="display: none;"></tr>
-            </tbody>
-          </table>
-          <div ng-if="deployments | size">
-            <h3>Deployments</h3>
-            <table class="table table-bordered table-mobile table-layout-fixed">
+          <p ng-if="!deploymentConfigsLoaded">
+            Loading...
+          </p>
+          <div ng-if="(showEmptyState || filterWithZeroResults) && deploymentConfigsLoaded">
+            <div class="empty-state-message text-center">
+              <div ng-if="showEmptyState">
+                <h2>No deployments.</h2>
+                <p>No deployments have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all deployments. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <div ng-if="!filterWithZeroResults">
+            <h3 ng-if="showDeploymentConfigTable() && ((deployments | size) || (replicaSets | size) || (replicationControllersByDC[''] | size))">Deployment Configurations</h3>
+            <table ng-if="showDeploymentConfigTable() && !showEmptyState" class="table table-bordered table-mobile table-layout-fixed">
               <colgroup>
-                <col class="col-sm-4">
-                <col class="col-sm-2">
+                <col class="col-sm-3">
                 <col class="col-sm-2">
+                <col class="col-sm-3">
                 <col class="col-sm-2">
                 <col class="col-sm-2">
               </colgroup>
@@ -122,95 +50,174 @@ <h3>Deployments</h3>
                 <tr>
                   <th>Name</th>
                   <th>Last Version</th>
-                  <th>Replicas</th>
+                  <th>Status</th>
                   <th>Created</th>
-                  <th>Strategy</th>
+                  <th>Trigger</th>
                 </tr>
               </thead>
               <tbody>
-                <tr ng-repeat="deployment in deployments | orderObjectsByDate : true">
+                <tr ng-repeat-start="(dcName, replicationControllersForDC) in replicationControllersByDC" ng-if="dcName && (deploymentConfigs[dcName] || !unfilteredDeploymentConfigs[dcName])" style="display: none;"></tr>
+                <!-- Deployment config with no replication controllers -->
+                <tr ng-if="(replicationControllersForDC | hashSize) == 0 && dcName">
                   <td data-title="Name">
-                    <a ng-href="{{deployment | navigateResourceURL}}">{{deployment.metadata.name}}</a>
+                    <a ng-if="deploymentConfigs[dcName]" href="{{dcName | navigateResourceURL : 'DeploymentConfig' : projectName}}">{{dcName}}</a>
+                    <span ng-if="deploymentConfigs[dcName].status.details.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{deploymentConfigs[dcName].status.details.message}}"></span>
+                  </td>
+                  <td data-title="Last Version"><em>No deployments</em></td>
+                  <td class="hidden-xs">&nbsp;</td>
+                  <td class="hidden-xs">&nbsp;</td>
+                  <td class="hidden-xs">&nbsp;</td>
+                </tr>
+                <!-- Deployment config with replication controllers, or replication controllers from a deployment config which has since been deleted -->
+                <tr ng-repeat="replicationController in replicationControllersForDC | orderObjectsByDate : true | limitTo : 1" ng-if="dcName">
+                  <td data-title="Name">
+                    <a ng-href="{{replicationController | configURLForResource}}">{{dcName}}</a>
+                    <!-- <span ng-if="deploymentConfigs[dcName].status.details.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{deploymentConfigs[dcName].status.details.message}}"></span> -->
+                    <span ng-if="deploymentConfigs && !deploymentConfigs[dcName]" class="pficon pficon-warning-triangle-o" data-toggle="tooltip" title="This deployment config no longer exists" style="cursor: help;"></span>
                   </td>
                   <td data-title="Last Version">
-                    <span ng-if="latestReplicaSetByDeploymentUID[deployment.metadata.uid]">
-                      <a ng-href="{{latestReplicaSetByDeploymentUID[deployment.metadata.uid] | navigateResourceURL}}">{{deployment | lastDeploymentRevision}}</a>
+                    <!-- Deployment number and link -->
+                    <span ng-if="replicationController | annotation : 'deploymentVersion'">
+                      <a ng-href="{{replicationController | navigateResourceURL}}">#{{replicationController | annotation : 'deploymentVersion'}}</a>
                     </span>
-                    <span ng-if="!latestReplicaSetByDeploymentUID[deployment.metadata.uid]">
-                      {{deployment | lastDeploymentRevision}}
+                    <span ng-if="!(replicationController | annotation : 'deploymentVersion')">
+                      <a ng-href="{{replicationController | navigateResourceURL}}">{{replicationController.metadata.name}}</a>
                     </span>
                   </td>
-                  <td data-title="Replicas">
-                    <span ng-if="!(deployment.status.replicas | isNil) && deployment.status.replicas !== deployment.spec.replicas">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if="deployment.spec.replicas != 1">s</span>
-                  </td>
-                  <td data-title="Created">
-                    <span am-time-ago="deployment.metadata.creationTimestamp"></span>
-                  </td>
-                  <td data-title="Strategy">
-                    {{deployment.spec.strategy.type | sentenceCase}}
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-          <div ng-if="replicaSets | hashSize" id="replica-sets">
-            <h3>Replica Sets</h3>
-            <table class="table table-bordered table-mobile table-layout-fixed">
-              <colgroup>
-                <col class="col-sm-4">
-              </colgroup>
-              <thead>
-                <tr>
-                  <th>Name</th>
-                  <th>Replicas</th>
-                  <th>Created</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr ng-repeat="replicaSet in replicaSets | orderObjectsByDate : true">
-                  <td data-title="Name">
-                    <a ng-href="{{replicaSet | navigateResourceURL}}">{{replicaSet.metadata.name}}</a>
-                  </td>
-                  <td data-title="Replicas">
-                    <span ng-if="replicaSet.status.replicas !== replicaSet.spec.replicas">{{replicaSet.status.replicas}}/</span>{{replicaSet.spec.replicas}} replica<span ng-if="replicaSet.spec.replicas != 1">s</span>
+                  <td data-title="Status">
+                    <div row class="status">
+                      <status-icon status="replicationController | deploymentStatus" disable-animation></status-icon>
+                      <span flex>
+                        {{replicationController | deploymentStatus}}<span ng-if="(replicationController | deploymentStatus) == 'Active' || (replicationController | deploymentStatus) == 'Running'">,
+                        <span ng-if="replicationController.spec.replicas !== replicationController.status.replicas">{{replicationController.status.replicas}}/</span>{{replicationController.spec.replicas}} replica<span ng-if="replicationController.spec.replicas != 1">s</span></span>
+                      </span>
+                    </div>
+                    <!-- TODO would be nice to have the deploymentStatusReason in a popup, when there is one -->
                   </td>
                   <td data-title="Created">
-                    <span am-time-ago="replicaSet.metadata.creationTimestamp"></span>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-          <div ng-if="(unfilteredReplicationControllers | hashSize) > 0" id="replica-controllers">
-            <h3>Other Replication Controllers</h3>
-            <table class="table table-bordered table-mobile table-layout-fixed">
-              <colgroup>
-                <col class="col-sm-5">
-              </colgroup>
-              <thead>
-                <tr>
-                  <th>Name</th>
-                  <th>Replicas</th>
-                  <th>Created</th>
-                </tr>
-              </thead>
-              <tbody ng-if="(replicationControllersByDC[''] | hashSize) === 0"><tr><td colspan="3"><em>No replication controllers to show</em></td></tr></tbody>
-              <tbody ng-if="(replicationControllersByDC[''] | hashSize) > 0">
-                <!-- We only show this if there are replication controllers but the active filter is hiding them, otherwise the RC table doesn't show
-                     at all -->
-                <tr ng-repeat="deployment in replicationControllersByDC[''] | orderObjectsByDate : true">
-                  <td data-title="Name">
-                    <a ng-href="{{deployment | navigateResourceURL}}">{{deployment.metadata.name}}</a>
-                  </td>
-                  <td data-title="Replicas">
-                    <span ng-if="deployment.status.replicas !== deployment.spec.replicas">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if="deployment.spec.replicas != 1">s</span>
+                    <span am-time-ago="replicationController.metadata.creationTimestamp"></span>
                   </td>
-                  <td data-title="Created">
-                    <span am-time-ago="deployment.metadata.creationTimestamp"></span>
+                  <td data-title="Trigger">
+                    <span ng-if="!replicationController.causes.length">Unknown</span>
+                    <span ng-if="replicationController.causes.length">
+                      <span ng-repeat="cause in replicationController.causes">
+                        <span ng-switch="cause.type">
+                          <span ng-switch-when="ImageChange">
+                            <span ng-if="cause.imageTrigger.from">
+                              <abbr title="{{cause.imageTrigger.from | imageObjectRef : null : true}}">Image</abbr> change
+                            </span>
+                          </span>
+                          <span ng-switch-when="ConfigChange">Config change</span>
+                          <span ng-switch-default>{{cause.type}}</span>
+                        </span>
+                      </span>
+                    </span>
                   </td>
                 </tr>
+                <tr ng-repeat-end style="display: none;"></tr>
               </tbody>
             </table>
+            <div ng-if="(deployments | size)">
+              <h3>Deployments</h3>
+              <table class="table table-bordered table-mobile table-layout-fixed">
+                <colgroup>
+                  <col class="col-sm-4">
+                  <col class="col-sm-2">
+                  <col class="col-sm-2">
+                  <col class="col-sm-2">
+                  <col class="col-sm-2">
+                </colgroup>
+                <thead>
+                  <tr>
+                    <th>Name</th>
+                    <th>Last Version</th>
+                    <th>Replicas</th>
+                    <th>Created</th>
+                    <th>Strategy</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat="deployment in deployments | orderObjectsByDate : true">
+                    <td data-title="Name">
+                      <a ng-href="{{deployment | navigateResourceURL}}">{{deployment.metadata.name}}</a>
+                    </td>
+                    <td data-title="Last Version">
+                      <span ng-if="latestReplicaSetByDeploymentUID[deployment.metadata.uid]">
+                        <a ng-href="{{latestReplicaSetByDeploymentUID[deployment.metadata.uid] | navigateResourceURL}}">{{deployment | lastDeploymentRevision}}</a>
+                      </span>
+                      <span ng-if="!latestReplicaSetByDeploymentUID[deployment.metadata.uid]">
+                        {{deployment | lastDeploymentRevision}}
+                      </span>
+                    </td>
+                    <td data-title="Replicas">
+                      <span ng-if="!(deployment.status.replicas | isNil) && deployment.status.replicas !== deployment.spec.replicas">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if="deployment.spec.replicas != 1">s</span>
+                    </td>
+                    <td data-title="Created">
+                      <span am-time-ago="deployment.metadata.creationTimestamp"></span>
+                    </td>
+                    <td data-title="Strategy">
+                      {{deployment.spec.strategy.type | sentenceCase}}
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div ng-if="(replicaSets | size)" id="replica-sets">
+              <h3>Replica Sets</h3>
+              <table class="table table-bordered table-mobile table-layout-fixed">
+                <colgroup>
+                  <col class="col-sm-4">
+                </colgroup>
+                <thead>
+                  <tr>
+                    <th>Name</th>
+                    <th>Replicas</th>
+                    <th>Created</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat="replicaSet in replicaSets | orderObjectsByDate : true">
+                    <td data-title="Name">
+                      <a ng-href="{{replicaSet | navigateResourceURL}}">{{replicaSet.metadata.name}}</a>
+                    </td>
+                    <td data-title="Replicas">
+                      <span ng-if="replicaSet.status.replicas !== replicaSet.spec.replicas">{{replicaSet.status.replicas}}/</span>{{replicaSet.spec.replicas}} replica<span ng-if="replicaSet.spec.replicas != 1">s</span>
+                    </td>
+                    <td data-title="Created">
+                      <span am-time-ago="replicaSet.metadata.creationTimestamp"></span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+            <div ng-if="(replicationControllersByDC[''] | size)" id="replica-controllers">
+              <h3>Other Replication Controllers</h3>
+              <table class="table table-bordered table-mobile table-layout-fixed">
+                <colgroup>
+                  <col class="col-sm-5">
+                </colgroup>
+                <thead>
+                  <tr>
+                    <th>Name</th>
+                    <th>Replicas</th>
+                    <th>Created</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat="deployment in replicationControllersByDC[''] | orderObjectsByDate : true">
+                    <td data-title="Name">
+                      <a ng-href="{{deployment | navigateResourceURL}}">{{deployment.metadata.name}}</a>
+                    </td>
+                    <td data-title="Replicas">
+                      <span ng-if="deployment.status.replicas !== deployment.spec.replicas">{{deployment.status.replicas}}/</span>{{deployment.spec.replicas}} replica<span ng-if="deployment.spec.replicas != 1">s</span>
+                    </td>
+                    <td data-title="Created">
+                      <span am-time-ago="deployment.metadata.creationTimestamp"></span>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
           </div>
         </div><!-- /col-* -->
       </div>
diff --git a/app/views/images.html b/app/views/images.html
index 08bcc5a9b4..ea5f1184ec 100644
--- a/app/views/images.html
+++ b/app/views/images.html
@@ -11,7 +11,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div class="data-toolbar">
+      <div ng-if="(imageStreams | hashSize) > 0 || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -20,10 +20,23 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed">
+          <div ng-if="(imageStreams | hashSize) == 0">
+            <p ng-if="!imageStreamsLoaded">
+              Loading...
+            </p>
+            <div ng-if="imageStreamsLoaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No image streams.</h2>
+                <p>No image streams have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all image streams. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table ng-if="(imageStreams | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-3">
               <col class="col-sm-5">
@@ -38,10 +51,7 @@ <h1>
                 <th>Updated</th>
               </tr>
             </thead>
-            <tbody ng-if="(imageStreams | hashSize) == 0">
-              <tr><td colspan="4"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(imageStreams | hashSize) > 0">
+            <tbody>
               <tr ng-repeat="imageStream in imageStreams | orderObjectsByDate : true">
                 <td data-title="Name"><a href="{{imageStream | navigateResourceURL}}">{{imageStream.metadata.name}}</a></td>
                 <td data-title="Docker Repo">
diff --git a/app/views/other-resources.html b/app/views/other-resources.html
index 5312898d00..eaef34bb47 100644
--- a/app/views/other-resources.html
+++ b/app/views/other-resources.html
@@ -21,10 +21,25 @@ <h1>Other Resources</h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed" ng-class="{ 'table-empty': (resources | hashSize) === 0 }">
+          <div ng-if="(resources | hashSize) == 0">
+            <p ng-if="!kindSelector.selected">
+              <em>Select a resource from the list above...</em>
+            </p>
+            <div ng-if="kindSelector.selected" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No {{resourceName}}.</h2>
+                <p>
+                  No {{resourceName}} have been added to project {{projectName}}.
+                </p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all {{resourceName}}. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table ng-if="(resources | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-3">
               <col class="col-sm-2">
@@ -39,10 +54,7 @@ <h1>Other Resources</h1>
                 <th><span class="sr-only">Actions</span></th>
               </tr>
             </thead>
-            <tbody ng-if="(resources | hashSize) == 0">
-              <tr><td colspan="4"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(resources | hashSize) > 0">
+            <tbody>
               <tr ng-repeat="resource in resources | orderObjectsByDate : true">
                 <td data-title="Name">{{resource.metadata.name}}</td>
                 <td data-title="Created"><span am-time-ago="resource.metadata.creationTimestamp"></span></td>
@@ -65,7 +77,6 @@ <h1>Other Resources</h1>
                           group="{{kindSelector.selected.group}}"
                           resource-name="{{resource.metadata.name}}"
                           project-name="{{resource.metadata.namespace}}"
-                          alerts="alerts"
                           stay-on-current-page="true"
                           success="loadKind">
                         </delete-link>
diff --git a/app/views/overview.html b/app/views/overview.html
index 7ca4de7416..8345e87a02 100644
--- a/app/views/overview.html
+++ b/app/views/overview.html
@@ -30,7 +30,7 @@ <h2>Welcome to project {{projectName}}.</h2>
       Loading...
     </div>
     <div ng-if="!overview.showGetStarted && !overview.showLoading">
-      <div class="middle-header header-toolbar">
+      <div class="middle-header">
         <div class="container-fluid toolbar-container">
           <div class="data-toolbar" role="toolbar" aria-label="Filter Toolbar">
             <div class="data-toolbar-filter" role="group">
diff --git a/app/views/pipelines.html b/app/views/pipelines.html
index 9579c53376..0d24280eb1 100644
--- a/app/views/pipelines.html
+++ b/app/views/pipelines.html
@@ -34,7 +34,7 @@ <h2>No pipelines.</h2>
                   <a ng-href="{{ 'pipeline-plugin' | helpLink}}" target="_blank">OpenShift Pipeline Plugin</a>.
                 </p>
                 <p ng-if="(project.metadata.name | canIAddToProject) && createSampleURL">
-                  <a ng-href="{{createSampleURL}}" class="btn btn-lg btn-primary">
+                  <a ng-href="{{createSampleURL}}" class="btn btn-primary btn-lg">
                     Create Sample Pipeline
                   </a>
                 </p>
diff --git a/app/views/pods.html b/app/views/pods.html
index aec956ed71..e16299e5d6 100644
--- a/app/views/pods.html
+++ b/app/views/pods.html
@@ -11,7 +11,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="((pods | hashSize) > 0) || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -20,10 +20,23 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <pods-table pods="pods" empty-message="emptyMessage"></pods-table>
+          <div ng-if="(pods | hashSize) == 0">
+            <p ng-if="!podsLoaded">
+              Loading...
+            </p>
+            <div ng-if="podsLoaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No pods.</h2>
+                <p>No pods have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all pods. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <pods-table ng-if="(pods | hashSize) > 0" pods="pods"></pods-table>
         </div><!-- /col-* -->
       </div>
     </div>
diff --git a/app/views/secrets.html b/app/views/secrets.html
index 51ee0232c9..e3de4d4bfd 100644
--- a/app/views/secrets.html
+++ b/app/views/secrets.html
@@ -2,7 +2,7 @@
   <div class="middle-header">
     <div class="container-fluid">
       <div class="page-header page-header-bleed-right page-header-bleed-left">
-        <div class="pull-right" ng-if="project && ('secrets' | canI : 'create')">
+        <div class="pull-right" ng-if="project && ('secrets' | canI : 'create') && secrets.length">
           <a ng-href="project/{{project.metadata.name}}/create-secret" class="btn btn-default">Create Secret</a>
         </div>
         <h1>
@@ -18,11 +18,24 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div ng-if="!loaded" class="mar-top-xl">Loading...</div>
       <div ng-if="loaded" class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile secrets-table table-layout-fixed">
+          <div ng-if="!secrets.length">
+            <p ng-if="!loaded">
+              Loading...
+            </p>
+            <div ng-if="loaded" class="empty-state-message text-center">
+              <h2>No secrets.</h2>
+              <p>
+                No secrets have been added to project {{projectName}}.
+              </p>
+              <p ng-if="project && ('secrets' | canI : 'create') && !secrets.length">
+                <a ng-href="project/{{project.metadata.name}}/create-secret" class="btn btn-primary">Create Secret</a>
+              </p>
+            </div>
+          </div>
+          <table ng-if="secrets.length" class="table table-bordered table-mobile secrets-table table-layout-fixed">
             <colgroup>
               <col class="col-sm-5">
               <col class="col-sm-5">
@@ -34,12 +47,7 @@ <h1>
                 <th>Created</th>
               </tr>
             </thead>
-            <!-- message doesnt show right when there are both dcs and rcs and they are all filtered -->
-            <tbody ng-if="!secrets.length">
-              <!-- If there are no deployment configs and no replication controllers owned by a deployment config -->
-              <tr><td colspan="3"><em>No secrets</em></td></tr>
-            </tbody>
-            <tbody ng-if="secrets.length">
+            <tbody>
               <tr ng-repeat="secret in secrets track by (secret | uid)">
                 <td data-title="Name">
                   <a ng-href="{{secret | navigateResourceURL}}">{{secret.metadata.name}}</a>
diff --git a/app/views/service-instances.html b/app/views/service-instances.html
index 05f74c9f68..64a87a8859 100644
--- a/app/views/service-instances.html
+++ b/app/views/service-instances.html
@@ -11,7 +11,7 @@ <h1>
               Provisioned Services
             </h1>
           </div>
-          <div class="data-toolbar">
+          <div ng-if="(serviceInstances | size) > 0 || filterWithZeroResults" class="data-toolbar">
             <div class="data-toolbar-filter">
               <project-filter></project-filter>
             </div>
@@ -20,10 +20,23 @@ <h1>
       </div><!-- /middle-header-->
       <div class="middle-content">
         <div class="container-fluid">
-          <alerts alerts="alerts"></alerts>
           <div class="row">
             <div class="col-md-12">
-              <table class="table table-bordered table-mobile table-layout-fixed">
+              <div ng-if="(serviceInstances | hashSize) == 0">
+                <p ng-if="!serviceInstancesLoaded">
+                  Loading...
+                </p>
+                <div ng-if="serviceInstancesLoaded" class="empty-state-message text-center">
+                  <div ng-if="!filterWithZeroResults">
+                    <h2>No provisioned services.</h2>
+                    <p>No provisioned services have been added to project {{projectName}}.</p>
+                  </div>
+                  <div ng-if="filterWithZeroResults">
+                    <h2>The filter is hiding all provisioned services. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+                  </div>
+                </div>
+              </div>
+              <table ng-if="(serviceInstances | size) > 0" class="table table-bordered table-mobile table-layout-fixed">
                 <colgroup>
                   <col class="col-sm-3">
                 </colgroup>
@@ -36,11 +49,6 @@ <h1>
                     <th>Bindings</th>
                   </tr>
                 </thead>
-                <tbody ng-if="(serviceInstances | size) === 0">
-                  <tr>
-                    <td colspan="4"><em>{{emptyMessage}}</em></td>
-                  </tr>
-                </tbody>
                 <tbody ng-if="(serviceInstances | size) > 0">
                   <tr ng-repeat="serviceInstance in serviceInstances track by (serviceInstance | uid)">
                     <td data-title="Name">
diff --git a/app/views/services.html b/app/views/services.html
index d217630dd1..c790c78eff 100644
--- a/app/views/services.html
+++ b/app/views/services.html
@@ -11,7 +11,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div class="data-toolbar">
+      <div ng-if="(services | hashSize) > 0 || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -20,10 +20,23 @@ <h1>
   </div><!-- /middle-header-->
   <div class="middle-content">
     <div class="container-fluid">
-      <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <table class="table table-bordered table-mobile table-layout-fixed">
+          <div ng-if="(services | hashSize) == 0">
+            <p ng-if="!servicesLoaded">
+              Loading...
+            </p>
+            <div ng-if="servicesLoaded" class="empty-state-message text-center">
+              <div ng-if="!filterWithZeroResults">
+                <h2>No services.</h2>
+                <p>No services have been added to project {{projectName}}.</p>
+              </div>
+              <div ng-if="filterWithZeroResults">
+                <h2>The filter is hiding all services. <a href="" ng-click="clearFilter()">Clear Filter</a></h2>
+              </div>
+            </div>
+          </div>
+          <table ng-if="(services | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-3">
             </colgroup>
@@ -37,10 +50,7 @@ <h1>
                 <th>Age</th>
               </tr>
             </thead>
-            <tbody ng-if="(services | hashSize) == 0">
-              <tr><td colspan="6"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(services | hashSize) > 0">
+            <tbody>
               <tr ng-repeat="service in services | orderObjectsByDate : true">
                 <td data-title="Name"><a href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a></td>
                 <td data-title="Cluster IP">{{service.spec.clusterIP}}</td>
diff --git a/app/views/storage.html b/app/views/storage.html
index ccd4d1673c..1050c50cab 100644
--- a/app/views/storage.html
+++ b/app/views/storage.html
@@ -2,6 +2,10 @@
   <div class="middle-header header-toolbar">
     <div class="container-fluid">
       <div class="page-header page-header-bleed-right page-header-bleed-left">
+        <div class="pull-right" ng-if="project && ('persistentvolumeclaims' | canI : 'create') && ((pvcs | hashSize) > 0 || filterWithZeroResults)">
+          <a ng-if="!outOfClaims" ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-default">Create Storage</a>
+          <a ng-if="outOfClaims" href="" class="btn btn-default disabled" aria-disabled="true">Create Storage</a>
+        </div>
         <h1>
           Storage
           <span class="page-header-link">
@@ -11,7 +15,7 @@ <h1>
           </span>
         </h1>
       </div>
-      <div ng-if="!renderOptions.showGetStarted" class="data-toolbar">
+      <div ng-if="(pvcs | hashSize) > 0 || filterWithZeroResults" class="data-toolbar">
         <div class="data-toolbar-filter">
           <project-filter></project-filter>
         </div>
@@ -23,18 +27,22 @@ <h1>
       <alerts alerts="alerts"></alerts>
       <div class="row">
         <div class="col-md-12">
-          <div class="section-header page-header-bleed-right page-header-bleed-left">
-            <div class="hidden-xs pull-right" ng-if="project && ('persistentvolumeclaims' | canI : 'create')">
-              <a ng-if="!outOfClaims" ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-default">Create Storage</a>
-              <a ng-if="outOfClaims" href="" class="btn btn-default disabled" aria-disabled="true">Create Storage</a>
-            </div>
-            <h2>Persistent Volume Claims</h2>
-            <div class="visible-xs-block mar-bottom-sm" ng-if="project && ('persistentvolumeclaims' | canI : 'create')">
-              <a ng-if="!outOfClaims" ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-default">Create Storage</a>
-              <a ng-if="outOfClaims" href="" class="btn btn-default disabled" aria-disabled="true">Create Storage</a>
+          <div ng-if="(pvcs | hashSize) === 0">
+            <p ng-if="!pvcsLoaded">
+              Loading...
+            </p>
+            <div ng-if="pvcsLoaded" class="empty-state-message text-center">
+              <h2>No persistent volume claims.</h2>
+              <p ng-if="!filterWithZeroResults">
+                No persistent volume claims have been added to project {{projectName}}.
+              </p>
+              <p ng-if="project && ('persistentvolumeclaims' | canI : 'create') && !filterWithZeroResults">
+                <a ng-if="!outOfClaims" ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-primary">Create Storage</a>
+                <a ng-if="outOfClaims" href="" class="btn btn-primary disabled" aria-disabled="true">Create Storage</a>
+              </p>
             </div>
           </div>
-          <table class="table table-bordered table-mobile table-layout-fixed" ng-class="{ 'table-empty': (pvcs | hashSize) === 0 }">
+          <table ng-if="(pvcs | hashSize) > 0" class="table table-bordered table-mobile table-layout-fixed">
             <colgroup>
               <col class="col-sm-5">
             </colgroup>
@@ -47,10 +55,7 @@ <h2>Persistent Volume Claims</h2>
                 <th>Age</th>
               </tr>
             </thead>
-            <tbody ng-if="(pvcs | hashSize) === 0">
-              <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
-            </tbody>
-            <tbody ng-if="(pvcs | hashSize) > 0">
+            <tbody>
               <tr ng-repeat="pvc in pvcs | orderObjectsByDate : true">
                 <td data-title="Name"><a ng-href="{{pvc | navigateResourceURL}}">{{pvc.metadata.name}}</a>
                   <span ng-if="pvc | storageClass" class="text-muted"> using storage class {{pvc | storageClass}}</span>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 702ac04e80..b0e10ee2a9 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -3,7 +3,7 @@
 function OverviewController(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f, g, v, h, y, b, C, S, w, k, j, P) {
 var R = this, I = t("isIE")() || t("isEdge")();
 e.projectName = n.project, R.catalogLandingPageEnabled = !l.DISABLE_SERVICE_CATALOG_LANDING_PAGE;
-var E, T, N = t("annotation"), D = t("canI"), A = t("buildConfigForBuild"), B = t("deploymentIsInProgress"), L = t("imageObjectRef"), U = t("isJenkinsPipelineStrategy"), O = t("isNewerResource"), F = t("label"), x = t("podTemplate"), V = r.getPreferredVersion("servicebindings"), M = r.getPreferredVersion("clusterserviceclasses"), q = r.getPreferredVersion("serviceinstances"), z = r.getPreferredVersion("clusterserviceplans"), H = {}, G = {}, K = {}, W = R.state = {
+var E, T, N = t("annotation"), D = t("canI"), A = t("buildConfigForBuild"), B = t("deploymentIsInProgress"), L = t("imageObjectRef"), U = t("isJenkinsPipelineStrategy"), O = t("isNewerResource"), F = t("label"), x = t("podTemplate"), V = r.getPreferredVersion("servicebindings"), M = r.getPreferredVersion("clusterserviceclasses"), q = r.getPreferredVersion("serviceinstances"), z = r.getPreferredVersion("clusterserviceplans"), H = {}, G = {}, W = {}, K = R.state = {
 alerts: {},
 builds: {},
 clusterQuotas: {},
@@ -60,7 +60,7 @@ return _.size(R.filteredDeploymentConfigs) + _.size(R.filteredReplicationControl
 }, ee = function() {
 R.size = Z(), R.filteredSize = X();
 var e = 0 === R.size, t = R.deploymentConfigs && R.replicationControllers && R.deployments && R.replicaSets && R.statefulSets && R.pods && R.state.serviceInstances;
-W.expandAll = t && 1 === R.size, R.showGetStarted = t && e, R.showLoading = !t && e, R.everythingFiltered = !e && !R.filteredSize, R.hidePipelineOtherResources = "pipeline" === R.viewBy && (R.filterActive || _.isEmpty(R.pipelineBuildConfigs));
+K.expandAll = t && 1 === R.size, R.showGetStarted = t && e, R.showLoading = !t && e, R.everythingFiltered = !e && !R.filteredSize, R.hidePipelineOtherResources = "pipeline" === R.viewBy && (R.filterActive || _.isEmpty(R.pipelineBuildConfigs));
 }, te = function(e) {
 return o.groupByApp(e, "metadata.name");
 }, ne = function(e) {
@@ -77,9 +77,9 @@ var n = {};
 _.each(e, function(e) {
 var a = _.get(e, t, []);
 _.each(a, function(e) {
-var t = Y(e), a = _.get(W, [ "servicesByObjectUID", t ], []);
+var t = Y(e), a = _.get(K, [ "servicesByObjectUID", t ], []);
 _.each(a, function(e) {
-var t = _.get(W, [ "routesByService", e.metadata.name ], []);
+var t = _.get(K, [ "routesByService", e.metadata.name ], []);
 _.assign(n, _.keyBy(t, "metadata.name"));
 });
 });
@@ -94,7 +94,7 @@ R.filteredDeploymentConfigsByApp = te(R.filteredDeploymentConfigs), R.filteredRe
 }, oe = function() {
 var e = _.filter(R.deploymentConfigs, function(e) {
 var t = J(e);
-return _.isEmpty(W.pipelinesByDeploymentConfig[t]);
+return _.isEmpty(K.pipelinesByDeploymentConfig[t]);
 });
 R.deploymentConfigsNoPipeline = _.sortBy(e, "metadata.name"), R.pipelineViewHasOtherResources = !(_.isEmpty(R.deploymentConfigsNoPipeline) && _.isEmpty(R.vanillaReplicationControllers) && _.isEmpty(R.deployments) && _.isEmpty(R.vanillaReplicaSets) && _.isEmpty(R.statefulSets) && _.isEmpty(R.monopods));
 }, ie = function() {
@@ -102,7 +102,7 @@ R.disableFilter = "pipeline" === R.viewBy && _.isEmpty(R.pipelineBuildConfigs);
 }, se = function(e) {
 return v.getLabelSelector().select(e);
 }, ce = [ "metadata.name", "spec.externalClusterServiceClassName" ], le = function(e) {
-return g.filterForKeywords(e, ce, W.filterKeywords);
+return g.filterForKeywords(e, ce, K.filterKeywords);
 }, ue = function(e) {
 switch (R.filterBy) {
 case "label":
@@ -118,19 +118,19 @@ case "label":
 return !v.getLabelSelector().isEmpty();
 
 case "name":
-return !_.isEmpty(W.filterKeywords);
+return !_.isEmpty(K.filterKeywords);
 }
 }, me = function() {
-R.filteredDeploymentConfigs = ue(R.deploymentConfigs), R.filteredReplicationControllers = ue(R.vanillaReplicationControllers), R.filteredDeployments = ue(R.deployments), R.filteredReplicaSets = ue(R.vanillaReplicaSets), R.filteredStatefulSets = ue(R.statefulSets), R.filteredMonopods = ue(R.monopods), R.filteredPipelineBuildConfigs = ue(R.pipelineBuildConfigs), R.filteredServiceInstances = ue(W.orderedServiceInstances), R.filterActive = de(), re(), ee();
+R.filteredDeploymentConfigs = ue(R.deploymentConfigs), R.filteredReplicationControllers = ue(R.vanillaReplicationControllers), R.filteredDeployments = ue(R.deployments), R.filteredReplicaSets = ue(R.vanillaReplicaSets), R.filteredStatefulSets = ue(R.statefulSets), R.filteredMonopods = ue(R.monopods), R.filteredPipelineBuildConfigs = ue(R.pipelineBuildConfigs), R.filteredServiceInstances = ue(K.orderedServiceInstances), R.filterActive = de(), re(), ee();
 }, pe = n.project + "/overview/view-by";
 R.viewBy = localStorage.getItem(pe) || "app", e.$watch(function() {
 return R.viewBy;
 }, function(e) {
 localStorage.setItem(pe, e), ie(), ce = "app" === R.viewBy ? [ "metadata.name", "metadata.labels.app" ] : [ "metadata.name" ], me(), "pipeline" === R.viewBy ? v.setLabelSuggestions(G) : v.setLabelSuggestions(H);
 }), l.DISABLE_OVERVIEW_METRICS || (y.isAvailable(!0).then(function(e) {
-W.showMetrics = e;
+K.showMetrics = e;
 }), e.$on("metrics-connection-failed", function(e, t) {
-a.isAlertPermanentlyHidden("metrics-connection-failed") || W.alerts["metrics-connection-failed"] || (W.alerts["metrics-connection-failed"] = {
+a.isAlertPermanentlyHidden("metrics-connection-failed") || K.alerts["metrics-connection-failed"] || (K.alerts["metrics-connection-failed"] = {
 type: "warning",
 message: "An error occurred getting metrics.",
 links: [ {
@@ -153,10 +153,10 @@ var t = Y(e);
 return t ? fe(e) ? [ e ] : _.get(R, [ "state", "podsByOwnerUID", t ], []) : [];
 }, ve = function(e, t) {
 var n = Y(e);
-W.notificationsByObjectUID[n] = t || {};
+K.notificationsByObjectUID[n] = t || {};
 }, he = function(e) {
 var t = Y(e);
-return t ? _.get(W, [ "notificationsByObjectUID", t ], {}) : {};
+return t ? _.get(K, [ "notificationsByObjectUID", t ], {}) : {};
 }, ye = function(e) {
 if (Y(e)) {
 var t = ge(e), a = k.getPodAlerts(t, n.project);
@@ -166,7 +166,7 @@ ve(e, a);
 _.each(e, ye);
 }, Ce = function(e) {
 var t = J(e);
-return t ? K[t] : null;
+return t ? W[t] : null;
 }, Se = function(e) {
 var t = J(e);
 return t ? _.get(R, [ "replicationControllersByDeploymentConfig", t ]) : [];
@@ -209,7 +209,7 @@ _.isEmpty(e) || (v.addLabelSuggestionsFromResources(e, G), "pipeline" === R.view
 }, Ne = function(e) {
 return "Succeeded" !== e.status.phase && "Failed" !== e.status.phase && (!F(e, "openshift.io/deployer-pod-for.name") && (!N(e, "openshift.io/build.name") && "slave" !== F(e, "jenkins")));
 }, De = function() {
-W.podsByOwnerUID = S.groupByOwnerUID(R.pods), R.monopods = _.filter(W.podsByOwnerUID[""], Ne);
+K.podsByOwnerUID = S.groupByOwnerUID(R.pods), R.monopods = _.filter(K.podsByOwnerUID[""], Ne);
 }, Ae = function(e) {
 return !!_.get(e, "status.replicas") || (!N(e, "deploymentConfig") || B(e));
 }, $e = function(e) {
@@ -217,13 +217,13 @@ return N(e, "deploymentConfig");
 }, Be = function() {
 if (R.deploymentConfigs && R.replicationControllers) {
 var e = [];
-R.replicationControllersByDeploymentConfig = {}, R.currentByDeploymentConfig = {}, K = {};
+R.replicationControllersByDeploymentConfig = {}, R.currentByDeploymentConfig = {}, W = {};
 var t = {}, n = {};
 _.each(R.replicationControllers, function(a) {
 var r = $e(a) || "";
 (!r || !R.deploymentConfigs[r] && _.get(a, "status.replicas")) && e.push(a);
-var o = K[r];
-o && !O(a, o) || (K[r] = a);
+var o = W[r];
+o && !O(a, o) || (W[r] = a);
 var i;
 "Complete" === N(a, "deploymentStatus") && ((i = t[r]) && !O(a, i) || (t[r] = a)), Ae(a) && _.set(n, [ r, a.metadata.name ], a);
 }), _.each(t, function(e, t) {
@@ -247,15 +247,15 @@ R.replicaSetsByDeploymentUID[t] = r, R.currentByDeploymentUID[t] = _.head(r);
 }
 }), R.vanillaReplicaSets = _.sortBy(R.replicaSetsByDeploymentUID[""], "metadata.name"), Pe());
 }, Oe = {}, Fe = function(e) {
-e && W.allServices && _.each(e, function(e) {
+e && K.allServices && _.each(e, function(e) {
 var t = [], n = Y(e), a = x(e);
 _.each(Oe, function(e, n) {
-e.matches(a) && t.push(W.allServices[n]);
-}), W.servicesByObjectUID[n] = _.sortBy(t, "metadata.name");
+e.matches(a) && t.push(K.allServices[n]);
+}), K.servicesByObjectUID[n] = _.sortBy(t, "metadata.name");
 });
 }, xe = function() {
-if (W.allServices) {
-Oe = _.mapValues(W.allServices, function(e) {
+if (K.allServices) {
+Oe = _.mapValues(K.allServices, function(e) {
 return new LabelSelector(e.spec.selector);
 });
 var e = [ R.deploymentConfigs, R.vanillaReplicationControllers, R.deployments, R.vanillaReplicaSets, R.statefulSets, R.monopods ];
@@ -263,47 +263,47 @@ _.each(e, Fe), ae();
 }
 }, Ve = function() {
 var e = j.groupByService(R.routes, !0);
-W.routesByService = _.mapValues(e, j.sortRoutesByScore), ae();
+K.routesByService = _.mapValues(e, j.sortRoutesByScore), ae();
 }, Me = function() {
-W.hpaByResource = m.groupHPAs(R.horizontalPodAutoscalers);
+K.hpaByResource = m.groupHPAs(R.horizontalPodAutoscalers);
 }, qe = function(e) {
 var t = A(e), n = R.buildConfigs[t];
 if (n) {
 R.recentPipelinesByBuildConfig[t] = R.recentPipelinesByBuildConfig[t] || [], R.recentPipelinesByBuildConfig[t].push(e);
 var a = s.usesDeploymentConfigs(n);
 _.each(a, function(t) {
-W.recentPipelinesByDeploymentConfig[t] = W.recentPipelinesByDeploymentConfig[t] || [], W.recentPipelinesByDeploymentConfig[t].push(e);
+K.recentPipelinesByDeploymentConfig[t] = K.recentPipelinesByDeploymentConfig[t] || [], K.recentPipelinesByDeploymentConfig[t].push(e);
 }), oe();
 }
 }, ze = {}, He = function() {
 ze = s.groupBuildConfigsByOutputImage(R.buildConfigs);
 }, Ge = function(e) {
 var t = Y(e);
-if (t) return _.get(W, [ "buildConfigsByObjectUID", t ], []);
-}, Ke = function(e) {
+if (t) return _.get(K, [ "buildConfigsByObjectUID", t ], []);
+}, We = function(e) {
 var t = [], n = Ge(e);
 _.each(n, function(e) {
-var n = _.get(W, [ "recentBuildsByBuildConfig", e.metadata.name ], []);
+var n = _.get(K, [ "recentBuildsByBuildConfig", e.metadata.name ], []);
 t = t.concat(n);
 });
 var a = J(e);
-_.set(W, [ "recentBuildsByDeploymentConfig", a ], t);
-}, We = function(e, t) {
+_.set(K, [ "recentBuildsByDeploymentConfig", a ], t);
+}, Ke = function(e, t) {
 var n = Y(t);
-n && _.set(W, [ "buildConfigsByObjectUID", n ], e);
+n && _.set(K, [ "buildConfigsByObjectUID", n ], e);
 }, Qe = function() {
 var e = [];
-R.deploymentConfigsByPipeline = {}, W.pipelinesByDeploymentConfig = {}, _.each(R.buildConfigs, function(t) {
+R.deploymentConfigsByPipeline = {}, K.pipelinesByDeploymentConfig = {}, _.each(R.buildConfigs, function(t) {
 if (U(t)) {
 e.push(t);
 var n = s.usesDeploymentConfigs(t), a = J(t);
 _.set(R, [ "deploymentConfigsByPipeline", a ], n), _.each(n, function(e) {
-W.pipelinesByDeploymentConfig[e] = W.pipelinesByDeploymentConfig[e] || [], W.pipelinesByDeploymentConfig[e].push(t);
+K.pipelinesByDeploymentConfig[e] = K.pipelinesByDeploymentConfig[e] || [], K.pipelinesByDeploymentConfig[e].push(t);
 });
 }
 }), R.pipelineBuildConfigs = _.sortBy(e, "metadata.name"), oe(), Te(R.pipelineBuildConfigs), ie();
 }, Je = function() {
-W.buildConfigsByObjectUID = {}, _.each(R.deploymentConfigs, function(e) {
+K.buildConfigsByObjectUID = {}, _.each(R.deploymentConfigs, function(e) {
 var t = [], n = _.get(e, "spec.triggers");
 _.each(n, function(n) {
 var a = _.get(n, "imageChangeParams.from");
@@ -311,36 +311,36 @@ if (a) {
 var r = L(a, e.metadata.namespace), o = ze[r];
 _.isEmpty(o) || (t = t.concat(o));
 }
-}), t = _.sortBy(t, "metadata.name"), We(t, e), Ke(e);
+}), t = _.sortBy(t, "metadata.name"), Ke(t, e), We(e);
 });
 }, Ye = function() {
 Qe(), Je();
 }, Ze = function() {
-_.each(R.deploymentConfigs, Ke);
+_.each(R.deploymentConfigs, We);
 }, Xe = function() {
-if (W.builds && R.buildConfigs) {
-R.recentPipelinesByBuildConfig = {}, W.recentBuildsByBuildConfig = {}, W.recentPipelinesByDeploymentConfig = {};
+if (K.builds && R.buildConfigs) {
+R.recentPipelinesByBuildConfig = {}, K.recentBuildsByBuildConfig = {}, K.recentPipelinesByDeploymentConfig = {};
 var e = {};
-_.each(s.interestingBuilds(W.builds), function(t) {
+_.each(s.interestingBuilds(K.builds), function(t) {
 var n = A(t);
 U(t) ? qe(t) : (e[n] = e[n] || [], e[n].push(t));
 }), R.recentPipelinesByBuildConfig = _.mapValues(R.recentPipelinesByBuildConfig, function(e) {
 return s.sortBuilds(e, !0);
-}), W.recentPipelinesByDeploymentConfig = _.mapValues(W.recentPipelinesByDeploymentConfig, function(e) {
+}), K.recentPipelinesByDeploymentConfig = _.mapValues(K.recentPipelinesByDeploymentConfig, function(e) {
 return s.sortBuilds(e, !0);
-}), W.recentBuildsByBuildConfig = _.mapValues(e, function(e) {
+}), K.recentBuildsByBuildConfig = _.mapValues(e, function(e) {
 return s.sortBuilds(e, !0);
 }), Ze();
 }
 }, et = function() {
-k.setQuotaNotifications(W.quotas, W.clusterQuotas, n.project);
+k.setQuotaNotifications(K.quotas, K.clusterQuotas, n.project);
 };
 R.clearFilter = function() {
 v.clear(), R.filterText = "";
 }, e.$watch(function() {
 return R.filterText;
 }, _.debounce(function(t, n) {
-t !== n && (W.filterKeywords = g.generateKeywords(t), e.$evalAsync(me));
+t !== n && (K.filterKeywords = g.generateKeywords(t), e.$evalAsync(me));
 }, 50, {
 maxWait: 250
 })), e.$watch(function() {
@@ -351,34 +351,34 @@ e !== t && (R.clearFilter(), me());
 e.$evalAsync(me);
 }), R.startBuild = s.startBuild;
 var tt = function() {
-if (W.bindingsByApplicationUID = {}, W.applicationsByBinding = {}, W.deleteableBindingsByApplicationUID = {}, !_.isEmpty(W.bindings)) {
+if (K.bindingsByApplicationUID = {}, K.applicationsByBinding = {}, K.deleteableBindingsByApplicationUID = {}, !_.isEmpty(K.bindings)) {
 var e = [ R.deployments, R.deploymentConfigs, R.vanillaReplicationControllers, R.vanillaReplicaSets, R.statefulSets ];
 if (!_.some(e, function(e) {
 return !e;
 })) {
-var t = i.getPodPresetSelectorsForBindings(W.bindings);
+var t = i.getPodPresetSelectorsForBindings(K.bindings);
 _.each(e, function(e) {
 _.each(e, function(e) {
 var n = Y(e), a = new LabelSelector(_.get(e, "spec.selector"));
-W.bindingsByApplicationUID[n] = [], W.deleteableBindingsByApplicationUID[n] = [], _.each(t, function(t, r) {
-t.covers(a) && (W.bindingsByApplicationUID[n].push(W.bindings[r]), _.get(W.bindings[r], "metadata.deletionTimestamp") || W.deleteableBindingsByApplicationUID[n].push(W.bindings[r]), W.applicationsByBinding[r] = W.applicationsByBinding[r] || [], W.applicationsByBinding[r].push(e));
+K.bindingsByApplicationUID[n] = [], K.deleteableBindingsByApplicationUID[n] = [], _.each(t, function(t, r) {
+t.covers(a) && (K.bindingsByApplicationUID[n].push(K.bindings[r]), _.get(K.bindings[r], "metadata.deletionTimestamp") || K.deleteableBindingsByApplicationUID[n].push(K.bindings[r]), K.applicationsByBinding[r] = K.applicationsByBinding[r] || [], K.applicationsByBinding[r].push(e));
 });
 });
 }), R.bindingsByInstanceRef = _.reduce(R.bindingsByInstanceRef, function(e, t, n) {
 return e[n] = _.sortBy(t, function(e) {
-var t = _.get(W.applicationsByBinding, [ e.metadata.name ]);
+var t = _.get(K.applicationsByBinding, [ e.metadata.name ]);
 return _.get(_.head(t), [ "metadata", "name" ]) || e.metadata.name;
 }), e;
 }, {});
 }
 }
 }, nt = function() {
-W.bindableServiceInstances = i.filterBindableServiceInstances(W.serviceInstances, W.serviceClasses, W.servicePlans), W.orderedServiceInstances = i.sortServiceInstances(W.serviceInstances, W.serviceClasses);
+K.bindableServiceInstances = i.filterBindableServiceInstances(K.serviceInstances, K.serviceClasses, K.servicePlans), K.orderedServiceInstances = i.sortServiceInstances(K.serviceInstances, K.serviceClasses);
 }, at = [];
 w.get(n.project).then(_.spread(function(t, n) {
-W.project = e.project = t, W.context = n;
+K.project = e.project = t, K.context = n;
 var a = function() {
-R.pods && f.fetchReferencedImageStreamImages(R.pods, W.imagesByDockerReference, W.imageStreamImageRefByDockerReference, n);
+R.pods && f.fetchReferencedImageStreamImages(R.pods, K.imagesByDockerReference, K.imageStreamImageRefByDockerReference, n);
 };
 at.push(u.watch("pods", n, function(e) {
 R.pods = e.by("metadata.name"), De(), a(), Ie(), Fe(R.monopods), be(R.monopods), Ee(R.monopods), me(), h.log("pods (subscribe)", R.pods);
@@ -397,7 +397,7 @@ resource: "deployments"
 }, n, function(e) {
 E = e.by("metadata.uid"), R.deployments = _.sortBy(E, "metadata.name"), Ue(), Fe(R.deployments), Fe(R.vanillaReplicaSets), Ee(R.deployments), tt(), me(), h.log("deployments (subscribe)", R.deploymentsByUID);
 })), at.push(u.watch("builds", n, function(e) {
-W.builds = e.by("metadata.name"), Xe(), h.log("builds (subscribe)", W.builds);
+K.builds = e.by("metadata.name"), Xe(), h.log("builds (subscribe)", K.builds);
 })), at.push(u.watch({
 group: "apps",
 resource: "statefulsets"
@@ -407,7 +407,7 @@ R.statefulSets = e.by("metadata.name"), Fe(R.statefulSets), Fe(R.monopods), be(R
 poll: I,
 pollInterval: 6e4
 })), at.push(u.watch("services", n, function(e) {
-W.allServices = e.by("metadata.name"), xe(), h.log("services (subscribe)", W.allServices);
+K.allServices = e.by("metadata.name"), xe(), h.log("services (subscribe)", K.allServices);
 }, {
 poll: I,
 pollInterval: 6e4
@@ -431,17 +431,17 @@ R.horizontalPodAutoscalers = e.by("metadata.name"), Me(), h.log("autoscalers (su
 poll: I,
 pollInterval: 6e4
 })), at.push(u.watch("imagestreams", n, function(e) {
-T = e.by("metadata.name"), f.buildDockerRefMapForImageStreams(T, W.imageStreamImageRefByDockerReference), a(), h.log("imagestreams (subscribe)", T);
+T = e.by("metadata.name"), f.buildDockerRefMapForImageStreams(T, K.imageStreamImageRefByDockerReference), a(), h.log("imagestreams (subscribe)", T);
 }, {
 poll: I,
 pollInterval: 6e4
 })), at.push(u.watch("resourcequotas", n, function(e) {
-W.quotas = e.by("metadata.name"), et();
+K.quotas = e.by("metadata.name"), et();
 }, {
 poll: !0,
 pollInterval: 6e4
 })), at.push(u.watch("appliedclusterresourcequotas", n, function(e) {
-W.clusterQuotas = e.by("metadata.name"), et();
+K.clusterQuotas = e.by("metadata.name"), et();
 }, {
 poll: !0,
 pollInterval: 6e4
@@ -449,33 +449,33 @@ pollInterval: 6e4
 var r, o, i = {}, s = {};
 c.SERVICE_CATALOG_ENABLED && D(q, "watch") && (r = function(e) {
 var t = P.getServiceClassNameForInstance(e);
-_.has(W, [ "serviceClasses", t ]) || i[t] || (i[t] = u.get(M, t, {}).then(function(e) {
-W.serviceClasses[t] = e;
+_.has(K, [ "serviceClasses", t ]) || i[t] || (i[t] = u.get(M, t, {}).then(function(e) {
+K.serviceClasses[t] = e;
 }).finally(function() {
 delete s[t];
 }));
 }, o = function(e) {
 var t = P.getServicePlanNameForInstance(e);
-_.has(W, [ "servicePlans", t ]) || s[t] || (s[t] = u.get(z, t, {}).then(function(e) {
-W.servicePlans[t] = e;
+_.has(K, [ "servicePlans", t ]) || s[t] || (s[t] = u.get(z, t, {}).then(function(e) {
+K.servicePlans[t] = e;
 }).finally(function() {
 delete s[t];
 }));
 }, at.push(u.watch(q, n, function(e) {
-W.serviceInstances = e.by("metadata.name"), _.each(W.serviceInstances, function(e) {
+K.serviceInstances = e.by("metadata.name"), _.each(K.serviceInstances, function(e) {
 var t = k.getServiceInstanceAlerts(e);
 ve(e, t), r(e), o(e);
-}), nt(), Ee(W.serviceInstances), me();
+}), nt(), Ee(K.serviceInstances), me();
 }, {
 poll: I,
 pollInterval: 6e4
 }))), c.SERVICE_CATALOG_ENABLED && D(V, "watch") && at.push(u.watch(V, n, function(e) {
-W.bindings = e.by("metadata.name"), R.bindingsByInstanceRef = _.groupBy(W.bindings, "spec.instanceRef.name"), tt();
+K.bindings = e.by("metadata.name"), R.bindingsByInstanceRef = _.groupBy(K.bindings, "spec.instanceRef.name"), tt();
 }, {
 poll: I,
 pollInterval: 6e4
 })), u.list("limitranges", n, function(e) {
-W.limitRanges = e.by("metadata.name");
+K.limitRanges = e.by("metadata.name");
 });
 var d = l.SAMPLE_PIPELINE_TEMPLATE;
 d && u.get("templates", d.name, {
@@ -4593,19 +4593,18 @@ e.message && r.push(e.message);
 i.unwatchAll(p);
 });
 } ]), angular.module("openshiftConsole").controller("PodsController", [ "$routeParams", "$scope", "DataService", "ProjectsService", "$filter", "LabelFilter", "Logger", function(e, t, n, a, r, o, i) {
-t.projectName = e.project, t.pods = {}, t.unfilteredPods = {}, t.labelSuggestions = {}, t.alerts = t.alerts || {}, t.emptyMessage = "Loading...";
+t.projectName = e.project, t.pods = {}, t.unfilteredPods = {}, t.labelSuggestions = {}, t.clearFilter = function() {
+o.clear();
+};
 var s = [];
 a.get(e.project).then(_.spread(function(e, a) {
 function r() {
-o.getLabelSelector().isEmpty() || !$.isEmptyObject(t.pods) || $.isEmptyObject(t.unfilteredPods) ? delete t.alerts.pods : t.alerts.pods = {
-type: "warning",
-details: "The active filters are hiding all pods."
-};
+t.filterWithZeroResults = !o.getLabelSelector().isEmpty() && _.isEmpty(t.pods) && !_.isEmpty(t.unfilteredPods);
 }
 t.project = e, s.push(n.watch("pods", a, function(e) {
-t.unfilteredPods = e.by("metadata.name"), t.pods = o.getLabelSelector().select(t.unfilteredPods), t.emptyMessage = "No pods to show", o.addLabelSuggestionsFromResources(t.unfilteredPods, t.labelSuggestions), o.setLabelSuggestions(t.labelSuggestions), r(), i.log("pods (subscribe)", t.unfilteredPods);
+t.podsLoaded = !0, t.unfilteredPods = e.by("metadata.name"), t.pods = o.getLabelSelector().select(t.unfilteredPods), o.addLabelSuggestionsFromResources(t.unfilteredPods, t.labelSuggestions), o.setLabelSuggestions(t.labelSuggestions), r(), i.log("pods (subscribe)", t.unfilteredPods);
 })), o.onActiveFiltersChanged(function(e) {
-t.$apply(function() {
+t.$evalAsync(function() {
 t.pods = e.select(t.unfilteredPods), r();
 });
 }), t.$on("$destroy", function() {
@@ -5252,7 +5251,9 @@ a.toggle.roles = !a.toggle.roles, a.toggle.roles ? a.filteredRoles = t : (a.filt
 });
 }));
 } ]), angular.module("openshiftConsole").controller("BuildsController", [ "$filter", "$location", "$routeParams", "$scope", "APIService", "BuildsService", "DataService", "LabelFilter", "Logger", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l) {
-a.projectName = n.project, a.builds = {}, a.unfilteredBuildConfigs = {}, a.buildConfigs = void 0, a.labelSuggestions = {}, a.alerts = a.alerts || {}, a.emptyMessage = "Loading...", a.latestByConfig = {};
+a.projectName = n.project, a.builds = {}, a.unfilteredBuildConfigs = {}, a.buildConfigs = void 0, a.labelSuggestions = {}, a.latestByConfig = {}, a.clearFilter = function() {
+s.clear();
+};
 var u = e("buildConfigForBuild"), d = r.getPreferredVersion("builds"), m = r.getPreferredVersion("buildconfigs"), p = [];
 l.get(n.project).then(_.spread(function(t, n) {
 function r(e) {
@@ -5273,19 +5274,16 @@ a.latestByConfig[t] = a.latestByConfig[t] || null;
 }
 function g() {
 var e = _.omitBy(a.latestByConfig, _.isNull);
-!s.getLabelSelector().isEmpty() && _.isEmpty(a.buildConfigs) && _.isEmpty(e) ? a.alerts.builds = {
-type: "warning",
-details: "The active filters are hiding all builds."
-} : delete a.alerts.builds;
+a.filterWithZeroResults = !s.getLabelSelector().isEmpty() && _.isEmpty(a.buildConfigs) && _.isEmpty(e);
 }
 a.project = t;
 var v = e("isJenkinsPipelineStrategy");
 p.push(i.watch(d, n, function(e) {
-a.builds = _.omitBy(e.by("metadata.name"), v), a.emptyMessage = "No builds to show", f(), s.addLabelSuggestionsFromResources(a.builds, a.labelSuggestions), c.log("builds (subscribe)", a.builds);
+a.buildsLoaded = !0, a.builds = _.omitBy(e.by("metadata.name"), v), f(), s.addLabelSuggestionsFromResources(a.builds, a.labelSuggestions), c.log("builds (subscribe)", a.builds);
 })), p.push(i.watch(m, n, function(e) {
 a.unfilteredBuildConfigs = _.omitBy(e.by("metadata.name"), v), s.addLabelSuggestionsFromResources(a.unfilteredBuildConfigs, a.labelSuggestions), s.setLabelSuggestions(a.labelSuggestions), a.buildConfigs = s.getLabelSelector().select(a.unfilteredBuildConfigs), f(), g(), c.log("buildconfigs (subscribe)", a.buildConfigs);
 })), s.onActiveFiltersChanged(function(e) {
-a.$apply(function() {
+a.$evalAsync(function() {
 a.buildConfigs = e.select(a.unfilteredBuildConfigs), f(), g();
 });
 }), a.$on("$destroy", function() {
@@ -5577,7 +5575,9 @@ r.unwatchAll(d);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("ImagesController", [ "$filter", "$routeParams", "$scope", "APIService", "DataService", "LabelFilter", "Logger", "ProjectsService", function(e, t, n, a, r, o, i, s) {
-n.projectName = t.project, n.imageStreams = {}, n.unfilteredImageStreams = {}, n.missingStatusTagsByImageStream = {}, n.builds = {}, n.labelSuggestions = {}, n.alerts = n.alerts || {}, n.emptyMessage = "Loading...";
+n.projectName = t.project, n.imageStreams = {}, n.unfilteredImageStreams = {}, n.missingStatusTagsByImageStream = {}, n.builds = {}, n.labelSuggestions = {}, n.clearFilter = function() {
+o.clear();
+};
 var c = a.getPreferredVersion("imagestreams"), l = [];
 s.get(t.project).then(_.spread(function(e, t) {
 function a() {
@@ -5594,15 +5594,12 @@ r[e.name] || (a[e.name] = e);
 });
 }
 function s() {
-o.getLabelSelector().isEmpty() || !$.isEmptyObject(n.imageStreams) || $.isEmptyObject(n.unfilteredImageStreams) ? delete n.alerts.imageStreams : n.alerts.imageStreams = {
-type: "warning",
-details: "The active filters are hiding all image streams."
-};
+n.filterWithZeroResults = !o.getLabelSelector().isEmpty() && _.isEmpty(n.imageStreams) && !_.isEmpty(n.unfilteredImageStreams);
 }
 n.project = e, l.push(r.watch(c, t, function(e) {
-n.unfilteredImageStreams = e.by("metadata.name"), o.addLabelSuggestionsFromResources(n.unfilteredImageStreams, n.labelSuggestions), o.setLabelSuggestions(n.labelSuggestions), n.imageStreams = o.getLabelSelector().select(n.unfilteredImageStreams), n.emptyMessage = "No image streams to show", a(), s(), i.log("image streams (subscribe)", n.imageStreams);
+n.imageStreamsLoaded = !0, n.unfilteredImageStreams = e.by("metadata.name"), o.addLabelSuggestionsFromResources(n.unfilteredImageStreams, n.labelSuggestions), o.setLabelSuggestions(n.labelSuggestions), n.imageStreams = o.getLabelSelector().select(n.unfilteredImageStreams), a(), s(), i.log("image streams (subscribe)", n.imageStreams);
 })), o.onActiveFiltersChanged(function(e) {
-n.$apply(function() {
+n.$evalAsync(function() {
 n.imageStreams = e.select(n.unfilteredImageStreams), s();
 });
 }), n.$on("$destroy", function() {
@@ -5642,45 +5639,46 @@ var n = i.resourceURL(e.metadata.name, "ImageStream", e.metadata.namespace);
 return t && (n += "/" + t.name), n;
 };
 } ]), angular.module("openshiftConsole").controller("DeploymentsController", [ "$scope", "$filter", "$routeParams", "APIService", "DataService", "DeploymentsService", "LabelFilter", "Logger", "OwnerReferencesService", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l) {
-e.projectName = n.project, e.replicationControllers = {}, e.unfilteredDeploymentConfigs = {}, e.unfilteredDeployments = {}, e.replicationControllersByDC = {}, e.labelSuggestions = {}, e.alerts = e.alerts || {}, e.emptyMessage = "Loading...", e.expandedDeploymentConfigRow = {}, e.unfilteredReplicaSets = {}, e.unfilteredReplicationControllers = {};
-var u, d, m = t("annotation"), p = a.getPreferredVersion("deployments"), f = a.getPreferredVersion("deploymentconfigs"), g = a.getPreferredVersion("replicationcontrollers"), v = a.getPreferredVersion("replicasets"), h = function() {
-u && d && (e.replicaSetsByDeploymentUID = c.groupByControllerUID(u), e.unfilteredReplicaSets = _.get(e, [ "replicaSetsByDeploymentUID", "" ], {}), i.addLabelSuggestionsFromResources(e.unfilteredReplicaSets, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.replicaSets = i.getLabelSelector().select(e.unfilteredReplicaSets), e.latestReplicaSetByDeploymentUID = {}, _.each(e.replicaSetsByDeploymentUID, function(t, n) {
-n && (e.latestReplicaSetByDeploymentUID[n] = o.getActiveReplicaSet(t, d[n]));
-}));
-}, y = [];
-l.get(n.project).then(_.spread(function(n, a) {
-function c() {
-i.getLabelSelector().isEmpty() ? delete e.alerts.deployments : _.isEmpty(e.unfilteredDeploymentConfigs) && _.isEmpty(e.unfilteredReplicationControllers) && _.isEmpty(e.unfilteredDeployments) && _.isEmpty(e.unfilteredReplicaSets) ? delete e.alerts.deployments : _.isEmpty(e.deploymentConfigs) && _.isEmpty(e.replicationControllersByDC[""]) && _.isEmpty(e.deployments) && _.isEmpty(e.replicaSets) ? e.alerts.deployments = {
-type: "warning",
-details: "The active filters are hiding all deployments."
-} : delete e.alerts.deployments;
+function u() {
+var t = _.isEmpty(e.unfilteredDeploymentConfigs) && _.isEmpty(e.unfilteredReplicationControllers) && _.isEmpty(e.unfilteredDeployments) && _.isEmpty(e.unfilteredReplicaSets), n = !i.getLabelSelector().isEmpty(), a = _.isEmpty(e.deploymentConfigs) && _.isEmpty(e.replicationControllersByDC[""]) && _.isEmpty(e.deployments) && _.isEmpty(e.replicaSets);
+e.showEmptyState = t, e.filterWithZeroResults = n && a && !t;
 }
-e.project = n, y.push(r.watch(g, a, function(n, a, r) {
+e.projectName = n.project, e.replicationControllers = {}, e.unfilteredDeploymentConfigs = {}, e.unfilteredDeployments = {}, e.replicationControllersByDC = {}, e.labelSuggestions = {}, e.emptyMessage = "Loading...", e.expandedDeploymentConfigRow = {}, e.unfilteredReplicaSets = {}, e.unfilteredReplicationControllers = {}, e.showEmptyState = !0, e.clearFilter = function() {
+i.clear();
+};
+var d, m, p = t("annotation"), f = a.getPreferredVersion("deployments"), g = a.getPreferredVersion("deploymentconfigs"), v = a.getPreferredVersion("replicationcontrollers"), h = a.getPreferredVersion("replicasets"), y = function() {
+d && m && (e.replicaSetsByDeploymentUID = c.groupByControllerUID(d), e.unfilteredReplicaSets = _.get(e, [ "replicaSetsByDeploymentUID", "" ], {}), i.addLabelSuggestionsFromResources(e.unfilteredReplicaSets, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.replicaSets = i.getLabelSelector().select(e.unfilteredReplicaSets), e.latestReplicaSetByDeploymentUID = {}, _.each(e.replicaSetsByDeploymentUID, function(t, n) {
+n && (e.latestReplicaSetByDeploymentUID[n] = o.getActiveReplicaSet(t, m[n]));
+}), u());
+}, b = [];
+l.get(n.project).then(_.spread(function(n, a) {
+e.project = n, b.push(r.watch(v, a, function(n, a, r) {
 e.replicationControllers = n.by("metadata.name");
-var l, u;
-if (r && (l = m(r, "deploymentConfig"), u = r.metadata.name), e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], i.addLabelSuggestionsFromResources(e.unfilteredReplicationControllers, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), c(), a) {
-if ("ADDED" === a || "MODIFIED" === a && [ "New", "Pending", "Running" ].indexOf(t("deploymentStatus")(r)) > -1) e.deploymentConfigDeploymentsInProgress[l] = e.deploymentConfigDeploymentsInProgress[l] || {}, e.deploymentConfigDeploymentsInProgress[l][u] = r; else if ("MODIFIED" === a) {
+var c, l;
+if (r && (c = p(r, "deploymentConfig"), l = r.metadata.name), e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], i.addLabelSuggestionsFromResources(e.unfilteredReplicationControllers, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), u(), a) {
+if ("ADDED" === a || "MODIFIED" === a && [ "New", "Pending", "Running" ].indexOf(t("deploymentStatus")(r)) > -1) e.deploymentConfigDeploymentsInProgress[c] = e.deploymentConfigDeploymentsInProgress[c] || {}, e.deploymentConfigDeploymentsInProgress[c][l] = r; else if ("MODIFIED" === a) {
 var d = t("deploymentStatus")(r);
-"Complete" !== d && "Failed" !== d || delete e.deploymentConfigDeploymentsInProgress[l][u];
+"Complete" !== d && "Failed" !== d || delete e.deploymentConfigDeploymentsInProgress[c][l];
 }
 } else e.deploymentConfigDeploymentsInProgress = o.associateRunningDeploymentToDeploymentConfig(e.replicationControllersByDC);
 r ? "DELETED" !== a && (r.causes = t("deploymentCauses")(r)) : angular.forEach(e.replicationControllers, function(e) {
 e.causes = t("deploymentCauses")(e);
 }), s.log("replicationControllers (subscribe)", e.replicationControllers);
-})), y.push(r.watch(v, a, function(t) {
-u = t.by("metadata.name"), h(), s.log("replicasets (subscribe)", e.replicaSets);
-})), y.push(r.watch(f, a, function(t) {
-e.unfilteredDeploymentConfigs = t.by("metadata.name"), i.addLabelSuggestionsFromResources(e.unfilteredDeploymentConfigs, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.deploymentConfigs = i.getLabelSelector().select(e.unfilteredDeploymentConfigs), e.emptyMessage = "No deployment configurations to show", e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), c(), s.log("deploymentconfigs (subscribe)", e.deploymentConfigs);
-})), y.push(r.watch(p, a, function(t) {
-d = e.unfilteredDeployments = t.by("metadata.uid"), i.addLabelSuggestionsFromResources(e.unfilteredDeployments, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.deployments = i.getLabelSelector().select(e.unfilteredDeployments), h(), s.log("deployments (subscribe)", e.unfilteredDeployments);
-})), e.showEmptyMessage = function() {
-return 0 === t("hashSize")(e.replicationControllersByDC) || !(1 !== t("hashSize")(e.replicationControllersByDC) || !e.replicationControllersByDC[""]);
+})), b.push(r.watch(h, a, function(t) {
+d = t.by("metadata.name"), y(), s.log("replicasets (subscribe)", e.replicaSets);
+})), b.push(r.watch(g, a, function(t) {
+e.deploymentConfigsLoaded = !0, e.unfilteredDeploymentConfigs = t.by("metadata.name"), i.addLabelSuggestionsFromResources(e.unfilteredDeploymentConfigs, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.deploymentConfigs = i.getLabelSelector().select(e.unfilteredDeploymentConfigs), e.emptyMessage = "No deployment configurations to show", e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), u(), s.log("deploymentconfigs (subscribe)", e.deploymentConfigs);
+})), b.push(r.watch(f, a, function(t) {
+m = e.unfilteredDeployments = t.by("metadata.uid"), i.addLabelSuggestionsFromResources(e.unfilteredDeployments, e.labelSuggestions), i.setLabelSuggestions(e.labelSuggestions), e.deployments = i.getLabelSelector().select(e.unfilteredDeployments), y(), s.log("deployments (subscribe)", e.unfilteredDeployments);
+})), e.showDeploymentConfigTable = function() {
+var t = _.size(e.replicationControllersByDC);
+return t > 1 || 1 === t && !e.replicationControllersByDC[""];
 }, i.onActiveFiltersChanged(function(t) {
-e.$apply(function() {
-e.deploymentConfigs = t.select(e.unfilteredDeploymentConfigs), e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), e.deployments = t.select(e.unfilteredDeployments), e.replicaSets = t.select(e.unfilteredReplicaSets), c();
+e.$evalAsync(function() {
+e.deploymentConfigs = t.select(e.unfilteredDeploymentConfigs), e.replicationControllersByDC = o.associateDeploymentsToDeploymentConfig(e.replicationControllers, e.deploymentConfigs, !0), e.replicationControllersByDC[""] && (e.unfilteredReplicationControllers = e.replicationControllersByDC[""], e.replicationControllersByDC[""] = i.getLabelSelector().select(e.replicationControllersByDC[""])), e.deployments = t.select(e.unfilteredDeployments), e.replicaSets = t.select(e.unfilteredReplicaSets), u();
 });
 }), e.$on("$destroy", function() {
-r.unwatchAll(y);
+r.unwatchAll(b);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("DeploymentController", [ "$scope", "$filter", "$routeParams", "APIService", "DataService", "DeploymentsService", "HPAService", "ImageStreamResolver", "LabelFilter", "Logger", "ModalsService", "Navigate", "OwnerReferencesService", "ProjectsService", "StorageService", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p, f) {
@@ -6109,14 +6107,13 @@ o.unwatchAll(j);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("StatefulSetsController", [ "$scope", "$routeParams", "DataService", "ProjectsService", "LabelFilter", "PodsService", function(e, t, n, a, r, o) {
-e.projectName = t.project, e.alerts = e.alerts || {}, e.labelSuggestions = {};
+e.projectName = t.project, e.labelSuggestions = {}, e.clearFilter = function() {
+r.clear();
+};
 var i = [];
 a.get(t.project).then(_.spread(function(t, a) {
 function s() {
-r.getLabelSelector().isEmpty() || !$.isEmptyObject(e.statefulSets) || $.isEmptyObject(e.unfilteredStatefulSets) ? delete e.alerts.statefulsets : e.alerts.statefulsets = {
-type: "warning",
-details: "The active filters are hiding all stateful sets."
-};
+e.filterWithZeroResults = !r.getLabelSelector().isEmpty() && _.isEmpty(e.statefulSets) && !_.isEmpty(e.unfilteredStatefulSets);
 }
 e.project = t, i.push(n.watch({
 resource: "statefulsets",
@@ -6130,7 +6127,7 @@ unfilteredStatefulSets: t.by("metadata.name")
 })), i.push(n.watch("pods", a, function(t) {
 e.pods = t.by("metadata.name"), e.podsByOwnerUID = o.groupByOwnerUID(e.pods);
 })), r.onActiveFiltersChanged(function(t) {
-e.$apply(function() {
+e.$evalAsync(function() {
 e.statefulSets = t.select(e.unfilteredStatefulSets), s();
 });
 }), e.$on("$destroy", function() {
@@ -6191,19 +6188,18 @@ details: e("getErrorDetails")(n)
 r.unwatchAll(l);
 });
 } ]), angular.module("openshiftConsole").controller("ServicesController", [ "$routeParams", "$scope", "DataService", "ProjectsService", "$filter", "LabelFilter", "Logger", function(e, t, n, a, r, o, i) {
-t.projectName = e.project, t.services = {}, t.unfilteredServices = {}, t.routesByService = {}, t.routes = {}, t.labelSuggestions = {}, t.alerts = t.alerts || {}, t.emptyMessage = "Loading...", t.emptyMessageRoutes = "Loading...";
+t.projectName = e.project, t.services = {}, t.unfilteredServices = {}, t.routesByService = {}, t.routes = {}, t.labelSuggestions = {}, t.clearFilter = function() {
+o.clear();
+};
 var s = [];
 a.get(e.project).then(_.spread(function(e, a) {
 function r() {
-o.getLabelSelector().isEmpty() || !$.isEmptyObject(t.services) || $.isEmptyObject(t.unfilteredServices) ? delete t.alerts.services : t.alerts.services = {
-type: "warning",
-details: "The active filters are hiding all services."
-};
+t.filterWithZeroResults = !o.getLabelSelector().isEmpty() && _.isEmpty(t.services) && !_.isEmpty(t.unfilteredServices);
 }
 t.project = e, s.push(n.watch("services", a, function(e) {
-t.unfilteredServices = e.by("metadata.name"), o.addLabelSuggestionsFromResources(t.unfilteredServices, t.labelSuggestions), o.setLabelSuggestions(t.labelSuggestions), t.services = o.getLabelSelector().select(t.unfilteredServices), t.emptyMessage = "No services to show", r(), i.log("services (subscribe)", t.unfilteredServices);
+t.servicesLoaded = !0, t.unfilteredServices = e.by("metadata.name"), o.addLabelSuggestionsFromResources(t.unfilteredServices, t.labelSuggestions), o.setLabelSuggestions(t.labelSuggestions), t.services = o.getLabelSelector().select(t.unfilteredServices), r(), i.log("services (subscribe)", t.unfilteredServices);
 })), o.onActiveFiltersChanged(function(e) {
-t.$apply(function() {
+t.$evalAsync(function() {
 t.services = e.select(t.unfilteredServices), r();
 });
 }), t.$on("$destroy", function() {
@@ -6269,7 +6265,9 @@ n.unwatchAll(i);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("ServiceInstancesController", [ "$scope", "$filter", "$routeParams", "APIService", "BindingService", "Constants", "DataService", "LabelFilter", "Logger", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l) {
-e.alerts = {}, e.bindingsByInstanceRef = {}, e.emptyMessage = "Loading...", e.labelSuggestions = {}, e.projectName = n.project, e.serviceClasses = {}, e.serviceInstances = {}, e.unfilteredServiceInstances = {};
+e.bindingsByInstanceRef = {}, e.labelSuggestions = {}, e.projectName = n.project, e.serviceClasses = {}, e.serviceInstances = {}, e.unfilteredServiceInstances = {}, e.clearFilter = function() {
+s.clear();
+};
 var u = [], d = function() {
 e.serviceInstances = s.getLabelSelector().select(e.unfilteredServiceInstances);
 }, m = function() {
@@ -6280,10 +6278,7 @@ var n = _.get(t, "spec.serviceClassRef.name");
 return _.get(e, [ "serviceClasses", n ]);
 }, l.get(n.project).then(_.spread(function(t, n) {
 function r() {
-s.getLabelSelector().isEmpty() || !_.isEmpty(e.serviceInstances) || _.isEmpty(e.unfilteredServiceInstances) ? delete e.alerts["all-instances-filtered"] : e.alerts["all-instances-filtered"] = {
-type: "warning",
-details: "The active filters are hiding all provisioned services."
-};
+e.filterWithZeroResults = !s.getLabelSelector().isEmpty() && _.isEmpty(e.serviceInstances) && !_.isEmpty(e.unfilteredServiceInstances);
 }
 e.project = t, e.projectContext = n;
 var o = a.getPreferredVersion("servicebindings");
@@ -6293,7 +6288,7 @@ e.bindingsByInstanceRef = _.groupBy(n, "spec.instanceRef.name");
 }));
 var l = a.getPreferredVersion("serviceinstances");
 u.push(i.watch(l, n, function(t) {
-e.emptyMessage = "No provisioned services to show", e.unfilteredServiceInstances = t.by("metadata.name"), m(), d(), r(), s.addLabelSuggestionsFromResources(e.unfilteredServiceInstances, e.labelSuggestions), s.setLabelSuggestions(e.labelSuggestions), c.log("provisioned services (subscribe)", e.unfilteredServiceInstances);
+e.serviceInstancesLoaded = !0, e.unfilteredServiceInstances = t.by("metadata.name"), m(), d(), r(), s.addLabelSuggestionsFromResources(e.unfilteredServiceInstances, e.labelSuggestions), s.setLabelSuggestions(e.labelSuggestions), c.log("provisioned services (subscribe)", e.unfilteredServiceInstances);
 }));
 var p = a.getPreferredVersion("clusterserviceclasses");
 i.list(p, {}, function(t) {
@@ -6349,7 +6344,7 @@ r.unwatchAll(s);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("SecretsController", [ "$routeParams", "$scope", "DataService", "ProjectsService", function(e, t, n, a) {
-t.projectName = e.project, t.secretsByType = {}, t.alerts = t.alerts || {}, a.get(e.project).then(_.spread(function(e, a) {
+t.projectName = e.project, t.secretsByType = {}, a.get(e.project).then(_.spread(function(e, a) {
 t.project = e, t.context = a, n.list("secrets", a).then(function(e) {
 t.secrets = _.sortBy(e.by("metadata.name"), [ "type", "metadata.name" ]), t.loaded = !0;
 });
@@ -6387,12 +6382,11 @@ n.then ? t.url(n.then) : r.history.back();
 } : c.toErrorPage("You do not have authority to create secrets in project " + n.project + ".", "access_denied");
 }));
 } ]), angular.module("openshiftConsole").controller("ConfigMapsController", [ "$scope", "$routeParams", "APIService", "DataService", "LabelFilter", "ProjectsService", function(e, t, n, a, r, o) {
-e.projectName = t.project, e.alerts = e.alerts || {}, e.loaded = !1, e.labelSuggestions = {}, e.configMapsVersion = n.getPreferredVersion("configmaps");
-var i, s = [], c = function() {
-r.getLabelSelector().isEmpty() || !_.isEmpty(e.configMaps) || _.isEmpty(i) ? delete e.alerts["config-maps"] : e.alerts["config-maps"] = {
-type: "warning",
-details: "The active filters are hiding all config maps."
+e.projectName = t.project, e.loaded = !1, e.labelSuggestions = {}, e.configMapsVersion = n.getPreferredVersion("configmaps"), e.clearFilter = function() {
+r.clear();
 };
+var i, s = [], c = function() {
+e.filterWithZeroResults = !r.getLabelSelector().isEmpty() && _.isEmpty(e.configMaps) && !_.isEmpty(i);
 }, l = function() {
 r.addLabelSuggestionsFromResources(i, e.labelSuggestions), r.setLabelSuggestions(e.labelSuggestions);
 }, u = function() {
@@ -6403,7 +6397,7 @@ o.get(t.project).then(_.spread(function(t, n) {
 e.project = t, s.push(a.watch(e.configMapsVersion, n, function(t) {
 i = t.by("metadata.name"), l(), u(), e.loaded = !0;
 })), r.onActiveFiltersChanged(function() {
-e.$apply(u);
+e.$evalAsync(u);
 }), e.$on("$destroy", function() {
 a.unwatchAll(s);
 });
@@ -6478,21 +6472,20 @@ details: e("getErrorDetails")(t)
 }) : s.toErrorPage("You do not have authority to create config maps in project " + t.project + ".", "access_denied");
 }));
 } ]), angular.module("openshiftConsole").controller("RoutesController", [ "$routeParams", "$scope", "DataService", "$filter", "LabelFilter", "ProjectsService", function(e, t, n, a, r, o) {
-t.projectName = e.project, t.unfilteredRoutes = {}, t.routes = {}, t.labelSuggestions = {}, t.alerts = t.alerts || {}, t.emptyMessage = "Loading...";
+t.projectName = e.project, t.unfilteredRoutes = {}, t.routes = {}, t.labelSuggestions = {}, t.clearFilter = function() {
+r.clear();
+};
 var i = [];
 o.get(e.project).then(_.spread(function(e, a) {
 function o() {
-r.getLabelSelector().isEmpty() || !$.isEmptyObject(t.routes) || $.isEmptyObject(t.unfilteredRoutes) ? delete t.alerts.routes : t.alerts.routes = {
-type: "warning",
-details: "The active filters are hiding all routes."
-};
+t.filterWithZeroResults = !r.getLabelSelector().isEmpty() && _.isEmpty(t.routes) && !_.isEmpty(t.unfilteredRoutes);
 }
 t.project = e, i.push(n.watch("routes", a, function(e) {
-t.unfilteredRoutes = e.by("metadata.name"), r.addLabelSuggestionsFromResources(t.unfilteredRoutes, t.labelSuggestions), r.setLabelSuggestions(t.labelSuggestions), t.routes = r.getLabelSelector().select(t.unfilteredRoutes), t.emptyMessage = "No routes to show", o();
+t.routesLoaded = !0, t.unfilteredRoutes = e.by("metadata.name"), r.addLabelSuggestionsFromResources(t.unfilteredRoutes, t.labelSuggestions), r.setLabelSuggestions(t.labelSuggestions), t.routes = r.getLabelSelector().select(t.unfilteredRoutes), o();
 })), i.push(n.watch("services", a, function(e) {
 t.services = e.by("metadata.name");
 })), r.onActiveFiltersChanged(function(e) {
-t.$apply(function() {
+t.$evalAsync(function() {
 t.routes = e.select(t.unfilteredRoutes), o();
 });
 }), t.$on("$destroy", function() {
@@ -6538,7 +6531,7 @@ r.unwatchAll(c);
 });
 }));
 } ]), angular.module("openshiftConsole").controller("StorageController", [ "$routeParams", "$scope", "AlertMessageService", "DataService", "ProjectsService", "QuotaService", "$filter", "LabelFilter", "Logger", function(e, t, n, a, r, o, i, s, c) {
-t.projectName = e.project, t.pvcs = {}, t.unfilteredPVCs = {}, t.labelSuggestions = {}, t.alerts = t.alerts || {}, t.outOfClaims = !1, t.emptyMessage = "Loading...";
+t.projectName = e.project, t.pvcs = {}, t.unfilteredPVCs = {}, t.labelSuggestions = {}, t.alerts = t.alerts || {}, t.outOfClaims = !1;
 var l = function() {
 var e = n.isAlertPermanentlyHidden("storage-quota-limit-reached", t.projectName);
 if (t.outOfClaims = o.isAnyStorageQuotaExceeded(t.quotas, t.clusterQuotas), !e && t.outOfClaims) {
@@ -6561,13 +6554,13 @@ return n.permanentlyHideAlert("storage-quota-limit-reached", t.projectName), !0;
 }, u = [];
 r.get(e.project).then(_.spread(function(e, n) {
 function r() {
-s.getLabelSelector().isEmpty() || !$.isEmptyObject(t.pvcs) || $.isEmptyObject(t.unfilteredPVCs) ? delete t.alerts.storage : t.alerts.storage = {
+s.getLabelSelector().isEmpty() || !$.isEmptyObject(t.pvcs) || $.isEmptyObject(t.unfilteredPVCs) ? (delete t.alerts.storage, t.filterWithZeroResults = !1) : (t.alerts.storage = {
 type: "warning",
 details: "The active filters are hiding all persistent volume claims."
-};
+}, t.filterWithZeroResults = !0);
 }
 t.project = e, u.push(a.watch("persistentvolumeclaims", n, function(e) {
-t.unfilteredPVCs = e.by("metadata.name"), s.addLabelSuggestionsFromResources(t.unfilteredPVCs, t.labelSuggestions), s.setLabelSuggestions(t.labelSuggestions), t.pvcs = s.getLabelSelector().select(t.unfilteredPVCs), t.emptyMessage = "No persistent volume claims to show", r(), c.log("pvcs (subscribe)", t.unfilteredPVCs);
+t.pvcsLoaded = !0, t.unfilteredPVCs = e.by("metadata.name"), s.addLabelSuggestionsFromResources(t.unfilteredPVCs, t.labelSuggestions), s.setLabelSuggestions(t.labelSuggestions), t.pvcs = s.getLabelSelector().select(t.unfilteredPVCs), r(), c.log("pvcs (subscribe)", t.unfilteredPVCs);
 })), s.onActiveFiltersChanged(function(e) {
 t.$apply(function() {
 t.pvcs = e.select(t.unfilteredPVCs), r();
@@ -6586,10 +6579,7 @@ t.clusterQuotas = e.by("metadata.name"), l();
 }));
 } ]), angular.module("openshiftConsole").controller("OtherResourcesController", [ "$routeParams", "$location", "$scope", "AuthorizationService", "DataService", "ProjectsService", "$filter", "LabelFilter", "Logger", "APIService", function(e, t, n, a, r, o, i, s, c, l) {
 function u() {
-s.getLabelSelector().isEmpty() || !$.isEmptyObject(n.resources) || $.isEmptyObject(n.unfilteredResources) ? delete n.alerts.resources : n.alerts.resources = {
-type: "warning",
-details: "The active filters are hiding all " + l.kindToResource(n.kindSelector.selected.kind, !0) + "."
-};
+n.filterWithZeroResults = !s.getLabelSelector().isEmpty() && _.isEmpty(n.resources) && !_.isEmpty(n.unfilteredResources);
 }
 function d() {
 var e = n.kindSelector.selected;
@@ -6602,11 +6592,11 @@ group: e.group || ""
 group: e.group,
 resource: l.kindToResource(e.kind)
 }, n.context).then(function(t) {
-n.unfilteredResources = t.by("metadata.name"), n.labelSuggestions = {}, s.addLabelSuggestionsFromResources(n.unfilteredResources, n.labelSuggestions), s.setLabelSuggestions(n.labelSuggestions), n.resources = s.getLabelSelector().select(n.unfilteredResources), n.emptyMessage = "No " + l.kindToResource(e.kind, !0) + " to show", u();
+n.unfilteredResources = t.by("metadata.name"), n.labelSuggestions = {}, s.addLabelSuggestionsFromResources(n.unfilteredResources, n.labelSuggestions), s.setLabelSuggestions(n.labelSuggestions), n.resources = s.getLabelSelector().select(n.unfilteredResources), n.resourceName = l.kindToResource(e.kind, !0), u();
 });
 }
 }
-n.projectName = e.project, n.labelSuggestions = {}, n.alerts = n.alerts || {}, n.emptyMessage = "Select a resource from the list above ...", n.kindSelector = {
+n.projectName = e.project, n.labelSuggestions = {}, n.kindSelector = {
 disabled: !0
 }, n.kinds = _.filter(l.availableKinds(), function(e) {
 switch (e.kind) {
@@ -6638,7 +6628,9 @@ return !1;
 default:
 return !0;
 }
-});
+}), n.clearFilter = function() {
+s.clear();
+};
 var m = function(e) {
 if (e) {
 var t = l.kindToResourceGroupVersion(e), n = l.apiInfo(t);
@@ -6671,13 +6663,13 @@ group: e.group || ""
 return !!m(e) && (!!a.checkResource(t.resource) && a.canI(t, "list", n.projectName));
 }), n.project = t, n.context = r, n.kindSelector.disabled = !1, e.kind && f(e.kind, e.group) && (_.set(n, "kindSelector.selected.kind", e.kind), _.set(n, "kindSelector.selected.group", e.group || ""));
 })), n.loadKind = d, n.$watch("kindSelector.selected", function() {
-n.alerts = {}, d();
+s.clear(), d();
 });
 var g = i("humanizeKind");
 n.matchKind = function(e, t) {
 return -1 !== g(e).toLowerCase().indexOf(t.toLowerCase());
 }, s.onActiveFiltersChanged(function(e) {
-n.$apply(function() {
+n.$evalAsync(function() {
 n.resources = e.select(n.unfilteredResources), u();
 });
 });
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 546b8227ce..8213f57bc2 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -2192,7 +2192,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-header header-toolbar\">\n" +
     "<div class=\"container-fluid\">\n" +
     "<div class=\"page-header page-header-bleed-right page-header-bleed-left\">\n" +
-    "<div class=\"pull-right\" ng-if=\"project && (configMapsVersion | canI : 'create')\">\n" +
+    "<div class=\"pull-right\" ng-if=\"project && (configMapsVersion | canI : 'create') && ((configMaps | hashSize) > 0 || filterWithZeroResults)\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/create-config-map\" class=\"btn btn-default\">Create Config Map</a>\n" +
     "</div>\n" +
     "<h1>\n" +
@@ -2204,7 +2204,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(configMaps | hashSize) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -2213,12 +2213,26 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<div ng-if=\"!loaded\">Loading...</div>\n" +
-    "<div ng-if=\"loaded\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(configMaps | hashSize) == 0\">\n" +
+    "<p ng-if=\"!loaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"loaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No config maps.</h2>\n" +
+    "<p>No config maps have been added to project {{projectName}}.</p>\n" +
+    "<p ng-if=\"project && (configMapsVersion | canI : 'create')\">\n" +
+    "<a ng-href=\"project/{{project.metadata.name}}/create-config-map\" class=\"btn btn-primary btn-lg\">Create Config Map</a>\n" +
+    "</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all config maps. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(configMaps | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-5\">\n" +
     "</colgroup>\n" +
@@ -2229,10 +2243,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Labels</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(configMaps | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"3\"><em>No config maps to show</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(configMaps | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"configMap in configMaps\">\n" +
     "<td data-title=\"Name\">\n" +
     "<a href=\"{{configMap | navigateResourceURL}}\">{{configMap.metadata.name}}</a>\n" +
@@ -2251,7 +2262,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "</div>\n" +
     "</div>"
   );
 
@@ -3443,7 +3453,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-header header-toolbar\">\n" +
     "<div class=\"container-fluid\">\n" +
     "<div class=\"page-header page-header-bleed-right page-header-bleed-left\">\n" +
-    "<div class=\"pull-right\" ng-if=\"project && ('routes' | canI : 'create')\">\n" +
+    "<div class=\"pull-right\" ng-if=\"project && ('routes' | canI : 'create') && ((routes | hashSize) > 0 || filterWithZeroResults)\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/create-route\" class=\"btn btn-default\">Create Route</a>\n" +
     "</div>\n" +
     "<h1>\n" +
@@ -3455,7 +3465,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(routes | hashSize) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -3464,10 +3474,26 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(routes | hashSize) == 0\">\n" +
+    "<p ng-if=\"!routesLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"routesLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No routes.</h2>\n" +
+    "<p>No routes have been added to project {{projectName}}.</p>\n" +
+    "<p ng-if=\"project && ('routes' | canI : 'create') && !filterWithZeroResults\">\n" +
+    "<a ng-href=\"project/{{project.metadata.name}}/create-route\" class=\"btn btn-primary btn-lg\">Create Route</a>\n" +
+    "</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all routes. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(routes | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "<col class=\"col-sm-3\">\n" +
@@ -3485,10 +3511,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>TLS Termination</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(routes | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"5\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(routes | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"route in routes | orderObjectsByDate : true\">\n" +
     "<td data-title=\"{{ customNameHeader || 'Name' }}\">\n" +
     "<a href=\"{{route | navigateResourceURL}}\">{{route.metadata.name}}</a>\n" +
@@ -3959,7 +3982,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"((statefulSets | hashSize) > 0) || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -3968,11 +3991,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\" persist-tab-state>\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
-    "<div ng-if=\"!loaded\">Loading...</div>\n" +
     "<div class=\"row\" ng-if=\"loaded\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(statefulSets | hashSize) == 0\">\n" +
+    "<p ng-if=\"!loaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"loaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No stateful sets.</h2>\n" +
+    "<p>No stateful sets have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all stateful sets. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(statefulSets | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-5\">\n" +
     "</colgroup>\n" +
@@ -3983,11 +4018,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Created</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(statefulSets | hashSize) == 0\">\n" +
-    "<tr>\n" +
-    "<td colspan=\"3\"><em>No stateful sets to show</em></td>\n" +
-    "</tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"(statefulSetName, statefulSet) in statefulSets\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\">\n" +
@@ -4025,7 +4055,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(((latestByConfig | hashSize) || (buildsNoConfig | hashSize)) || filterWithZeroResults)\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -4034,10 +4064,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"!(latestByConfig | hashSize) && !(buildsNoConfig | hashSize)\">\n" +
+    "<p ng-if=\"!buildsLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"buildsLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No builds.</h2>\n" +
+    "<p>No builds have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all builds. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-mobile table-layout-fixed\" ng-if=\"(latestByConfig | hashSize) || (buildsNoConfig | hashSize)\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-2\">\n" +
     "<col class=\"col-sm-1\">\n" +
@@ -4058,10 +4101,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th ng-class=\"{'hidden-sm' : (latestByConfig | hashSize)}\">Source</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"!(latestByConfig | hashSize) && !(buildsNoConfig | hashSize)\">\n" +
-    "<tr><td colspan=\"7\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(latestByConfig | hashSize) || (buildsNoConfig | hashSize)\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"(buildConfigName, latestBuild) in latestByConfig\" ng-if=\"buildConfigName !== ''\">\n" +
     "\n" +
     "<td ng-if-start=\"!latestBuild\" data-title=\"Name\">\n" +
@@ -5033,7 +5073,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"!showEmptyState || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -5042,11 +5082,25 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<h3 ng-if=\"(deployments | size) || (replicaSets | size)\">Deployment Configurations</h3>\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<p ng-if=\"!deploymentConfigsLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"(showEmptyState || filterWithZeroResults) && deploymentConfigsLoaded\">\n" +
+    "<div class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"showEmptyState\">\n" +
+    "<h2>No deployments.</h2>\n" +
+    "<p>No deployments have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all deployments. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h3 ng-if=\"showDeploymentConfigTable() && ((deployments | size) || (replicaSets | size) || (replicationControllersByDC[''] | size))\">Deployment Configurations</h3>\n" +
+    "<table ng-if=\"showDeploymentConfigTable() && !showEmptyState\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "<col class=\"col-sm-2\">\n" +
@@ -5063,12 +5117,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Trigger</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "\n" +
-    "<tbody ng-if=\"showEmptyMessage()\">\n" +
-    "\n" +
-    "<tr><td colspan=\"5\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"!showEmptyMessage()\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat-start=\"(dcName, replicationControllersForDC) in replicationControllersByDC\" ng-if=\"dcName && (deploymentConfigs[dcName] || !unfilteredDeploymentConfigs[dcName])\" style=\"display: none\"></tr>\n" +
     "\n" +
     "<tr ng-if=\"(replicationControllersForDC | hashSize) == 0 && dcName\">\n" +
@@ -5130,7 +5179,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<tr ng-repeat-end style=\"display: none\"></tr>\n" +
     "</tbody>\n" +
     "</table>\n" +
-    "<div ng-if=\"deployments | size\">\n" +
+    "<div ng-if=\"(deployments | size)\">\n" +
     "<h3>Deployments</h3>\n" +
     "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
@@ -5175,7 +5224,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "</table>\n" +
     "</div>\n" +
-    "<div ng-if=\"replicaSets | hashSize\" id=\"replica-sets\">\n" +
+    "<div ng-if=\"(replicaSets | size)\" id=\"replica-sets\">\n" +
     "<h3>Replica Sets</h3>\n" +
     "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
@@ -5203,7 +5252,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tbody>\n" +
     "</table>\n" +
     "</div>\n" +
-    "<div ng-if=\"(unfilteredReplicationControllers | hashSize) > 0\" id=\"replica-controllers\">\n" +
+    "<div ng-if=\"(replicationControllersByDC[''] | size)\" id=\"replica-controllers\">\n" +
     "<h3>Other Replication Controllers</h3>\n" +
     "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
@@ -5216,9 +5265,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Created</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(replicationControllersByDC[''] | hashSize) === 0\"><tr><td colspan=\"3\"><em>No replication controllers to show</em></td></tr></tbody>\n" +
-    "<tbody ng-if=\"(replicationControllersByDC[''] | hashSize) > 0\">\n" +
-    "\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"deployment in replicationControllersByDC[''] | orderObjectsByDate : true\">\n" +
     "<td data-title=\"Name\">\n" +
     "<a ng-href=\"{{deployment | navigateResourceURL}}\">{{deployment.metadata.name}}</a>\n" +
@@ -5237,6 +5284,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
+    "</div>\n" +
     "</div>"
   );
 
@@ -10299,7 +10347,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(imageStreams | hashSize) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -10308,10 +10356,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(imageStreams | hashSize) == 0\">\n" +
+    "<p ng-if=\"!imageStreamsLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"imageStreamsLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No image streams.</h2>\n" +
+    "<p>No image streams have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all image streams. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(imageStreams | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "<col class=\"col-sm-5\">\n" +
@@ -10326,10 +10387,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Updated</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(imageStreams | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"4\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(imageStreams | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"imageStream in imageStreams | orderObjectsByDate : true\">\n" +
     "<td data-title=\"Name\"><a href=\"{{imageStream | navigateResourceURL}}\">{{imageStream.metadata.name}}</a></td>\n" +
     "<td data-title=\"Docker Repo\">\n" +
@@ -11358,10 +11416,25 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\" ng-class=\"{ 'table-empty': (resources | hashSize) === 0 }\">\n" +
+    "<div ng-if=\"(resources | hashSize) == 0\">\n" +
+    "<p ng-if=\"!kindSelector.selected\">\n" +
+    "<em>Select a resource from the list above...</em>\n" +
+    "</p>\n" +
+    "<div ng-if=\"kindSelector.selected\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No {{resourceName}}.</h2>\n" +
+    "<p>\n" +
+    "No {{resourceName}} have been added to project {{projectName}}.\n" +
+    "</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all {{resourceName}}. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(resources | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "<col class=\"col-sm-2\">\n" +
@@ -11376,10 +11449,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th><span class=\"sr-only\">Actions</span></th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(resources | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"4\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(resources | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"resource in resources | orderObjectsByDate : true\">\n" +
     "<td data-title=\"Name\">{{resource.metadata.name}}</td>\n" +
     "<td data-title=\"Created\"><span am-time-ago=\"resource.metadata.creationTimestamp\"></span></td>\n" +
@@ -11397,7 +11467,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<a ng-href=\"{{resource | editYamlURL : getReturnURL()}}\" role=\"button\">Edit YAML</a>\n" +
     "</li>\n" +
     "<li ng-if=\"selectedResource | canI : 'delete'\">\n" +
-    "<delete-link kind=\"{{kindSelector.selected.kind}}\" group=\"{{kindSelector.selected.group}}\" resource-name=\"{{resource.metadata.name}}\" project-name=\"{{resource.metadata.namespace}}\" alerts=\"alerts\" stay-on-current-page=\"true\" success=\"loadKind\">\n" +
+    "<delete-link kind=\"{{kindSelector.selected.kind}}\" group=\"{{kindSelector.selected.group}}\" resource-name=\"{{resource.metadata.name}}\" project-name=\"{{resource.metadata.namespace}}\" stay-on-current-page=\"true\" success=\"loadKind\">\n" +
     "</delete-link>\n" +
     "</li>\n" +
     "</ul>\n" +
@@ -11446,7 +11516,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "Loading...\n" +
     "</div>\n" +
     "<div ng-if=\"!overview.showGetStarted && !overview.showLoading\">\n" +
-    "<div class=\"middle-header header-toolbar\">\n" +
+    "<div class=\"middle-header\">\n" +
     "<div class=\"container-fluid toolbar-container\">\n" +
     "<div class=\"data-toolbar\" role=\"toolbar\" aria-label=\"Filter Toolbar\">\n" +
     "<div class=\"data-toolbar-filter\" role=\"group\">\n" +
@@ -12554,7 +12624,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<a ng-href=\"{{ 'pipeline-plugin' | helpLink}}\" target=\"_blank\">OpenShift Pipeline Plugin</a>.\n" +
     "</p>\n" +
     "<p ng-if=\"(project.metadata.name | canIAddToProject) && createSampleURL\">\n" +
-    "<a ng-href=\"{{createSampleURL}}\" class=\"btn btn-lg btn-primary\">\n" +
+    "<a ng-href=\"{{createSampleURL}}\" class=\"btn btn-primary btn-lg\">\n" +
     "Create Sample Pipeline\n" +
     "</a>\n" +
     "</p>\n" +
@@ -12648,7 +12718,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"((pods | hashSize) > 0) || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -12657,10 +12727,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<pods-table pods=\"pods\" empty-message=\"emptyMessage\"></pods-table>\n" +
+    "<div ng-if=\"(pods | hashSize) == 0\">\n" +
+    "<p ng-if=\"!podsLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"podsLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No pods.</h2>\n" +
+    "<p>No pods have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all pods. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<pods-table ng-if=\"(pods | hashSize) > 0\" pods=\"pods\"></pods-table>\n" +
     "</div>\n" +
     "</div>\n" +
     "</div>\n" +
@@ -13072,7 +13155,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-header\">\n" +
     "<div class=\"container-fluid\">\n" +
     "<div class=\"page-header page-header-bleed-right page-header-bleed-left\">\n" +
-    "<div class=\"pull-right\" ng-if=\"project && ('secrets' | canI : 'create')\">\n" +
+    "<div class=\"pull-right\" ng-if=\"project && ('secrets' | canI : 'create') && secrets.length\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/create-secret\" class=\"btn btn-default\">Create Secret</a>\n" +
     "</div>\n" +
     "<h1>\n" +
@@ -13088,11 +13171,24 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div ng-if=\"!loaded\" class=\"mar-top-xl\">Loading...</div>\n" +
     "<div ng-if=\"loaded\" class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile secrets-table table-layout-fixed\">\n" +
+    "<div ng-if=\"!secrets.length\">\n" +
+    "<p ng-if=\"!loaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"loaded\" class=\"empty-state-message text-center\">\n" +
+    "<h2>No secrets.</h2>\n" +
+    "<p>\n" +
+    "No secrets have been added to project {{projectName}}.\n" +
+    "</p>\n" +
+    "<p ng-if=\"project && ('secrets' | canI : 'create') && !secrets.length\">\n" +
+    "<a ng-href=\"project/{{project.metadata.name}}/create-secret\" class=\"btn btn-primary\">Create Secret</a>\n" +
+    "</p>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"secrets.length\" class=\"table table-bordered table-mobile secrets-table table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-5\">\n" +
     "<col class=\"col-sm-5\">\n" +
@@ -13104,12 +13200,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Created</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "\n" +
-    "<tbody ng-if=\"!secrets.length\">\n" +
-    "\n" +
-    "<tr><td colspan=\"3\"><em>No secrets</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"secrets.length\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"secret in secrets track by (secret | uid)\">\n" +
     "<td data-title=\"Name\">\n" +
     "<a ng-href=\"{{secret | navigateResourceURL}}\">{{secret.metadata.name}}</a>\n" +
@@ -13144,7 +13235,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "Provisioned Services\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(serviceInstances | size) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -13153,10 +13244,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(serviceInstances | hashSize) == 0\">\n" +
+    "<p ng-if=\"!serviceInstancesLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"serviceInstancesLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No provisioned services.</h2>\n" +
+    "<p>No provisioned services have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all provisioned services. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(serviceInstances | size) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "</colgroup>\n" +
@@ -13169,11 +13273,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Bindings</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(serviceInstances | size) === 0\">\n" +
-    "<tr>\n" +
-    "<td colspan=\"4\"><em>{{emptyMessage}}</em></td>\n" +
-    "</tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-if=\"(serviceInstances | size) > 0\">\n" +
     "<tr ng-repeat=\"serviceInstance in serviceInstances track by (serviceInstance | uid)\">\n" +
     "<td data-title=\"Name\">\n" +
@@ -13233,7 +13332,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(services | hashSize) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -13242,10 +13341,23 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<div class=\"middle-content\">\n" +
     "<div class=\"container-fluid\">\n" +
-    "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
+    "<div ng-if=\"(services | hashSize) == 0\">\n" +
+    "<p ng-if=\"!servicesLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"servicesLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<div ng-if=\"!filterWithZeroResults\">\n" +
+    "<h2>No services.</h2>\n" +
+    "<p>No services have been added to project {{projectName}}.</p>\n" +
+    "</div>\n" +
+    "<div ng-if=\"filterWithZeroResults\">\n" +
+    "<h2>The filter is hiding all services. <a href=\"\" ng-click=\"clearFilter()\">Clear Filter</a></h2>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "</div>\n" +
+    "<table ng-if=\"(services | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-3\">\n" +
     "</colgroup>\n" +
@@ -13259,10 +13371,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Age</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(services | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"6\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(services | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"service in services | orderObjectsByDate : true\">\n" +
     "<td data-title=\"Name\"><a href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a></td>\n" +
     "<td data-title=\"Cluster IP\">{{service.spec.clusterIP}}</td>\n" +
@@ -13347,6 +13456,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-header header-toolbar\">\n" +
     "<div class=\"container-fluid\">\n" +
     "<div class=\"page-header page-header-bleed-right page-header-bleed-left\">\n" +
+    "<div class=\"pull-right\" ng-if=\"project && ('persistentvolumeclaims' | canI : 'create') && ((pvcs | hashSize) > 0 || filterWithZeroResults)\">\n" +
+    "<a ng-if=\"!outOfClaims\" ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-default\">Create Storage</a>\n" +
+    "<a ng-if=\"outOfClaims\" href=\"\" class=\"btn btn-default disabled\" aria-disabled=\"true\">Create Storage</a>\n" +
+    "</div>\n" +
     "<h1>\n" +
     "Storage\n" +
     "<span class=\"page-header-link\">\n" +
@@ -13356,7 +13469,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</span>\n" +
     "</h1>\n" +
     "</div>\n" +
-    "<div ng-if=\"!renderOptions.showGetStarted\" class=\"data-toolbar\">\n" +
+    "<div ng-if=\"(pvcs | hashSize) > 0 || filterWithZeroResults\" class=\"data-toolbar\">\n" +
     "<div class=\"data-toolbar-filter\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -13368,18 +13481,22 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<alerts alerts=\"alerts\"></alerts>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12\">\n" +
-    "<div class=\"section-header page-header-bleed-right page-header-bleed-left\">\n" +
-    "<div class=\"hidden-xs pull-right\" ng-if=\"project && ('persistentvolumeclaims' | canI : 'create')\">\n" +
-    "<a ng-if=\"!outOfClaims\" ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-default\">Create Storage</a>\n" +
-    "<a ng-if=\"outOfClaims\" href=\"\" class=\"btn btn-default disabled\" aria-disabled=\"true\">Create Storage</a>\n" +
-    "</div>\n" +
-    "<h2>Persistent Volume Claims</h2>\n" +
-    "<div class=\"visible-xs-block mar-bottom-sm\" ng-if=\"project && ('persistentvolumeclaims' | canI : 'create')\">\n" +
-    "<a ng-if=\"!outOfClaims\" ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-default\">Create Storage</a>\n" +
-    "<a ng-if=\"outOfClaims\" href=\"\" class=\"btn btn-default disabled\" aria-disabled=\"true\">Create Storage</a>\n" +
+    "<div ng-if=\"(pvcs | hashSize) === 0\">\n" +
+    "<p ng-if=\"!pvcsLoaded\">\n" +
+    "Loading...\n" +
+    "</p>\n" +
+    "<div ng-if=\"pvcsLoaded\" class=\"empty-state-message text-center\">\n" +
+    "<h2>No persistent volume claims.</h2>\n" +
+    "<p ng-if=\"!filterWithZeroResults\">\n" +
+    "No persistent volume claims have been added to project {{projectName}}.\n" +
+    "</p>\n" +
+    "<p ng-if=\"project && ('persistentvolumeclaims' | canI : 'create') && !filterWithZeroResults\">\n" +
+    "<a ng-if=\"!outOfClaims\" ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-primary\">Create Storage</a>\n" +
+    "<a ng-if=\"outOfClaims\" href=\"\" class=\"btn btn-primary disabled\" aria-disabled=\"true\">Create Storage</a>\n" +
+    "</p>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-mobile table-layout-fixed\" ng-class=\"{ 'table-empty': (pvcs | hashSize) === 0 }\">\n" +
+    "<table ng-if=\"(pvcs | hashSize) > 0\" class=\"table table-bordered table-mobile table-layout-fixed\">\n" +
     "<colgroup>\n" +
     "<col class=\"col-sm-5\">\n" +
     "</colgroup>\n" +
@@ -13392,10 +13509,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Age</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(pvcs | hashSize) === 0\">\n" +
-    "<tr><td colspan=\"5\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
-    "<tbody ng-if=\"(pvcs | hashSize) > 0\">\n" +
+    "<tbody>\n" +
     "<tr ng-repeat=\"pvc in pvcs | orderObjectsByDate : true\">\n" +
     "<td data-title=\"Name\"><a ng-href=\"{{pvc | navigateResourceURL}}\">{{pvc.metadata.name}}</a>\n" +
     "<span ng-if=\"pvc | storageClass\" class=\"text-muted\"> using storage class {{pvc | storageClass}}</span>\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index a5c0099e5a..c4f6b7bab7 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -4832,6 +4832,7 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 .data-toolbar .data-toolbar-filter .label-filter .selectize-control.label-filter-key{display:inline}
 .data-toolbar .data-toolbar-filter .label-filter .selectize-control .selectize-input.full{width:auto}
 .data-toolbar .data-toolbar-filter .form-group{margin-bottom:0}
+.header-toolbar .data-toolbar{background-color:#fff;border-bottom:1px solid #e4e4e4;margin:0 -20px;padding-left:20px;padding-right:20px}
 .data-toolbar .vertical-divider+.data-toolbar-filter{margin-top:10px}
 .ellipsis-pulser{padding:10px;text-align:center}
 .ellipsis-pulser .dot{display:inline-block;height:4px;position:relative;width:4px}
@@ -4855,7 +4856,6 @@ pre.clipped.scroll{max-height:150px;overflow:auto;width:100%}
 70%{transform:scale(.66)}
 100%{opacity:.33;z-index:1}
 }
-.header-toolbar{background-color:#fff;border-bottom:1px solid #e4e4e4}
 .layout-pf.layout-pf-fixed{height:1px}
 .layout-pf.layout-pf-fixed body{height:1px;padding-top:41px}
 @media (min-width:768px){.data-toolbar .data-toolbar-filter{flex:1 1 0%}
@@ -5072,7 +5072,7 @@ h2+.list-view-pf{margin-top:20px}
 @media (min-width:992px){.overview .status-icons{margin-right:15px;width:40%}
 }
 .overview :not(.tab-pane)>overview-pipelines>.expanded-section{margin-bottom:30px}
-.overview .toolbar-container{padding-bottom:13px;padding-top:13px;background-color:#ededed;min-height:100%}
+.overview .toolbar-container{border-bottom:1px solid #e4e4e4;padding-bottom:13px;padding-top:13px;background-color:#ededed;min-height:100%}
 .overview .triggers{margin-bottom:20px}
 .overview .usage-value{font-size:18px;font-weight:300;line-height:1}
 .overview .usage-label{font-size:84%;color:#9c9c9c}