diff --git a/etc/arangodb/arangod.conf.in b/etc/arangodb/arangod.conf.in
index 15150d4b13..a94a210c7a 100644
--- a/etc/arangodb/arangod.conf.in
+++ b/etc/arangodb/arangod.conf.in
@@ -1,4 +1,4 @@
-# AragoDB configuration file
+# ArangoDB configuration file
 # 
 # Documentation: 
 # http://www.arangodb.org/manuals/current/CommandLine.html
diff --git a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
index 83e659f083..1bb30aceff 100644
--- a/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
@@ -1,5 +1,5 @@
 <script id="dbSelectionView.ejs" type="text/template">
-<a href="#" class="tab" id="dbselection">DB: <%=current%> <b class="caret"></b></a>
+<a href="#" class="tab" id="dbselection"></span><div class="dbselection">DB: <%=current%></div> <b class="caret"></b></a>
 <ul class="link-dropdown-menu" id="dbs_dropdown">
 <%
 if (list.length > 1) {
@@ -13,7 +13,7 @@ if (list.length > 1) {
       }
   %>
     <li class="dropdown-item">
-        <a id=<%=i%> class="dbSelectionLink" href="#"><%=i%></a>
+        <a id=<%=i%> class="dbSelectionLink tab" href="#"><%=i%></a>
     </li>
   <%
     });
@@ -23,7 +23,9 @@ if (list.length > 1) {
 %>
     <% if (current === "_system") { %>
     <li class="dropdown-header">Manager</li>
-    <li id="databaseNavi" class="dropdown-item"><a id="databases" class="" href="#databases">Manage DBs</a></li>
+    <li id="databaseNavi" class="dropdown-item">
+      <a id="databases" class="tab" href="#databases">Manage DBs</a>
+    </li>
     <% } %>
 </ul>
 </script>
diff --git a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
index 2e89ee35da..b78de59c8b 100644
--- a/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
@@ -7,7 +7,6 @@
     <li class="graphviewer-menu"><a id="graph" class="tab" href="#graph">Graphs</a></li>
     <li class="applications-menu navbar-spacer-big"><a id="applications" class="tab" href="#applications">Applications</a></li>
     <li class="query-menu"><a id="query" class="tab" href="#query">AQL Editor</a></li>
-<!--    <li class="api-menu"><a id="api" class="tab" href="#api">API</a></li> -->
     <li class="dropdown tools-menu navbar-spacer-med" id="toolsDropdown">
         <a href="#" class="tab" id="tools">Tools <b class="caret"></b></a>
         <ul class="link-dropdown-menu" id="tools_dropdown">
diff --git a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
index e51a06cd8c..7b71f845de 100644
--- a/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
+++ b/js/apps/system/aardvark/frontend/js/views/dbSelectionView.js
@@ -18,8 +18,7 @@
     },
 
     changeDatabase: function(e) {
-//        var changeTo = $(".dbSelectionLink > option:selected").attr("id");
-        var changeTo = $(".dbSelectionLink").attr("id");
+      var changeTo = $(e.currentTarget).closest(".dbSelectionLink.tab").attr("id");
       var url = this.collection.createDatabaseURL(changeTo);
       window.location.replace(url);
     },
diff --git a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
new file mode 100644
index 0000000000..88ebd3190b
--- /dev/null
+++ b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss
@@ -0,0 +1,8 @@
+.dbselection {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 160px;
+  float: left;
+  margin-right: 3px;
+}
\ No newline at end of file
diff --git a/js/apps/system/aardvark/frontend/scss/_navbar.scss b/js/apps/system/aardvark/frontend/scss/_navbar.scss
index fc6cf98d04..571ef6f391 100644
--- a/js/apps/system/aardvark/frontend/scss/_navbar.scss
+++ b/js/apps/system/aardvark/frontend/scss/_navbar.scss
@@ -40,7 +40,7 @@ a.tab {
     right: 10px;
   }
   &.userImg {
-    padding-bottom: 4px;
+    padding-bottom: 5px;
   }
   color: $c_white;
   display: block;
diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css
index 7ee9255f16..54eea56de4 100644
--- a/js/apps/system/aardvark/frontend/scss/generated.css
+++ b/js/apps/system/aardvark/frontend/scss/generated.css
@@ -330,7 +330,7 @@ a.tab {
   color: white;
   display: block; }
   a.tab.userImg {
-    padding-bottom: 4px; }
+    padding-bottom: 5px; }
 
 #arangoCollectionSelect {
   display: none;
@@ -628,3 +628,11 @@ select.filterSelect {
   max-width: 300px !important;
   word-wrap: break-word !important;
   white-space: normal !important; }
+
+.dbselection {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  max-width: 160px;
+  float: left;
+  margin-right: 3px; }
diff --git a/js/apps/system/aardvark/frontend/scss/style.scss b/js/apps/system/aardvark/frontend/scss/style.scss
index 0090a68ffd..815bb6b8ac 100644
--- a/js/apps/system/aardvark/frontend/scss/style.scss
+++ b/js/apps/system/aardvark/frontend/scss/style.scss
@@ -20,3 +20,5 @@
 @import "userMenu";
 // Tooltips
 @import "tooltips";
+// dbSelection
+@import "dbSelection";