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
@@ -17,7 +17,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('options')}
+${self.repo_context_bar('options')}
 <div class="box box-left">
     <!-- box / title -->
     <div class="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
@@ -64,10 +64,6 @@
     </div>
 </%def>
 
-<%def name="context_bar(current)">
-    ${repo_context_bar(current)}
-</%def>
-
 <%def name="admin_menu()">
   <ul class="admin_menu">
       <li>${h.link_to(_('Admin journal'),h.url('admin_home'),class_='journal ')}</li>
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
@@ -15,7 +15,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -15,7 +15,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -24,7 +24,7 @@ ${c.rhodecode_name}
 </%def>
 
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -15,7 +15,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -14,7 +14,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -14,7 +14,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -20,7 +20,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html
--- a/rhodecode/templates/files/files_add.html
+++ b/rhodecode/templates/files/files_add.html
@@ -20,7 +20,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html
--- a/rhodecode/templates/files/files_edit.html
+++ b/rhodecode/templates/files/files_edit.html
@@ -20,7 +20,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
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
@@ -13,7 +13,7 @@
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('followers')}
+${self.repo_context_bar('followers')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html
--- a/rhodecode/templates/forks/fork.html
+++ b/rhodecode/templates/forks/fork.html
@@ -13,7 +13,7 @@
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('showforks')}
+${self.repo_context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html
--- a/rhodecode/templates/forks/forks.html
+++ b/rhodecode/templates/forks/forks.html
@@ -14,7 +14,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('showforks')}
+${self.repo_context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html
--- a/rhodecode/templates/pullrequests/pullrequest.html
+++ b/rhodecode/templates/pullrequests/pullrequest.html
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('showpullrequest')}
+${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('showpullrequest')}
+${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show_all.html b/rhodecode/templates/pullrequests/pullrequest_show_all.html
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html
@@ -13,7 +13,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('showpullrequest')}
+${self.repo_context_bar('showpullrequest')}
 
 <div class="box">
     <!-- box / title -->
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
@@ -30,7 +30,7 @@
 </%def>
 <%def name="main()">
 %if c.repo_name:
-${self.context_bar('options')}
+${self.repo_context_bar('options')}
 %endif
 <div class="box">
     <!-- box / title -->
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
@@ -33,7 +33,7 @@ window.onhashchange = function() {
 </%def>
 
 <%def name="main()">
-${self.context_bar('summary')}
+${self.repo_context_bar('summary')}
     <%
     summary = lambda n:{False:'summary-short'}.get(n)
     %>
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
@@ -15,7 +15,7 @@
 </%def>
 
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">