diff --git a/rhodecode/templates/admin/admin_audit_logs.mako b/rhodecode/templates/admin/admin_audit_logs.mako
index 4ebe6d7a..1172dd06 100644
--- a/rhodecode/templates/admin/admin_audit_logs.mako
+++ b/rhodecode/templates/admin/admin_audit_logs.mako
@@ -26,7 +26,7 @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
     </div>
     <!-- end box / title -->
     <div class="table">
diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako
index 9a8a467a..8f284d51 100644
--- a/rhodecode/templates/admin/auth/auth_settings.mako
+++ b/rhodecode/templates/admin/auth/auth_settings.mako
@@ -22,7 +22,7 @@
 
 <div class="box">
   <div class="title">
-    ${self.breadcrumbs()}
+    ${self.admin_menu()}
   </div>
 
   <div class='sidebar-col-wrapper'>
diff --git a/rhodecode/templates/admin/defaults/defaults.mako b/rhodecode/templates/admin/defaults/defaults.mako
index df19d44a..5bdd9a30 100644
--- a/rhodecode/templates/admin/defaults/defaults.mako
+++ b/rhodecode/templates/admin/defaults/defaults.mako
@@ -21,7 +21,7 @@
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
     </div>
 
     ##main
diff --git a/rhodecode/templates/admin/main.mako b/rhodecode/templates/admin/main.mako
index 67a4bd0b..8158a313 100644
--- a/rhodecode/templates/admin/main.mako
+++ b/rhodecode/templates/admin/main.mako
@@ -29,7 +29,7 @@
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
     </div>
 
     ##main
diff --git a/rhodecode/templates/admin/permissions/permissions.mako b/rhodecode/templates/admin/permissions/permissions.mako
index f8ef8e1d..caaba926 100644
--- a/rhodecode/templates/admin/permissions/permissions.mako
+++ b/rhodecode/templates/admin/permissions/permissions.mako
@@ -22,7 +22,7 @@
 <%def name="main()">
 <div class="box">
   <div class="title">
-      ${self.breadcrumbs()}
+      ${self.admin_menu()}
   </div>
 
   <div class="sidebar-col-wrapper scw-small">
diff --git a/rhodecode/templates/admin/repo_groups/repo_groups.mako b/rhodecode/templates/admin/repo_groups/repo_groups.mako
index fdae275f..fb884c14 100644
--- a/rhodecode/templates/admin/repo_groups/repo_groups.mako
+++ b/rhodecode/templates/admin/repo_groups/repo_groups.mako
@@ -20,7 +20,7 @@
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
         <ul class="links">
             %if h.HasPermissionAny('hg.admin','hg.repogroup.create.true')():
              <li>
diff --git a/rhodecode/templates/admin/repos/repos.mako b/rhodecode/templates/admin/repos/repos.mako
index d6227d47..c205d535 100644
--- a/rhodecode/templates/admin/repos/repos.mako
+++ b/rhodecode/templates/admin/repos/repos.mako
@@ -20,7 +20,7 @@
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
         <ul class="links">
             %if h.HasPermissionAny('hg.admin','hg.create.repository')():
              <li>
diff --git a/rhodecode/templates/admin/settings/settings.mako b/rhodecode/templates/admin/settings/settings.mako
index b82cb05a..6dc7cb18 100644
--- a/rhodecode/templates/admin/settings/settings.mako
+++ b/rhodecode/templates/admin/settings/settings.mako
@@ -33,7 +33,7 @@
 <%def name="main()">
 <div class="box">
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
     </div>
 
     ##main
diff --git a/rhodecode/templates/admin/user_groups/user_groups.mako b/rhodecode/templates/admin/user_groups/user_groups.mako
index dba05cee..adf51067 100644
--- a/rhodecode/templates/admin/user_groups/user_groups.mako
+++ b/rhodecode/templates/admin/user_groups/user_groups.mako
@@ -21,7 +21,7 @@
 <div class="box">
 
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
         <ul class="links">
         %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
           <li>
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index d2e532fe..1fd9b85b 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -22,7 +22,7 @@
 <div class="box">
 
     <div class="title">
-        ${self.breadcrumbs()}
+        ${self.admin_menu()}
         <ul class="links">
           <li>
             <a href="${h.route_path('users_new')}" class="btn btn-small btn-success">${_(u'Add User')}</a>
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index b0758dae..3532ace1 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -75,18 +75,40 @@
 </%def>
 
 <%def name="admin_menu()">
