diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html
index 66b8370211..a7ba723977 100644
--- a/app/views/browse/build-config.html
+++ b/app/views/browse/build-config.html
@@ -149,44 +149,46 @@ <h2>No builds.</h2>
 
                       <build-trends-chart builds="builds"></build-trends-chart>
                     </div>
+                    <div class="empty-state-message text-center" ng-if="(builds | hashSize) == 0">
+                      <h2>{{emptyMessage}}</h2>
+                    </div>
                     <div ng-if="loaded && (unfilteredBuilds | hashSize) > 0">
-                      <div class="table-filter-wrapper">
-                        <project-filter></project-filter>
+                      <div ng-if="(builds | hashSize) !== 0">
+                        <div class="table-filter-wrapper">
+                          <project-filter></project-filter>
+                        </div>
+                        <table ng-if="!(buildConfig | isJenkinsPipelineStrategy)" class="table table-bordered table-hover table-mobile">
+                          <thead>
+                            <tr>
+                              <th>Build</th>
+                              <th>Status</th>
+                              <th>Created</th>
+                            </tr>
+                          </thead>
+                          <tbody ng-repeat="build in orderedBuilds">
+                            <tr>
+                              <td data-title="Build">
+                                <!-- Build number and link -->
+                                <span ng-if="build | annotation : 'buildNumber'">
+                                  <a ng-href="{{build | navigateResourceURL}}">#{{build | annotation : 'buildNumber'}}</a>
+                                </span>
+                                <span ng-if="!(build | annotation : 'buildNumber')">
+                                  <a ng-href="{{build | navigateResourceURL}}">{{build.metadata.name}}</a>
+                                </span>
+                                <span ng-if="build.status.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{build.status.message}}"></span>
+                              </td>
+                              <td data-title="Status">
+                                <div row class="status">
+                                  <build-status build="build"></build-status>
+                                </div>
+                              </td>
+                              <td data-title="Created">
+                                <relative-timestamp timestamp="build.metadata.creationTimestamp"></relative-timestamp>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
                       </div>
-                      <table ng-if="!(buildConfig | isJenkinsPipelineStrategy)" class="table table-bordered table-hover table-mobile">
-                        <thead>
-                          <tr>
-                            <th>Build</th>
-                            <th>Status</th>
-                            <th>Created</th>
-                          </tr>
-                        </thead>
-                        <tbody ng-if="(builds | hashSize) == 0">
-                          <tr><td colspan="3"><em>{{emptyMessage}}</em></td></tr>
-                        </tbody>
-                        <tbody ng-repeat="build in orderedBuilds">
-                          <tr>
-                            <td data-title="Build">
-                              <!-- Build number and link -->
-                              <span ng-if="build | annotation : 'buildNumber'">
-                                <a ng-href="{{build | navigateResourceURL}}">#{{build | annotation : 'buildNumber'}}</a>
-                              </span>
-                              <span ng-if="!(build | annotation : 'buildNumber')">
-                                <a ng-href="{{build | navigateResourceURL}}">{{build.metadata.name}}</a>
-                              </span>
-                              <span ng-if="build.status.message" class="pficon pficon-warning-triangle-o" style="cursor: help;" data-toggle="popover" data-trigger="hover" dynamic-content="{{build.status.message}}"></span>
-                            </td>
-                            <td data-title="Status">
-                              <div row class="status">
-                                <build-status build="build"></build-status>
-                              </div>
-                            </td>
-                            <td data-title="Created">
-                              <relative-timestamp timestamp="build.metadata.creationTimestamp"></relative-timestamp>
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
                       <div ng-if="buildConfig | isJenkinsPipelineStrategy">
                         <build-pipeline build="build" ng-repeat="build in orderedBuilds track by (build | uid)"></build-pipeline>
                         <table ng-if="(builds | hashSize) === 0" class="table table-bordered table-hover table-mobile">
diff --git a/app/views/browse/deployment-config.html b/app/views/browse/deployment-config.html
index 47c439dc7f..509c7b8797 100644
--- a/app/views/browse/deployment-config.html
+++ b/app/views/browse/deployment-config.html
@@ -202,10 +202,17 @@ <h3>Triggers</h3>
                       <annotations annotations="deploymentConfig.metadata.annotations"></annotations>
                     </div>
                     <div ng-if="loaded">
