diff --git a/ui/index.html b/ui/index.html
index 4965792fb5..d56bc4d249 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -62,6 +62,26 @@
     {{outlet}}
   </script>
 
+  <script type="text/x-handlebars" data-template-name="kv">
+    <div class="row">
+      <div class="col-md-5">
+
+        <ul>
+        {{#each child in model.children}}
+          <li {{action 'linkToKey' model.key child }}>{{ child }}</li>
+        {{/each}}
+        </ul>
+      </div>
+
+      {{#if model.value}}
+      <div class="col-md-5 col-md-offset-1">
+      <h4>{{ model.key }}</h4>
+      {{ input value=model.value class="form-control"}}
+      </div>
+      {{/if}}
+    </div>
+  </script>
+
   <script type="text/x-handlebars" id="services">
     <div {{ bind-attr class=":col-md-5 hasChild:hidden" }}>
 
@@ -72,7 +92,6 @@
               <div {{bind-attr class="service.hasFailingChecks:bg-orange:bg-green :list-bar"}}></div>
               <h4 class="list-group-item-heading">
                 {{#link-to 'services.show' service.Name class='subtle'}}{{service.Name}}{{/link-to}}
-                <small>{{service.Name}}</small>
                 <div class="heading-helper">
                   <a class="subtle" href="#">{{service.checkMessage}}</a>
                 </div>
@@ -141,7 +160,7 @@
             <div {{bind-attr class="node.hasFailingChecks:bg-orange:bg-green :list-bar"}}></div>
             <h4 class="list-group-item-heading">
               {{#link-to 'nodes.show' node.Name class='subtle'}}{{node.Name}}{{/link-to}}
-              <small>{{node.Name}}</small>
+              <small>{{node.Address}}</small>
               <div class="heading-helper">
                 <a class="subtle" href="#">{{node.checkMessage}}</a>
               </div>
diff --git a/ui/javascripts/app/controllers.js b/ui/javascripts/app/controllers.js
index 1cb348c7db..9c40337d5b 100644
--- a/ui/javascripts/app/controllers.js
+++ b/ui/javascripts/app/controllers.js
@@ -70,3 +70,14 @@ App.ServicesController = Ember.ArrayController.extend({
 App.ServicesShowController = Ember.Controller.extend({
   needs: ['services']
 });
+
+
+// Key value controller
+App.KvController = Ember.Controller.extend({
+  actions: {
+    linkToKey: function(top, child) {
+      var route = top + "/" + child
+      this.transitionToRoute('kv.key', route)
+    }
+  }
+});
diff --git a/ui/javascripts/app/router.js b/ui/javascripts/app/router.js
index 52d3097857..591aae6b94 100644
--- a/ui/javascripts/app/router.js
+++ b/ui/javascripts/app/router.js
@@ -12,7 +12,9 @@ App.Router.map(function() {
     this.resource("nodes", { path: "/nodes" }, function() {
       this.route("show", { path: "/:name" });
     });
-    this.resource("kv", { path: "/kv" });
+    this.resource("kv", { path: "/kv" }, function() {
+      this.route("key", { path: "/*wildcard" });
+    });
   });
 
   this.route("index", { path: "/" });
diff --git a/ui/javascripts/app/routes.js b/ui/javascripts/app/routes.js
index 46b0a919c7..b5f7cac91b 100644
--- a/ui/javascripts/app/routes.js
+++ b/ui/javascripts/app/routes.js
@@ -51,6 +51,25 @@ App.DcRoute = App.BaseRoute.extend({
   }
 });
 
+//
+// The route for for browsing and editing k/v data
+//
+//
+App.KvRoute = Ember.Route.extend({
+  model: function(params) {
+    var parts = window.location.hash.split("/").slice(3)
+
+    var key = parts.join("/")
+
+    console.log(key);
+
+    return window.fixtures.keys_full[key];
+  },
+
+  setupController: function(controller, model) {
+    controller.set('content', model);
+  }
+});
 
 /// services
 
diff --git a/ui/javascripts/fixtures.js b/ui/javascripts/fixtures.js
index ecf0427cec..2209c19d08 100644
--- a/ui/javascripts/fixtures.js
+++ b/ui/javascripts/fixtures.js
@@ -285,4 +285,32 @@ fixtures.nodes_full = {
 
 fixtures.dcs = ['nyc1', 'sf1', 'sg1']
 
-localStorage.setItem("current_dc", fixtures.dcs[0]);
+fixtures.keys_full = {
+  "application":  {
+    'key': 'application',
+    'value': '',
+    'children': [
+      'secrets',
+      'foobar',
+      'baz'
+    ]
+  },
+  "application/foobar": {
+    'key': 'application/foobar',
+    'value': 'baz',
+    'children': []
+  }
+};
+
+// represents the root index key '/'
+fixtures.keys = [
+  {
+    'key': 'application',
+    'value': '',
+    'children': [
+      'secrets',
+      'foobar',
+      'baz'
+    ]
+  }
+];