diff --git a/ui/index.html b/ui/index.html
index eff48db12a..99c02e583b 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -102,18 +102,17 @@
 
   <script type="text/x-handlebars" data-template-name="dc">
     <div class="row">
-      <div class="col-md-12 col-sm-12 col-xs-12 topbar">
+      <div {{ bind-attr class=":col-md-12 :col-sm-12 :col-xs-12 :topbar hasFailingChecks:topbar-orange:topbar-green" }}>
 
         <div class="col-md-1 col-sm-2 col-xs-8 col-sm-offset-0 col-xs-offset-1">
           <a href="#"><div class="top-brand"></div></a>
         </div>
-
         <div class="col-md-2 col-sm-3 col-xs-8 col-sm-offset-0 col-xs-offset-1">
-          {{#link-to 'services' (query-params status=checkStatus) tagName="div" href=false }}<a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}}>Services</a>{{/link-to}}
+          {{#link-to 'services' class='btn btn-default col-xs-12'}}Services{{/link-to}}
         </div>
 
         <div class="col-md-2 col-sm-3 col-xs-8 col-sm-offset-0 col-xs-offset-1">
-          {{#link-to 'nodes' (query-params status=checkStatus) tagName="div" href=false }}<a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}}>Nodes</a>{{/link-to}}
+          {{#link-to 'nodes' class='btn btn-default col-xs-12'}}Nodes{{/link-to}}
         </div>
 
         <div class="col-md-2 col-sm-3 col-xs-8 col-sm-offset-0 col-xs-offset-1">
@@ -124,7 +123,7 @@
           {{#link-to 'acls' class='btn btn-default col-xs-12'}}ACL{{/link-to}}
         </div>
 
-        <div class="col-md-2 col-md-offset-1 col-sm-2 col-xs-6 col-sm-offset-0 col-xs-offset-1">
+        <div class="col-md-2 col-sm-2 col-xs-6 col-sm-offset-0 col-xs-offset-1">
           <a {{bind-attr class=":col-xs-12 :btn isDropDownVisible:btn-primary:btn-default"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
 
           {{#if isDropdownVisible}}
@@ -136,6 +135,10 @@
           {{/if}}
 
         </div>
+
+        <div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
+          {{#link-to 'nodes' class='btn btn-default col-xs-6 icon'}}<span class="wrap">&#9881;</span>{{/link-to}}
+        </div>
       </div>
     </div>
 
diff --git a/ui/styles/_nav.scss b/ui/styles/_nav.scss
index dc932af3ff..680e5d2a3d 100644
--- a/ui/styles/_nav.scss
+++ b/ui/styles/_nav.scss
@@ -16,6 +16,14 @@
     min-height: 95px;
     border-bottom: 1px #eee solid;
 
+    &.topbar-green {
+        border-top: 6px $green-faded solid;
+    }
+
+    &.topbar-orange {
+        border-top: 6px $orange-faded solid;
+    }
+
     .btn {
         margin-top: 20px;
         min-width: 100px;
diff --git a/ui/styles/base.scss b/ui/styles/base.scss
index 808c57ec52..8c331d3e3c 100644
--- a/ui/styles/base.scss
+++ b/ui/styles/base.scss
@@ -98,6 +98,20 @@ a {
     background-color: $gray-background;
 }
 
+.topbar {
+  .btn.icon {
+    min-width: 50px;
+    font-size: 30px;
+    height: 33px;
+    padding: 0;
+    .wrap {
+      position: absolute;
+      top: -8px;
+      left: 14px;
+    }
+  }
+}
+
 .action-bar {
   min-height: 50px;
   padding-top: 10px;