-                      <div class="table-filter-wrapper">
+                      <div class="empty-state-message text-center" ng-if="(deployments | hashSize) == 0">
+                        <h2>{{emptyMessage}}</h2>
+                      </div>
+                      <div
+                        class="table-filter-wrapper"
+                        ng-if="(deployments | hashSize) !== 0">
                         <project-filter></project-filter>
                       </div>
-                      <table class="table table-bordered table-hover table-mobile">
+                      <table
+                        class="table table-bordered table-hover table-mobile"
+                        ng-if="(deployments | hashSize) !== 0">
                         <thead>
                           <tr>
                             <th>Deployment</th>
@@ -214,9 +221,6 @@ <h3>Triggers</h3>
                             <th>Trigger</th>
                           </tr>
                         </thead>
-                        <tbody ng-if="(deployments | hashSize) == 0">
-                          <tr><td colspan="4"><em>{{emptyMessage}}</em></td></tr>
-                        </tbody>
                         <tbody ng-repeat="deployment in deployments | orderObjectsByDate : true">
                           <tr>
                             <td data-title="Deployment">
diff --git a/app/views/browse/imagestream.html b/app/views/browse/imagestream.html
index 722055c56b..c919cdf8cb 100644
--- a/app/views/browse/imagestream.html
+++ b/app/views/browse/imagestream.html
@@ -57,7 +57,12 @@ <h1>
                 </dl>
                 <annotations annotations="imageStream.metadata.annotations"></annotations>
               </div>
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="(tagsByName | hashSize) == 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="(tagsByName | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Tag</th>
@@ -67,9 +72,6 @@ <h1>
                     <th>Pull Spec</th>
                   </tr>
                 </thead>
-                <tbody ng-if="(tagsByName | hashSize) == 0">
-                  <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
-                </tbody>
                 <tbody ng-repeat-start="tag in tagsByName | orderBy : 'name'">
                   <tr>
                     <td data-title="Tag"><a href="{{imageStream | navigateResourceURL}}/{{tag.name}}">{{tag.name}}</a></td>
@@ -127,7 +129,7 @@ <h1>
                         <div class="pull-spec truncate hidden-xs"
                          ng-attr-title="{{tag.status.items[0].dockerImageReference}}">
                           {{tag.status.items[0].dockerImageReference}}
-                        </div>                      
+                        </div>
                       </div>
                     </td>
                   </tr>
@@ -150,8 +152,8 @@ <h1>
                         <div class="pull-spec truncate hidden-xs"
                          ng-attr-title="{{item.dockerImageReference}}">
                           {{item.dockerImageReference}}
-                        </div>                      
-                      </div>                      
+                        </div>
+                      </div>
                     </td>
                   </tr>
                 </tbody>
diff --git a/app/views/browse/routes.html b/app/views/browse/routes.html
index 4e97094dc2..e321443ff9 100644
--- a/app/views/browse/routes.html
+++ b/app/views/browse/routes.html
@@ -24,7 +24,12 @@ <h1>Routes</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="(routes | hashSize) == 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="(routes | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -34,9 +39,6 @@ <h1>Routes</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-repeat="route in routes | orderObjectsByDate : true">
                   <tr>
                     <td data-title="Name">
diff --git a/app/views/builds.html b/app/views/builds.html
index 8716385313..64d9e6c3f0 100644
--- a/app/views/builds.html
+++ b/app/views/builds.html
@@ -21,7 +21,12 @@ <h1>Builds</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="!(latestByConfig | hashSize)">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="(latestByConfig | hashSize)">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -32,9 +37,6 @@ <h1>Builds</h1>
                     <th>Source</th>
                   </tr>
                 </thead>
-                <tbody ng-if="!(latestByConfig | hashSize)">
-                  <tr><td colspan="6"><em>{{emptyMessage}}</em></td></tr>
-                </tbody>
                 <tbody ng-repeat="(buildConfigName, latestBuild) in latestByConfig">
                   <!-- Build config with no builds-->
                   <tr ng-if="!latestBuild">
diff --git a/app/views/deployments.html b/app/views/deployments.html
index 2889227a75..6e036e98c3 100644
--- a/app/views/deployments.html
+++ b/app/views/deployments.html
@@ -21,7 +21,12 @@ <h1>Deployments</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="showEmptyMessage()">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="!showEmptyMessage()">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -31,11 +36,6 @@ <h1>Deployments</h1>
                     <th>Trigger</th>
                   </tr>
                 </thead>
-                <!-- message doesnt 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 if the only 'deployments' are just replication controllers -->
-                  <tr><td colspan="5"><em>{{emptyMessage}}</em></td></tr>
-                </tbody>
                 <tbody ng-repeat="(deploymentConfigName, deploymentConfigDeployments) in deploymentsByDeploymentConfig" ng-if="deploymentConfigName && (deploymentConfigs[deploymentConfigName] || !unfilteredDeploymentConfigs[deploymentConfigName])">
                   <!-- Deployment config with no deployments-->
                   <tr ng-if="(deploymentConfigDeployments | hashSize) == 0 && deploymentConfigName">
diff --git a/app/views/directives/events.html b/app/views/directives/events.html
index 3a8bd4d8b0..731703b045 100644
--- a/app/views/directives/events.html
+++ b/app/views/directives/events.html
@@ -17,7 +17,13 @@
       <div pf-sort config="sortConfig" class="sort-controls"></div>
     </div>
   </div>
-  <table class="table table-bordered table-condensed table-mobile table-hover events-table" ng-class="{ 'table-empty': (filteredEvents | hashSize) === 0 }">
+  <div class="empty-state-message text-center" ng-if="(filteredEvents | hashSize) === 0">
+    <h2>{{emptyMessage}}</h2>
+  </div>
+  <table
+    class="table table-bordered table-condensed table-mobile table-hover events-table"
+    ng-class="{ 'table-empty': (filteredEvents | hashSize) === 0 }"
+    ng-if="(filteredEvents | hashSize) !== 0">
     <thead>
       <tr>
         <th id="time">Time</th>
@@ -34,24 +40,6 @@
         <th id="message"><span class="hidden-xs-inline visible-sm-inline visible-md-inline hidden-lg-inline">Reason and </span>Message</th>
       </tr>
     </thead>
-    <tbody ng-if="(filteredEvents | hashSize) === 0">
-      <tr>
-        <td class="hidden-lg" colspan="3">
-          <span ng-if="(events | hashSize) === 0"><em>No events to show.</em></span>
-          <span ng-if="(events | hashSize) > 0">
-            All events hidden by filter.
-            <a href="" ng-click="filter.text = ''" role="button">Clear filter</a>
-          </span>
-        </td>
-        <td class="hidden-xs hidden-sm hidden-md" colspan="6">
-          <span ng-if="(events | hashSize) === 0"><em>No events to show.</em></span>
-          <span ng-if="(events | hashSize) > 0">
-            All events hidden by filter.
-            <a href="" ng-click="filter.text = ''" role="button">Clear filter</a>
-          </span>
-        </td>
-      </tr>
-    </tbody>
     <tbody ng-repeat="event in filteredEvents">
       <tr>
         <td data-title="Time" class="nowrap">{{event.lastTimestamp | date:'mediumTime'}}</td>
diff --git a/app/views/directives/pods-table.html b/app/views/directives/pods-table.html
index d3e938ca48..4558fdd775 100644
--- a/app/views/directives/pods-table.html
+++ b/app/views/directives/pods-table.html
@@ -1,4 +1,9 @@
-<table class="table table-bordered table-hover table-mobile">
+<div class="empty-state-message text-center" ng-if="(pods | hashSize) == 0">
+  <h2>{{emptyMessage}}</h2>
+</div>
+<table
+  class="table table-bordered table-hover table-mobile"
+  ng-if="(pods | hashSize) !== 0">
   <thead>
     <tr>
       <th>Name</th>
@@ -8,9 +13,6 @@
       <th>Age</th>
     </tr>
   </thead>
-  <tbody ng-if="(pods | hashSize) == 0">
-    <tr><td colspan="5"><em>{{emptyMessage || 'No pods to show'}}</em></td></tr>
-  </tbody>
   <tbody ng-repeat="pod in pods | orderObjectsByDate : true">
     <tr>
       <td data-title="Name">
diff --git a/app/views/images.html b/app/views/images.html
index d3dbc40508..080514c1ae 100644
--- a/app/views/images.html
+++ b/app/views/images.html
@@ -21,7 +21,12 @@ <h1>Image Streams</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="(imageStreams | hashSize) == 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="(imageStreams | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -30,9 +35,6 @@ <h1>Image Streams</h1>
                     <th>Updated</th>
                   </tr>
                 </thead>
-                <tbody ng-if="(imageStreams | hashSize) == 0">
-                  <tr><td colspan="4"><em>{{emptyMessage}}</em></td></tr>
-                </tbody>
                 <tbody ng-repeat="imageStream in imageStreams | orderObjectsByDate : true">
                   <tr>
                     <td data-title="Name"><a href="{{imageStream | navigateResourceURL}}">{{imageStream.metadata.name}}</a></td>
diff --git a/app/views/other-resources.html b/app/views/other-resources.html
index 24c5723d84..0b5c0c0c2d 100644
--- a/app/views/other-resources.html
+++ b/app/views/other-resources.html
@@ -28,7 +28,13 @@ <h1>Other Resources</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-mobile" ng-class="{ 'table-empty': (resources | hashSize) === 0 }">
+              <div class="empty-state-message text-center" ng-if="(resources | hashSize) == 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-mobile"
+                ng-class="{ 'table-empty': (resources | hashSize) === 0 }"
+                ng-if="(resources | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -37,9 +43,6 @@ <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-repeat="resource in resources | orderObjectsByDate : true">
                   <tr>
                     <td data-title="Name">{{resource.metadata.name}}</td>
diff --git a/app/views/services.html b/app/views/services.html
index 150c098f70..fda0db4783 100644
--- a/app/views/services.html
+++ b/app/views/services.html
@@ -21,7 +21,12 @@ <h1>Services</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12 gutter-top">
-              <table class="table table-bordered table-hover table-mobile">
+              <div class="empty-state-message text-center" ng-if="(services | hashSize) == 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-if="(services | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -32,9 +37,6 @@ <h1>Services</h1>
                     <th>Age</th>
                   </tr>
                 </thead>
-                <tbody ng-if="(services | hashSize) == 0">
-                  <tr><td colspan="6"><em>{{emptyMessage}}</em></td></tr>
-                </tbody>
                 <tbody ng-repeat="service in services | orderObjectsByDate : true">
                   <tr>
                     <td data-title="Name"><a href="{{service | navigateResourceURL}}">{{service.metadata.name}}</a></td>
diff --git a/app/views/storage.html b/app/views/storage.html
index 840cc54509..f7369f6b3e 100644
--- a/app/views/storage.html
+++ b/app/views/storage.html
@@ -21,7 +21,12 @@ <h1>Storage</h1>
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="section-header page-header-bleed-right page-header-bleed-left">
+              <div class="empty-state-message text-center" ng-if="(pvcs | hashSize) === 0">
+                <h2>{{emptyMessage}}</h2>
+              </div>
+              <div
+                class="section-header page-header-bleed-right page-header-bleed-left"
+                ng-if="(pvcs | hashSize) !== 0">
                 <div class="hidden-xs pull-right" ng-if="project && ('persistentvolumeclaims' | canI : 'create')">
                   <a ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-default">Request Storage</a>
                 </div>
@@ -30,7 +35,10 @@ <h2>Persistent Volume Claims</h2>
                   <a ng-href="project/{{project.metadata.name}}/create-pvc" class="btn btn-default">Request Storage</a>
                 </div>
               </div>
-              <table class="table table-bordered table-hover table-mobile" ng-class="{ 'table-empty': (pvcs | hashSize) === 0 }">
+              <table
+                class="table table-bordered table-hover table-mobile"
+                ng-class="{ 'table-empty': (pvcs | hashSize) === 0 }"
+                ng-if="(pvcs | hashSize) !== 0">
                 <thead>
                   <tr>
                     <th>Name</th>
@@ -40,9 +48,6 @@ <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-repeat="pvc in pvcs | orderObjectsByDate : true">
                   <tr>
                     <td data-title="Name"><a ng-href="{{pvc | navigateResourceURL}}">{{pvc.metadata.name}}</a></td>
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 28efdc7891..45a07b43a0 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -1490,7 +1490,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</div>\n" +
     "<build-trends-chart builds=\"builds\"></build-trends-chart>\n" +
     "</div>\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(builds | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
     "<div ng-if=\"loaded && (unfilteredBuilds | hashSize) > 0\">\n" +
+    "<div ng-if=\"(builds | hashSize) !== 0\">\n" +
     "<div class=\"table-filter-wrapper\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
@@ -1502,9 +1506,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Created</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(builds | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"3\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"build in orderedBuilds\">\n" +
     "<tr>\n" +
     "<td data-title=\"Build\">\n" +
@@ -1528,6 +1529,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</tr>\n" +
     "</tbody>\n" +
     "</table>\n" +
+    "</div>\n" +
     "<div ng-if=\"buildConfig | isJenkinsPipelineStrategy\">\n" +
     "<build-pipeline build=\"build\" ng-repeat=\"build in orderedBuilds track by (build | uid)\"></build-pipeline>\n" +
     "<table ng-if=\"(builds | hashSize) === 0\" class=\"table table-bordered table-hover table-mobile\">\n" +
@@ -2013,10 +2015,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<annotations annotations=\"deploymentConfig.metadata.annotations\"></annotations>\n" +
     "</div>\n" +
     "<div ng-if=\"loaded\">\n" +
-    "<div class=\"table-filter-wrapper\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(deployments | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<div class=\"table-filter-wrapper\" ng-if=\"(deployments | hashSize) !== 0\">\n" +
     "<project-filter></project-filter>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(deployments | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Deployment</th>\n" +
@@ -2025,9 +2030,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Trigger</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(deployments | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"4\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"deployment in deployments | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Deployment\">\n" +
@@ -2308,7 +2310,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</dl>\n" +
     "<annotations annotations=\"imageStream.metadata.annotations\"></annotations>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(tagsByName | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(tagsByName | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Tag</th>\n" +
@@ -2318,9 +2323,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Pull Spec</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(tagsByName | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"5\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat-start=\"tag in tagsByName | orderBy : 'name'\">\n" +
     "<tr>\n" +
     "<td data-title=\"Tag\"><a href=\"{{imageStream | navigateResourceURL}}/{{tag.name}}\">{{tag.name}}</a></td>\n" +
@@ -2962,7 +2964,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(routes | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(routes | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -2972,9 +2977,6 @@ 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-repeat=\"route in routes | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\">\n" +
@@ -3170,7 +3172,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"!(latestByConfig | hashSize)\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(latestByConfig | hashSize)\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -3181,9 +3186,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Source</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"!(latestByConfig | hashSize)\">\n" +
-    "<tr><td colspan=\"6\"><em>{{emptyMessage}}</em></td></tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"(buildConfigName, latestBuild) in latestByConfig\">\n" +
     "\n" +
     "<tr ng-if=\"!latestBuild\">\n" +
@@ -4114,7 +4116,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"showEmptyMessage()\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"!showEmptyMessage()\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -4124,11 +4129,6 @@ 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-repeat=\"(deploymentConfigName, deploymentConfigDeployments) in deploymentsByDeploymentConfig\" ng-if=\"deploymentConfigName && (deploymentConfigs[deploymentConfigName] || !unfilteredDeploymentConfigs[deploymentConfigName])\">\n" +
     "\n" +
     "<tr ng-if=\"(deploymentConfigDeployments | hashSize) == 0 && deploymentConfigName\">\n" +
@@ -5061,7 +5061,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div pf-sort config=\"sortConfig\" class=\"sort-controls\"></div>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-condensed table-mobile table-hover events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(filteredEvents | hashSize) === 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-condensed table-mobile table-hover events-table\" ng-class=\"{ 'table-empty': (filteredEvents | hashSize) === 0 }\" ng-if=\"(filteredEvents | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th id=\"time\">Time</th>\n" +
@@ -5078,24 +5081,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th id=\"message\"><span class=\"hidden-xs-inline visible-sm-inline visible-md-inline hidden-lg-inline\">Reason and </span>Message</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(filteredEvents | hashSize) === 0\">\n" +
-    "<tr>\n" +
-    "<td class=\"hidden-lg\" colspan=\"3\">\n" +
-    "<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
-    "<span ng-if=\"(events | hashSize) > 0\">\n" +
-    "All events hidden by filter.\n" +
-    "<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\">Clear filter</a>\n" +
-    "</span>\n" +
-    "</td>\n" +
-    "<td class=\"hidden-xs hidden-sm hidden-md\" colspan=\"6\">\n" +
-    "<span ng-if=\"(events | hashSize) === 0\"><em>No events to show.</em></span>\n" +
-    "<span ng-if=\"(events | hashSize) > 0\">\n" +
-    "All events hidden by filter.\n" +
-    "<a href=\"\" ng-click=\"filter.text = ''\" role=\"button\">Clear filter</a>\n" +
-    "</span>\n" +
-    "</td>\n" +
-    "</tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"event in filteredEvents\">\n" +
     "<tr>\n" +
     "<td data-title=\"Time\" class=\"nowrap\">{{event.lastTimestamp | date:'mediumTime'}}</td>\n" +
@@ -6170,7 +6155,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
 
   $templateCache.put('views/directives/pods-table.html',
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(pods | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(pods | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -6180,9 +6168,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<th>Age</th>\n" +
     "</tr>\n" +
     "</thead>\n" +
-    "<tbody ng-if=\"(pods | hashSize) == 0\">\n" +
-    "<tr><td colspan=\"5\"><em>{{emptyMessage || 'No pods to show'}}</em></td></tr>\n" +
-    "</tbody>\n" +
     "<tbody ng-repeat=\"pod in pods | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\">\n" +
@@ -6949,7 +6934,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(imageStreams | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(imageStreams | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -6958,9 +6946,6 @@ 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-repeat=\"imageStream in imageStreams | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\"><a href=\"{{imageStream | navigateResourceURL}}\">{{imageStream.metadata.name}}</a></td>\n" +
@@ -7697,7 +7682,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-mobile\" ng-class=\"{ 'table-empty': (resources | hashSize) === 0 }\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(resources | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-mobile\" ng-class=\"{ 'table-empty': (resources | hashSize) === 0 }\" ng-if=\"(resources | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -7706,9 +7694,6 @@ 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-repeat=\"resource in resources | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\">{{resource.metadata.name}}</td>\n" +
@@ -8824,7 +8809,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-md-12 gutter-top\">\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\">\n" +
+    "<div class=\"empty-state-message text-center\" ng-if=\"(services | hashSize) == 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-if=\"(services | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -8835,9 +8823,6 @@ 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-repeat=\"service in services | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\"><a href=\"{{service | navigateResourceURL}}\">{{service.metadata.name}}</a></td>\n" +
@@ -9234,7 +9219,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"container-fluid\">\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=\"empty-state-message text-center\" ng-if=\"(pvcs | hashSize) === 0\">\n" +
+    "<h2>{{emptyMessage}}</h2>\n" +
+    "</div>\n" +
+    "<div class=\"section-header page-header-bleed-right page-header-bleed-left\" ng-if=\"(pvcs | hashSize) !== 0\">\n" +
     "<div class=\"hidden-xs pull-right\" ng-if=\"project && ('persistentvolumeclaims' | canI : 'create')\">\n" +
     "<a ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-default\">Request Storage</a>\n" +
     "</div>\n" +
@@ -9243,7 +9231,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<a ng-href=\"project/{{project.metadata.name}}/create-pvc\" class=\"btn btn-default\">Request Storage</a>\n" +
     "</div>\n" +
     "</div>\n" +
-    "<table class=\"table table-bordered table-hover table-mobile\" ng-class=\"{ 'table-empty': (pvcs | hashSize) === 0 }\">\n" +
+    "<table class=\"table table-bordered table-hover table-mobile\" ng-class=\"{ 'table-empty': (pvcs | hashSize) === 0 }\" ng-if=\"(pvcs | hashSize) !== 0\">\n" +
     "<thead>\n" +
     "<tr>\n" +
     "<th>Name</th>\n" +
@@ -9253,9 +9241,6 @@ 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-repeat=\"pvc in pvcs | orderObjectsByDate : true\">\n" +
     "<tr>\n" +
     "<td data-title=\"Name\"><a ng-href=\"{{pvc | navigateResourceURL}}\">{{pvc.metadata.name}}</a></td>\n" +