diff --git a/ui/index.html b/ui/index.html
index d59a5fb17b..31b8eff643 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -53,11 +53,11 @@
         </div>
 
         <div class="col-md-2 col-md-offset-1 col-sm-3 col-sm-offset-5 col-xs-6">
-            {{#link-to 'services'}}<button {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}}>{{ checkMessage }}</button>{{/link-to}}
+            {{#link-to 'services'}}<a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}}>{{ checkMessage }}</a>{{/link-to}}
         </div>
 
         <div class="col-md-2 col-sm-3 col-xs-6">
-          <button type="button" {{bind-attr class=":col-xs-12 :btn isDropDownVisible:btn-primary:btn-default"}} {{action "toggle"}}> {{model}} <span class="caret"></span> </button>
+          <a {{bind-attr class=":col-xs-12 :btn isDropDownVisible:btn-primary:btn-default"}} {{action "toggle"}}> {{model}} <span class="caret"></span> </a>
 
           {{#if isDropdownVisible}}
             <ul class="dropdown-menu col-xs-12" style="display:block;">
diff --git a/ui/styles/_buttons.scss b/ui/styles/_buttons.scss
index 3950892e26..ab704a6cf8 100644
--- a/ui/styles/_buttons.scss
+++ b/ui/styles/_buttons.scss
@@ -9,18 +9,24 @@
     @include transition(color .2s ease-in-out);
 
     outline: none;
+    outline-color: white;
 
     &:hover {
         color: darken($gray, 10%);
         background-color: lighten($gray-background, 5%);
     }
 
-    .btn-default {
+    &:focus {
+        outline: none;
+        outline-color: white;
+        outline: none;
+        box-shadow: none;
     }
 
     &.active {
+        outline-color: white;
+        outline: none;
         box-shadow: none;
-        -webkit-box-shadow: none;
     }
 
     &.btn-primary, &.active {