diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html
--- a/rhodecode/templates/admin/repos/repo_edit.html
+++ b/rhodecode/templates/admin/repos/repo_edit.html
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('options')}
+    ${self.menu('admin')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups.html b/rhodecode/templates/admin/repos_groups/repos_groups.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups.html
@@ -15,8 +15,9 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('home')}
+    ${self.menu('repositories')}
 </%def>
+
 <%def name="main()">
         <%include file="/index_base.html" args="parent=self,short_repo_names=True"/>
 </%def>
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_add.html b/rhodecode/templates/admin/repos_groups/repos_groups_add.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_add.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_add.html
@@ -4,6 +4,7 @@
 <%def name="title()">
     ${_('Add repos group')} &middot; ${c.rhodecode_name}
 </%def>
+
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
@@ -4,6 +4,7 @@
 <%def name="title()">
     ${_('Edit repos group')} ${c.repos_group.name} &middot; ${c.rhodecode_name}
 </%def>
+
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html
@@ -11,9 +11,11 @@
     &raquo;
     ${_('repository groups')}
 </%def>
+
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
+
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -277,7 +277,7 @@
         %>
         <ul id="quick" class="horizontal-list">
           <!-- repo switcher -->
-          <li ${is_current('home')}>
+          <li ${is_current('repositories')}>
               <a class="menu_link repo_switcher childs" id="repo_switcher" title="${_('Switch repository')}" href="${h.url('home')}">
               ${_('Repositories')}
               </a>
diff --git a/rhodecode/templates/bookmarks/bookmarks.html b/rhodecode/templates/bookmarks/bookmarks.html
--- a/rhodecode/templates/bookmarks/bookmarks.html
+++ b/rhodecode/templates/bookmarks/bookmarks.html
@@ -11,7 +11,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('bookmarks')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html
--- a/rhodecode/templates/branches/branches.html
+++ b/rhodecode/templates/branches/branches.html
@@ -11,7 +11,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('branches')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -12,7 +12,7 @@ ${_('%s Changelog') % c.repo_name} &midd
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('changelog')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -11,7 +11,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('changelog')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html
--- a/rhodecode/templates/changeset/changeset_range.html
+++ b/rhodecode/templates/changeset/changeset_range.html
@@ -10,7 +10,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('changelog')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/compare/compare_diff.html b/rhodecode/templates/compare/compare_diff.html
--- a/rhodecode/templates/compare/compare_diff.html
+++ b/rhodecode/templates/compare/compare_diff.html
@@ -10,7 +10,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('changelog')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/files/file_diff.html b/rhodecode/templates/files/file_diff.html
--- a/rhodecode/templates/files/file_diff.html
+++ b/rhodecode/templates/files/file_diff.html
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('files')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html
--- a/rhodecode/templates/files/files.html
+++ b/rhodecode/templates/files/files.html
@@ -16,7 +16,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('files')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/followers/followers.html b/rhodecode/templates/followers/followers.html
--- a/rhodecode/templates/followers/followers.html
+++ b/rhodecode/templates/followers/followers.html
@@ -10,7 +10,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('followers')}
+    ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.context_bar('followers')}
diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html
--- a/rhodecode/templates/index.html
+++ b/rhodecode/templates/index.html
@@ -1,8 +1,17 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
-<%def name="title()">${_('Dashboard')} &middot; ${c.rhodecode_name}</%def>
-<%def name="breadcrumbs()"></%def>
-<%def name="page_nav()">${self.menu('home')}</%def>
+
+<%def name="title()">
+${_('Dashboard')} &middot; ${c.rhodecode_name}
+</%def>
+
+<%def name="breadcrumbs()">
+</%def>
+
+<%def name="page_nav()">
+${self.menu('repositories')}
+</%def>
+
 <%def name="main()">
    <%include file="index_base.html" args="parent=self"/>
 </%def>
diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html
--- a/rhodecode/templates/search/search.html
+++ b/rhodecode/templates/search/search.html
@@ -23,7 +23,7 @@
 
 <%def name="page_nav()">
     %if c.repo_name:
-    ${self.menu('options')}
+    ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html
--- a/rhodecode/templates/settings/repo_settings.html
+++ b/rhodecode/templates/settings/repo_settings.html
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('settings')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/shortlog/shortlog.html b/rhodecode/templates/shortlog/shortlog.html
--- a/rhodecode/templates/shortlog/shortlog.html
+++ b/rhodecode/templates/shortlog/shortlog.html
@@ -17,8 +17,9 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('shortlog')}
+    ${self.menu('repositories')}
 </%def>
+
 <%def name="main()">
 ${self.context_bar('options')}
 <div class="box">
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html
--- a/rhodecode/templates/summary/summary.html
+++ b/rhodecode/templates/summary/summary.html
@@ -9,7 +9,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('summary')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="head_extra()">
diff --git a/rhodecode/templates/tags/tags.html b/rhodecode/templates/tags/tags.html
--- a/rhodecode/templates/tags/tags.html
+++ b/rhodecode/templates/tags/tags.html
@@ -11,7 +11,7 @@
 </%def>
 
 <%def name="page_nav()">
-    ${self.menu('tags')}
+    ${self.menu('repositories')}
 </%def>
 
 <%def name="main()">