diff --git a/ui/index.html b/ui/index.html
index 27a8ad3e62..2a4352faa6 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -143,11 +143,15 @@
           {{#link-to 'kv' class='btn btn-default col-xs-12'}}Key/Value{{/link-to}}
         </div>
 
-        <div class="col-md-2 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
-          {{#link-to 'acls' class='btn btn-default col-xs-12'}}ACL{{/link-to}}
+        <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 'acls' class='btn btn-small btn-default col-xs-12'}}ACL{{/link-to}}
         </div>
 
-        <div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-4 col-xs-offset-1">
+        <div class="col-md-1 col-sm-2 col-xs-8 col-md-offset-0 col-sm-offset-0 col-xs-offset-1">
+          {{#link-to 'map' class='btn btn-small btn-default col-xs-12'}}Map{{/link-to}}
+        </div>
+
+        <div class="col-md-2 col-sm-2 col-xs-6 col-md-offset-0 col-sm-offset-2 col-xs-offset-1">
           <a {{bind-attr class=":col-xs-12 :btn hasFailingChecks:btn-warning:btn-success"}} {{action "toggle"}}> <span class="elip-overflow">{{model}} <span class="caret"></span></span> </a>
 
           {{#if isDropdownVisible}}
diff --git a/ui/javascripts/app/router.js b/ui/javascripts/app/router.js
index f79df94ffd..fa31dbbdb9 100644
--- a/ui/javascripts/app/router.js
+++ b/ui/javascripts/app/router.js
@@ -41,6 +41,9 @@ App.Router.map(function() {
       this.route("show", { path: "/:id" });
     });
 
+    // Map
+    this.resource("map", { path: "/map" });
+
     // Shows a page explaining that ACLs haven't been set-up
     this.route("aclsdisabled", { path: "/aclsdisabled" });
     // Shows a page explaining that the ACL key being used isn't
diff --git a/ui/styles/_nav.scss b/ui/styles/_nav.scss
index dc932af3ff..47b3074084 100644
--- a/ui/styles/_nav.scss
+++ b/ui/styles/_nav.scss
@@ -19,6 +19,10 @@
     .btn {
         margin-top: 20px;
         min-width: 100px;
+
+        &.btn-small {
+            min-width: 70px;
+        }
     }
 
     .btn-dropdown {