diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html
--- a/kallithea/templates/about.html
+++ b/kallithea/templates/about.html
@@ -9,9 +9,9 @@
 <%def name="breadcrumbs()">
     ${c.site_name}
 </%def>
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('about')}
-</%def>
+</%block>
 <%def name="main()">
 
 <div class="box">
diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html
--- a/kallithea/templates/admin/admin.html
+++ b/kallithea/templates/admin/admin.html
@@ -18,9 +18,9 @@
     ${h.end_form()}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html
--- a/kallithea/templates/admin/auth/auth_settings.html
+++ b/kallithea/templates/admin/auth/auth_settings.html
@@ -14,9 +14,9 @@
     ${_('Authentication')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html
--- a/kallithea/templates/admin/defaults/defaults.html
+++ b/kallithea/templates/admin/defaults/defaults.html
@@ -14,9 +14,9 @@
     ${_('Defaults')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html
--- a/kallithea/templates/admin/gists/edit.html
+++ b/kallithea/templates/admin/gists/edit.html
@@ -21,9 +21,9 @@
     ${_('Edit Gist')} &middot; ${c.gist.gist_access_id}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('gists')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html
--- a/kallithea/templates/admin/gists/index.html
+++ b/kallithea/templates/admin/gists/index.html
@@ -25,9 +25,9 @@
     - ${c.gists_pager.item_count}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('gists')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html
--- a/kallithea/templates/admin/gists/new.html
+++ b/kallithea/templates/admin/gists/new.html
@@ -21,9 +21,9 @@
     ${_('New Gist')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('gists')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html
--- a/kallithea/templates/admin/gists/show.html
+++ b/kallithea/templates/admin/gists/show.html
@@ -13,9 +13,9 @@
     / ${_('URL')}: ${c.gist.gist_url()}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('gists')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html
--- a/kallithea/templates/admin/my_account/my_account.html
+++ b/kallithea/templates/admin/my_account/my_account.html
@@ -12,9 +12,9 @@
     ${_('My Account')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box" style="overflow:auto">
diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html
--- a/kallithea/templates/admin/notifications/notifications.html
+++ b/kallithea/templates/admin/notifications/notifications.html
@@ -12,9 +12,9 @@
     ${_('My Notifications')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html
--- a/kallithea/templates/admin/notifications/show_notification.html
+++ b/kallithea/templates/admin/notifications/show_notification.html
@@ -14,9 +14,9 @@
     ${_('Show Notification')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/permissions/permissions.html b/kallithea/templates/admin/permissions/permissions.html
--- a/kallithea/templates/admin/permissions/permissions.html
+++ b/kallithea/templates/admin/permissions/permissions.html
@@ -14,9 +14,9 @@
     ${_('Permissions')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 
 <%def name="main()">
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html
@@ -16,9 +16,9 @@
     ${_('Add Repository Group')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html
@@ -26,9 +26,9 @@
     </ul>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box" style="overflow:auto">
diff --git a/kallithea/templates/admin/repo_groups/repo_group_show.html b/kallithea/templates/admin/repo_groups/repo_group_show.html
--- a/kallithea/templates/admin/repo_groups/repo_group_show.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_show.html
@@ -17,9 +17,9 @@
     </span>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
         <%include file="/index_base.html" args="parent=self,group_name=c.group.group_name"/>
diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html
--- a/kallithea/templates/admin/repo_groups/repo_groups.html
+++ b/kallithea/templates/admin/repo_groups/repo_groups.html
@@ -14,9 +14,9 @@
 </%def>
 
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/repos/repo_add.html b/kallithea/templates/admin/repos/repo_add.html
--- a/kallithea/templates/admin/repos/repo_add.html
+++ b/kallithea/templates/admin/repos/repo_add.html
@@ -22,9 +22,9 @@
     ${_('Add Repository')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
     <div class="box">
diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html
--- a/kallithea/templates/admin/repos/repo_creating.html
+++ b/kallithea/templates/admin/repos/repo_creating.html
@@ -16,9 +16,9 @@
     ${_('Creating repository')} ${c.repo}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
diff --git a/kallithea/templates/admin/repos/repo_edit.html b/kallithea/templates/admin/repos/repo_edit.html
--- a/kallithea/templates/admin/repos/repo_edit.html
+++ b/kallithea/templates/admin/repos/repo_edit.html
@@ -15,9 +15,9 @@
     ${_('Settings')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('options')}
diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html
--- a/kallithea/templates/admin/repos/repos.html
+++ b/kallithea/templates/admin/repos/repos.html
@@ -11,9 +11,9 @@
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="repo_count">0</span> ${_('Repositories')}
 </%def>
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 <%def name="main()">
 <div class="box">
 
diff --git a/kallithea/templates/admin/settings/settings.html b/kallithea/templates/admin/settings/settings.html
--- a/kallithea/templates/admin/settings/settings.html
+++ b/kallithea/templates/admin/settings/settings.html
@@ -14,9 +14,9 @@
     ${_('Settings')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box" style="overflow:auto">
diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html
--- a/kallithea/templates/admin/user_groups/user_group_add.html
+++ b/kallithea/templates/admin/user_groups/user_group_add.html
@@ -15,9 +15,9 @@
     ${_('Add User Group')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/user_groups/user_group_edit.html b/kallithea/templates/admin/user_groups/user_group_edit.html
--- a/kallithea/templates/admin/user_groups/user_group_edit.html
+++ b/kallithea/templates/admin/user_groups/user_group_edit.html
@@ -16,9 +16,9 @@
     ${c.user_group.users_group_name}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box" style="overflow:auto">
diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html
--- a/kallithea/templates/admin/user_groups/user_groups.html
+++ b/kallithea/templates/admin/user_groups/user_groups.html
@@ -13,9 +13,9 @@
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="user_group_count">0</span> ${_('user groups')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -15,9 +15,9 @@
     ${_('Add User')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html
--- a/kallithea/templates/admin/users/user_edit.html
+++ b/kallithea/templates/admin/users/user_edit.html
@@ -16,9 +16,9 @@
     ${c.user.username}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box" style="overflow:auto">
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html
--- a/kallithea/templates/admin/users/users.html
+++ b/kallithea/templates/admin/users/users.html
@@ -13,9 +13,9 @@
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; <span id="user_count">0</span> ${_('Users')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('admin')}
-</%def>
+</%block>
 
 <%def name="main()">
 <div class="box">
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -1,27 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="root.html"/>
 
-<!-- HEADER -->
-<div id="header">
-    <div id="header-inner" class="title">
-        <div id="logo">
-          <a href="${h.url('home')}" style="display: block;">
-            <div class="header">
-                <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
-            </div>
-            %if c.site_name:
-             <div class="branding">${c.site_name}</div>
-            %endif
-          </a>
-        </div>
-        <!-- MENU -->
-        ${self.page_nav()}
-        <!-- END MENU -->
-        ${self.body()}
-    </div>
-</div>
-<!-- END HEADER -->
-
 <!-- CONTENT -->
 <div id="content">
     ${self.flash_msg()}
diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html
--- a/kallithea/templates/base/root.html
+++ b/kallithea/templates/base/root.html
@@ -122,6 +122,22 @@
       <script>$(document.body).addClass('ie9')</script>
       <![endif]-->
 
+      <div id="header">
+        <div id="header-inner" class="title">
+          <div id="logo">
+            <a href="${h.url('home')}" style="display: block;">
+              <div class="header">
+                <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
+              </div>
+              %if c.site_name:
+                <div class="branding">${c.site_name}</div>
+              %endif
+            </a>
+          </div>
+          <%block name="header_menu"/>
+        </div>
+      </div>
+
       ${next.body()}
 
       %if c.ga_code:
diff --git a/kallithea/templates/bookmarks/bookmarks.html b/kallithea/templates/bookmarks/bookmarks.html
--- a/kallithea/templates/bookmarks/bookmarks.html
+++ b/kallithea/templates/bookmarks/bookmarks.html
@@ -13,9 +13,9 @@
     ${_('Bookmarks')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('switch-to')}
diff --git a/kallithea/templates/branches/branches.html b/kallithea/templates/branches/branches.html
--- a/kallithea/templates/branches/branches.html
+++ b/kallithea/templates/branches/branches.html
@@ -13,9 +13,9 @@
     ${_('Branches')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('switch-to')}
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -24,9 +24,9 @@
     - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html
--- a/kallithea/templates/changeset/changeset.html
+++ b/kallithea/templates/changeset/changeset.html
@@ -13,9 +13,9 @@
     ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog', c.changeset.raw_id)}
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html
+++ b/kallithea/templates/changeset/changeset_range.html
@@ -15,9 +15,9 @@
     ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1]))}</td>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html
--- a/kallithea/templates/compare/compare_diff.html
+++ b/kallithea/templates/compare/compare_diff.html
@@ -16,9 +16,9 @@
   ${_('Compare Revisions')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html
--- a/kallithea/templates/files/diff_2way.html
+++ b/kallithea/templates/files/diff_2way.html
@@ -22,9 +22,9 @@
     ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
diff --git a/kallithea/templates/files/file_diff.html b/kallithea/templates/files/file_diff.html
--- a/kallithea/templates/files/file_diff.html
+++ b/kallithea/templates/files/file_diff.html
@@ -11,9 +11,9 @@
     ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('changelog')}
diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html
--- a/kallithea/templates/files/files.html
+++ b/kallithea/templates/files/files.html
@@ -18,9 +18,9 @@
     %endif
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('files', c.revision)}
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html
--- a/kallithea/templates/files/files_add.html
+++ b/kallithea/templates/files/files_add.html
@@ -16,9 +16,9 @@
 <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="breadcrumbs_links()">
     ${_('Add New File')} @ ${h.show_id(c.cs)}
diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html
--- a/kallithea/templates/files/files_delete.html
+++ b/kallithea/templates/files/files_delete.html
@@ -7,9 +7,9 @@
     %endif
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="breadcrumbs_links()">
     ${_('Delete file')} @ ${h.show_id(c.cs)}
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html
--- a/kallithea/templates/files/files_edit.html
+++ b/kallithea/templates/files/files_edit.html
@@ -16,9 +16,9 @@
 <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="breadcrumbs_links()">
     ${_('Edit file')} @ ${h.show_id(c.cs)}
diff --git a/kallithea/templates/followers/followers.html b/kallithea/templates/followers/followers.html
--- a/kallithea/templates/followers/followers.html
+++ b/kallithea/templates/followers/followers.html
@@ -12,9 +12,9 @@
     ${_('Followers')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 <%def name="main()">
 ${self.repo_context_bar('followers')}
 <div class="box">
diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html
--- a/kallithea/templates/forks/fork.html
+++ b/kallithea/templates/forks/fork.html
@@ -12,9 +12,9 @@
     ${_('Fork')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('createfork')}
diff --git a/kallithea/templates/forks/forks.html b/kallithea/templates/forks/forks.html
--- a/kallithea/templates/forks/forks.html
+++ b/kallithea/templates/forks/forks.html
@@ -12,9 +12,9 @@
     ${_('Forks')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('showforks')}
diff --git a/kallithea/templates/index.html b/kallithea/templates/index.html
--- a/kallithea/templates/index.html
+++ b/kallithea/templates/index.html
@@ -11,9 +11,9 @@
 <%def name="breadcrumbs()">
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
 ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
    <%include file="index_base.html" args="parent=self"/>
diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html
--- a/kallithea/templates/journal/journal.html
+++ b/kallithea/templates/journal/journal.html
@@ -17,9 +17,9 @@
     ${h.end_form()}
     </h5>
 </%def>
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('journal')}
-</%def>
+</%block>
 <%def name="head_extra()">
 <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" />
 <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
diff --git a/kallithea/templates/journal/public_journal.html b/kallithea/templates/journal/public_journal.html
--- a/kallithea/templates/journal/public_journal.html
+++ b/kallithea/templates/journal/public_journal.html
@@ -9,9 +9,9 @@
 <%def name="breadcrumbs()">
     ${c.site_name}
 </%def>
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('journal')}
-</%def>
+</%block>
 <%def name="head_extra()">
 <link href="${h.url('public_journal_atom')}" rel="alternate" title="${_('ATOM public journal feed')}" type="application/atom+xml" />
 <link href="${h.url('public_journal_rss')}" rel="alternate" title="${_('RSS public journal feed')}" type="application/rss+xml" />
diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html
--- a/kallithea/templates/login.html
+++ b/kallithea/templates/login.html
@@ -8,22 +8,6 @@
     %endif
 </%def>
 
-
-<div id="header">
-    <div id="header-inner" class="title">
-        <div id="logo">
-          <a href="${h.url('home')}" style="display: block;">
-            <div class="header">
-                <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
-            </div>
-            %if c.site_name:
-             <div class="branding">${c.site_name}</div>
-            %endif
-          </a>
-        </div>
-    </div>
-</div>
-
 <div id="login">
     <%include file="/base/flash_msg.html"/>
     <!-- login -->
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html
--- a/kallithea/templates/password_reset.html
+++ b/kallithea/templates/password_reset.html
@@ -8,22 +8,6 @@
     %endif
 </%def>
 
-
-<div id="header">
-    <div id="header-inner" class="title">
-        <div id="logo">
-          <a href="${h.url('home')}" style="display: block;">
-            <div class="header">
-                <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
-            </div>
-            %if c.site_name:
-             <div class="branding">${c.site_name}</div>
-            %endif
-          </a>
-        </div>
-    </div>
-</div>
-
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="title withlogo">
diff --git a/kallithea/templates/pullrequests/pullrequest.html b/kallithea/templates/pullrequests/pullrequest.html
--- a/kallithea/templates/pullrequests/pullrequest.html
+++ b/kallithea/templates/pullrequests/pullrequest.html
@@ -8,9 +8,9 @@
     ${_('New Pull Request')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html
+++ b/kallithea/templates/pullrequests/pullrequest_show.html
@@ -11,9 +11,9 @@
     ${_('Pull request #%s from %s#%s') % (c.pull_request.pull_request_id, c.pull_request.org_repo.repo_name, c.cs_branch_name)}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 <% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id) %>
diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html
+++ b/kallithea/templates/pullrequests/pullrequest_show_all.html
@@ -15,9 +15,9 @@
 %endif
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
diff --git a/kallithea/templates/pullrequests/pullrequest_show_my.html b/kallithea/templates/pullrequests/pullrequest_show_my.html
--- a/kallithea/templates/pullrequests/pullrequest_show_my.html
+++ b/kallithea/templates/pullrequests/pullrequest_show_my.html
@@ -8,9 +8,9 @@
     ${_('My Pull Requests')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('my_pullrequests')}
-</%def>
+</%block>
 
 <%def name="main()">
 
diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html
--- a/kallithea/templates/register.html
+++ b/kallithea/templates/register.html
@@ -7,21 +7,6 @@
         &middot; ${c.site_name}
     %endif
 </%def>
-<div id="header">
-    <div id="header-inner" class="title">
-        <div id="logo">
-          <a href="${h.url('home')}" style="display: block;">
-            <div class="header">
-                <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/>
-            </div>
-            %if c.site_name:
-             <div class="branding">${c.site_name}</div>
-            %endif
-          </a>
-        </div>
-    </div>
-</div>
-
 
 <div id="register">
     <%include file="/base/flash_msg.html"/>
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html
--- a/kallithea/templates/search/search.html
+++ b/kallithea/templates/search/search.html
@@ -24,13 +24,13 @@
   %endif
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     %if c.repo_name:
     ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
-</%def>
+</%block>
 <%def name="main()">
 %if c.repo_name:
 ${self.repo_context_bar('options')}
diff --git a/kallithea/templates/summary/statistics.html b/kallithea/templates/summary/statistics.html
--- a/kallithea/templates/summary/statistics.html
+++ b/kallithea/templates/summary/statistics.html
@@ -11,9 +11,9 @@
     ${_('Statistics')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="head_extra()">
 <link href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=c.authuser.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html
--- a/kallithea/templates/summary/summary.html
+++ b/kallithea/templates/summary/summary.html
@@ -34,9 +34,9 @@
     %endif
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="head_extra()">
 <link href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=c.authuser.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
diff --git a/kallithea/templates/tags/tags.html b/kallithea/templates/tags/tags.html
--- a/kallithea/templates/tags/tags.html
+++ b/kallithea/templates/tags/tags.html
@@ -13,9 +13,9 @@
     ${_('Tags')}
 </%def>
 
-<%def name="page_nav()">
+<%block name="header_menu">
     ${self.menu('repositories')}
-</%def>
+</%block>
 
 <%def name="main()">
 ${self.repo_context_bar('switch-to')}