diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
index 442b0ffd95..1ab2e47b57 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/routers/router.js
@@ -155,6 +155,12 @@
         this.waitForInit(this.cluster.bind(this));
         return;
       }
+      if (!this.isCluster) {
+        this.routes[""] = 'dashboard';
+        this.navigate("#dashboard", {trigger: true});
+        return;
+      }
+
       this.clusterView = new window.ClusterView({
         coordinators: this.coordinatorCollection,
         dbServers: this.dbServers
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/navigationView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/navigationView.ejs
index 307239b481..6ecee409bc 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/navigationView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/navigationView.ejs
@@ -1,8 +1,10 @@
 <script id="navigationView.ejs" type="text/template">
   <ul class="navlist arango-collection-ul" id="arangoCollectionUl">
-    <li class="collections-menu"><a id="cluster" class="tab" href="#collections">Cluster</a></li>
-    <li class="collections-menu"><a id="nodes" class="tab" href="#collections">Nodes</a></li>
-    <li class="navbar-spacer big"></li>
+    <% if (isCluster) { %>
+      <li class="collections-menu"><a id="cluster" class="tab" href="#collections">Cluster</a></li>
+      <li class="collections-menu"><a id="nodes" class="tab" href="#collections">Nodes</a></li>
+      <li class="navbar-spacer big"></li>
+    <% } %>
     <li id="dbSelect" class="dropdown databases-menu"></li>
     <li class="collections-menu"><a id="collections" class="tab" href="#collections">Collections</a></li>
     <li class="query-menu"><a id="query" class="tab" href="#query">Queries</a></li>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
index e4d585e587..9cc4694c34 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentView.js
@@ -173,6 +173,7 @@
 
     fillEditor: function() {
       var toFill = this.removeReadonlyKeys(this.collection.first().attributes);
+      $('.disabledBread').last().text(this.collection.first().get('_key'));
       this.editor.set(toFill);
       $('.ace_content').attr('font-size','11pt');
     },
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
index af076ee3bf..e6f8646f49 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/navigationView.js
@@ -48,7 +48,8 @@
       var self = this;
 
       $(this.el).html(this.template.render({
-        currentDB: this.currentDB
+        currentDB: this.currentDB,
+        isCluster: window.App.isCluster
       }));
 
       //HEIKO