diff --git a/endpoints/api/suconfig.py b/endpoints/api/suconfig.py
index daaba41ce..ee48fdf19 100644
--- a/endpoints/api/suconfig.py
+++ b/endpoints/api/suconfig.py
@@ -50,6 +50,11 @@ class SuperUserRegistryStatus(ApiResource):
   @verify_not_prod
   def get(self):
     """ Returns the status of the registry. """
+    if app.config.get('DEBUGGING', False):
+      return {
+        'status': 'ready'
+      }
+
     # If there is no conf/stack volume, then report that status.
     if not CONFIG_PROVIDER.volume_exists():
       return {
diff --git a/endpoints/realtime.py b/endpoints/realtime.py
index ac2a6c483..212ca6eee 100644
--- a/endpoints/realtime.py
+++ b/endpoints/realtime.py
@@ -26,10 +26,13 @@ def ps():
 
   def generator():
     while True:
-      builder_data = app.config['HTTPCLIENT'].get('http://localhost:8686/status', timeout=1)
       build_status = {}
-      if builder_data.status_code == 200:
-        build_status = json.loads(builder_data.text)
+      try:
+        builder_data = app.config['HTTPCLIENT'].get('http://localhost:8686/status', timeout=1)
+        if builder_data.status_code == 200:
+          build_status = json.loads(builder_data.text)
+      except:
+        pass
 
       data = {
         'count': {
diff --git a/static/css/core-ui.css b/static/css/core-ui.css
index a89f07f39..d19e23dbc 100644
--- a/static/css/core-ui.css
+++ b/static/css/core-ui.css
@@ -702,4 +702,8 @@
 .co-alert .co-step-bar {
   float: right;
   margin-top: 6px;
+}
+
+.realtime-area-chart, .realtime-line-chart {
+  display: inline-block;
 }
\ No newline at end of file
diff --git a/static/directives/ps-usage-graph.html b/static/directives/ps-usage-graph.html
index 9407519f0..88d4a2ba4 100644
--- a/static/directives/ps-usage-graph.html
+++ b/static/directives/ps-usage-graph.html
@@ -1,16 +1,18 @@
 <div class="ps-usage-graph-element">
-  Build Workers:
-  <div class="realtime-area-chart"
-       data="[data.build.job_total, data.build.running_total]"
-       labels="['Queued Build Jobs', 'Running Build Jobs']"
-       colors="['rgb(157, 194, 211)', 'rgb(56, 122, 163)']"
-       counter="counter"></div>
+  <div quay-show="Features.BUILD_SUPPORT" ng-if="data.build && data.build.job_total">
+    Build Workers:
+    <div class="realtime-area-chart"
+         data="[data.build.job_total, data.build.running_total]"
+         labels="['Queued Build Jobs', 'Running Build Jobs']"
+         colors="['rgb(157, 194, 211)', 'rgb(56, 122, 163)']"
+         counter="counter"></div>
 
-  <div class="realtime-area-chart"
-       data="[data.build.job_total, data.build.workers, data.build.running_local]"
-       labels="['Queued Build Jobs', 'Build Workers (local)', 'Running Build Jobs (local)']"
-       colors="['rgb(157, 194, 211)', 'rgb(161, 208, 93)', 'rgb(210, 237, 130)']"
-       counter="counter"></div>
+    <div class="realtime-area-chart"
+         data="[data.build.job_total, data.build.workers, data.build.running_local]"
+         labels="['Queued Build Jobs', 'Build Workers (local)', 'Running Build Jobs (local)']"
+         colors="['rgb(157, 194, 211)', 'rgb(161, 208, 93)', 'rgb(210, 237, 130)']"
+         counter="counter"></div>
+  </div>
 
   CPU:
   <div class="realtime-line-chart" data="data.count.cpu" counter="counter"
diff --git a/static/js/core-config-setup.js b/static/js/core-config-setup.js
index cd7d9b356..0b22da9a2 100644
--- a/static/js/core-config-setup.js
+++ b/static/js/core-config-setup.js
@@ -205,6 +205,10 @@ angular.module("core-config-setup", ['angularFileUpload'])
         };
 
         var getKey = function(config, path) {
+          if (!config) {
+            return null;
+          }
+
           var parts = path.split('.');
           var current = config;
           for (var i = 0; i < parts.length; ++i) {
diff --git a/static/partials/super-user.html b/static/partials/super-user.html
index a48052d9b..2e72bfe85 100644
--- a/static/partials/super-user.html
+++ b/static/partials/super-user.html
@@ -20,6 +20,9 @@
               tab-target="#users" tab-init="loadUsers()">
           <i class="fa fa-group"></i>
         </span>
+        <span class="cor-tab" tab-title="Dashboard" tab-target="#dashboard">
+          <i class="fa fa-tachometer"></i>
+        </span>
         <span class="cor-tab" tab-title="Container Usage" tab-target="#usage-counter" tab-init="getUsage()">
           <i class="fa fa-pie-chart"></i>
         </span>
@@ -42,6 +45,11 @@
                configuration-saved="configurationSaved()"></div>
         </div>
 
+        <!-- Dashboard tab -->
+        <div id="dashboard" class="tab-pane">
+          <div class="ps-usage-graph" is-enabled="true"></div>
+        </div>
+
         <!-- Debugging tab -->
         <div id="debug" class="tab-pane">
           <div class="cor-loader" ng-show="!debugServices"></div>