-  <ul class="admin_menu submenu">
-      <li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
-      <li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
-      <li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
-      <li><a href="${h.route_path('users')}">${_('Users')}</a></li>
-      <li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
-      <li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
-      <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
-      <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
-      <li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
-      <li class="last"><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
-  </ul>
+
+    <ul id="context-pages" class="navigation horizontal-list">
+        <%
+        repositories=c.rhodecode_user.repositories_admin
+        repository_groups=c.rhodecode_user.repository_groups_admin
+        user_groups=c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')()
+        %>
+        ## super admin case
+        % if c.rhodecode_user.is_admin:
+          <li><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
+          <li><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+          <li><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+          <li><a href="${h.route_path('users')}">${_('Users')}</a></li>
+          <li><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+          <li><a href="${h.route_path('admin_permissions_application')}">${_('Permissions')}</a></li>
+          <li><a href="${h.route_path('auth_home', traverse='')}">${_('Authentication')}</a></li>
+          <li><a href="${h.route_path('global_integrations_home')}">${_('Integrations')}</a></li>
+          <li><a href="${h.route_path('admin_defaults_repositories')}">${_('Defaults')}</a></li>
+          <li><a href="${h.route_path('admin_settings')}">${_('Settings')}</a></li>
+
+        ## delegated admin
+        % elif repositories or repository_groups or user_groups:
+
+           %if repositories:
+              <li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
+           %endif
+           %if repository_groups:
+              <li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
+           %endif
+           %if user_groups:
+              <li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
+           %endif
+        % endif
+    </ul>
 </%def>
 
 
@@ -145,21 +167,6 @@
 </%def>
 
 
-## admin menu used for people that have some admin resources
-<%def name="admin_menu_simple(repositories=None, repository_groups=None, user_groups=None)">
-  <ul class="submenu">
-   %if repositories:
-      <li class="local-admin-repos"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
-   %endif
-   %if repository_groups:
-      <li class="local-admin-repo-groups"><a href="${h.route_path('repo_groups')}">${_('Repository groups')}</a></li>
-   %endif
-   %if user_groups:
-      <li class="local-admin-user-groups"><a href="${h.route_path('user_groups')}">${_('User groups')}</a></li>
-   %endif
-  </ul>
-</%def>
-
 <%def name="repo_page_title(repo_instance)">
 <div class="title-content">
     <div class="title-main">
@@ -573,23 +580,12 @@
           </a>
         </li>
 
-      % if h.HasPermissionAll('hg.admin')('access admin main page'):
         <li class="${is_active('admin')}">
-          <a class="menulink childs" title="${_('Admin settings')}" href="#" onclick="return false;">
-            <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
+          <a class="menulink childs" title="${_('Admin settings')}" href="${h.route_path('admin_home')}">
+            <div class="menulabel">${_('Admin')} </div>
           </a>
-          ${admin_menu()}
         </li>
-      % elif c.rhodecode_user.repositories_admin or c.rhodecode_user.repository_groups_admin or c.rhodecode_user.user_groups_admin:
-      <li class="${is_active('admin')}">
-          <a class="menulink childs" title="${_('Delegated Admin settings')}">
-            <div class="menulabel">${_('Admin')} <div class="show_more"></div></div>
-          </a>
-          ${admin_menu_simple(c.rhodecode_user.repositories_admin,
-                              c.rhodecode_user.repository_groups_admin,
-                              c.rhodecode_user.user_groups_admin or h.HasPermissionAny('hg.usergroup.create.true')())}
-      </li>
-      % endif
+
       ## render extra user menu
       ${usermenu(active=(active=='my_account'))}
 
diff --git a/rhodecode/templates/search/search.mako b/rhodecode/templates/search/search.mako
index 8cbc7b13..973f8809 100644
--- a/rhodecode/templates/search/search.mako
+++ b/rhodecode/templates/search/search.mako
@@ -63,15 +63,9 @@
 <div class="box">
     %if c.repo_name:
         <!-- box / title -->
-        <!--div class="title">
-            ${self.repo_page_title(c.rhodecode_db_repo)}
-        </div-->
         ${h.form(h.route_path('search_repo',repo_name=c.repo_name),method='get')}
     %elif c.repo_group_name:
         <!-- box / title -->
-        <!--div class="title">
-            ${self.repo_group_page_title(c.repo_group)}
-        </div-->
         ${h.form(h.route_path('search_repo_group',repo_group_name=c.repo_group_name),method='get')}
     %else:
         <!-- box / title -->