diff --git a/ui/index.html b/ui/index.html
index e9699772ec..16cb2c4396 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -64,7 +64,7 @@
 
   <script type="text/x-handlebars" data-template-name="kv/show">
   <div class="row">
-    <h5><a href="" {{action 'linkToKey' topModel.grandParentKey }}>{{topModel.parentKey}}</a></h5>
+    <h5><a class="subtle" href="" {{action 'linkToKey' topModel.grandParentKey }}>{{topModel.parentKey}}</a></h5>
   </div>
 
   <div class="row">
@@ -72,48 +72,50 @@
       <div class="row">
 
         {{#each item in model }}
-          <div {{action 'linkToKey' item.key }} class="panel panel-link panel-short">
+
+          {{#link-to item.linkToRoute item.urlSafeKey href=false tagName="div" class="panel panel-link panel-short"}}
             <div {{bind-attr class=":panel-bar item.isFolder:bg-gray:bg-light-gray" }}></div>
             <div class="panel-heading">
               <h3 class="panel-title">
                 {{item.key}}
               </h3>
             </div>
-          </div>
+          {{/link-to}}
+
         {{/each}}
 
       </div>
     </div>
 
-    <div class="col-md-5 col-md-offset-1">
+    <div class="col-md-6 col-md-offset-1">
     </div>
   </div>
   </script>
 
   <script type="text/x-handlebars" data-template-name="kv/edit">
   <div class="row">
-    <h5><a href="" {{action 'linkToKey' model.grandParentKey }}>{{model.parentKey}}</a></h5>
+    <h5><a class="subtle" href="" {{action 'linkToKey' model.grandParentKey }}>{{model.parentKey}}</a></h5>
   </div>
 
   <div class="row">
       <div class="col-md-5">
         <div class="row">
           {{#each item in siblings }}
-            <div {{action 'linkToKey' item.key }} class="panel panel-link panel-short">
+            {{#link-to item.linkToRoute item.urlSafeKey href=false tagName="div" class="panel panel-link panel-short"}}
               <div {{bind-attr class=":panel-bar item.isFolder:bg-gray:bg-light-gray" }}></div>
               <div class="panel-heading">
                 <h3 class="panel-title">
                   {{item.key}}
                 </h3>
               </div>
-            </div>
+            {{/link-to}}
           {{/each}}
 
         </div>
     </div>
 
 
-    <div class="col-md-5 col-md-offset-1">
+    <div class="col-md-6 col-md-offset-1">
       <div class="panel">
         <div {{ bind-attr class=":panel-bar isLoading:bg-orange:bg-green" }}></div>
           <div class="panel-heading">
diff --git a/ui/javascripts/app/models.js b/ui/javascripts/app/models.js
index 6114fe7e82..21b15e7504 100644
--- a/ui/javascripts/app/models.js
+++ b/ui/javascripts/app/models.js
@@ -85,6 +85,20 @@ App.Key = Ember.Object.extend({
     return (this.get('key').slice(-1) == "/")
   }.property('key'),
 
+  urlSafeKey: function() {
+    return this.get('key').replace(/\//g, "-")
+  }.property('key'),
+
+  linkToRoute: function() {
+    var key = this.get('urlSafeKey')
+
+    if (key.slice(-1) === "-") {
+      return 'kv.show'
+    } else {
+      return 'kv.edit'
+    }
+  }.property('key'),
+
   keyParts: function() {
     var key = this.get('key');
 
diff --git a/ui/styles/_panels.scss b/ui/styles/_panels.scss
index 02a3674c4a..22eb2ebb5d 100644
--- a/ui/styles/_panels.scss
+++ b/ui/styles/_panels.scss
@@ -41,8 +41,6 @@
     .panel-bar {
         width: 100%;
         height: 20px;
-        border-top-left-radius: 3px;
-        border-top-right-radius: 3px;
     }
 
     &.panel-link {
@@ -57,4 +55,16 @@
         cursor: pointer;
         background-color: lighten($gray-background, 8%);
     }
+
+    &.active {
+        >.panel-heading {
+            border-color: $purple;
+        }
+
+        border-color: $purple;
+
+        .panel-bar {
+            background-color: $purple;
+        }
+    }
 }