diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
new file mode 100644
index 0000000..f4c3206
--- /dev/null
+++ b/templates/base/head_navbar.tmpl
@@ -0,0 +1,22 @@
+<div class="ui container fluid py-3">
+	{{if and .IsSigned .MustChangePassword}}
+		{{/* No links */}}
+	{{else if .IsSigned}}
+		{{if not .UnitIssuesGlobalDisabled}}
+		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.locale.Tr "issues"}}</a>
+		{{end}}
+		{{if not .UnitPullsGlobalDisabled}}
+		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.locale.Tr "pull_requests"}}</a>
+		{{end}}
+		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
+		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.locale.Tr "milestones"}}</a>{{end}}
+		{{end}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+	{{else if .IsLandingPageOrganizations}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.locale.Tr "explore"}}</a>
+	{{else}}
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.locale.Tr "explore"}}</a>
+	{{end}}
+
+	{{template "custom/extra_links" .}}
+</div>
diff --git a/templates/custom/body_inner_pre.tmpl b/templates/custom/body_inner_pre.tmpl
new file mode 100644
index 0000000..43b59ce
--- /dev/null
+++ b/templates/custom/body_inner_pre.tmpl
@@ -0,0 +1,197 @@
+<div class="ui top secondary stackable main menu following bar no-vertical-tabs">
+  <div class="ui container" id="navbar">
+    {{$notificationUnreadCount := 0}}
+    {{if .IsSigned}}
+      {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
+    {{end}}
+    <div class="item brand" style="justify-content: space-between;">
+      <a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
+        <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="2" clip-rule="evenodd" viewBox="0 0 850.2 162.05">
+          <path fill="#fff" fill-rule="nonzero" d="M61.1 104.56c.05 2.6.88 7.66 2.12 11.61a61.27 61.27 0 0 0 13.24 22.92 68.39 68.39 0 0 0 23.17 16.64 74.46 74.46 0 0 0 30.42 6.32 74.52 74.52 0 0 0 30.4-6.42 68.87 68.87 0 0 0 23.15-16.7 61.79 61.79 0 0 0 13.23-22.97 58.06 58.06 0 0 0 2.07-25.55 59.18 59.18 0 0 0-8.44-23.1 64.45 64.45 0 0 0-15.4-16.98h.02L112.76 2.46l-.16-.12c-4.09-3.14-10.96-3.13-15.46.02-4.55 3.18-5.07 8.44-1.02 11.75l-.02.02 26 21.14-79.23.08h-.1c-6.55.01-12.85 4.3-14.1 9.74-1.27 5.53 3.17 10.11 9.98 10.14v.02l40.15-.07-71.66 55-.27.2c-6.76 5.18-8.94 13.78-4.69 19.23 4.32 5.54 13.51 5.55 20.34.03l39.1-32s-.56 4.32-.52 6.91zm100.49 14.47c-8.06 8.2-19.34 12.86-31.54 12.89-12.23.02-23.5-4.6-31.57-12.79-3.93-4-6.83-8.59-8.61-13.48a35.57 35.57 0 0 1 2.34-29.25 39.1 39.1 0 0 1 9.58-11.4 44.68 44.68 0 0 1 28.24-9.85 44.59 44.59 0 0 1 28.24 9.77 38.94 38.94 0 0 1 9.58 11.36 35.58 35.58 0 0 1 4.33 14.18 35.1 35.1 0 0 1-1.98 15.05 37.7 37.7 0 0 1-8.61 13.52zm-57.6-27.91a23.55 23.55 0 0 1 8.55-16.68 28.45 28.45 0 0 1 18.39-6.57 28.5 28.5 0 0 1 18.38 6.57 23.57 23.57 0 0 1 8.55 16.67c.37 6.83-2.37 13.19-7.2 17.9a28.18 28.18 0 0 1-19.73 7.79c-7.83 0-14.84-3-19.75-7.8a23.13 23.13 0 0 1-7.19-17.88z"/>
+          <path fill="#fff" fill-rule="nonzero" d="M829.17 133.76h-15.9V64.39h15.13l.77 13.59zM850.07 79q-1.47-.25-3.14-.38-1.6-.13-3.2-.13-5.26 0-8.8 1.92-3.45 1.86-5.25 5.39-1.8 3.46-2.11 8.2l-3.66.07q0-8.78 2.31-15.77 2.3-6.99 6.92-11.1 4.62-4.1 11.54-4.1 1.35 0 3.02.26 1.66.26 2.5.58zm-76.55 56.04q-10.32 0-17.82-4.42-7.5-4.5-11.55-12.06-4.03-7.63-4.03-17.05v-2.63q0-10.84 4.1-18.85 4.1-8.08 11.22-12.5 7.18-4.43 16.22-4.43 10 0 16.6 4.36 6.6 4.3 9.88 12 3.27 7.62 3.27 17.69V104h-53.67V92.53h37.96v-1.22q-.13-4.04-1.54-7.56-1.4-3.53-4.49-5.7-3.01-2.19-8.07-2.19-5.07 0-8.53 2.89-3.46 2.82-5.26 8.01-1.8 5.13-1.8 12.12v2.63q0 5.9 2.19 10.58 2.18 4.68 6.34 7.43 4.17 2.7 9.94 2.7 5.58 0 9.87-2.18 4.36-2.18 7.5-6.29l8.34 8.34q-3.27 4.93-9.87 8.97-6.54 3.98-16.8 3.98zm-88.67 25.39h-15.9V64.39h14.68l1.22 13.33zm45-60.72q0 10.13-3.13 18.15-3.08 7.95-9.1 12.56-5.97 4.62-14.63 4.62-8.72 0-14.49-4.23-5.7-4.3-8.9-11.8-3.21-7.5-4.43-17.12v-4.55q1.22-10.26 4.42-17.89 3.2-7.7 8.91-11.99 5.71-4.36 14.3-4.36 8.79 0 14.81 4.43 6.03 4.42 9.1 12.37 3.15 7.95 3.15 18.47zm-15.9-1.34q0-6.22-1.6-11.29-1.53-5.06-5-8.01-3.4-2.95-8.9-2.95-3.98 0-6.87 1.35-2.88 1.28-4.87 3.65-1.92 2.37-3.01 5.64-1.1 3.2-1.54 7.05v11.6q.77 4.62 2.56 8.47 1.8 3.85 5.13 6.16 3.4 2.24 8.72 2.24 5.51 0 8.91-3.08 3.4-3.14 4.94-8.2 1.54-5.13 1.54-11.29zm-122.51.06q0-10.13 3.84-18.08 3.85-7.95 11.03-12.57 7.25-4.68 17.38-4.68 10.25 0 17.5 4.68 7.24 4.62 11.03 12.57 3.84 7.95 3.84 18.08v1.35q0 10.06-3.84 18.08-3.79 7.95-11.03 12.56-7.18 4.62-17.38 4.62-10.19 0-17.43-4.62-7.25-4.61-11.1-12.56-3.84-8.02-3.84-18.08zm15.9 1.35q0 6.15 1.73 11.28 1.73 5.07 5.32 8.14 3.65 3.08 9.42 3.08 5.71 0 9.3-3.08 3.65-3.07 5.32-8.14 1.73-5.13 1.73-11.28v-1.35q0-6.09-1.73-11.22-1.67-5.13-5.32-8.2-3.65-3.15-9.42-3.15-5.71 0-9.36 3.14-3.6 3.08-5.33 8.21-1.66 5.13-1.66 11.22zm-29.69 33.98h-15.9V35.28h15.9zm-56.67 1.28q-10.33 0-17.83-4.42-7.5-4.5-11.54-12.06-4.04-7.63-4.04-17.05v-2.63q0-10.84 4.1-18.85 4.11-8.08 11.23-12.5 7.18-4.43 16.22-4.43 10 0 16.6 4.36 6.6 4.3 9.88 12 3.27 7.62 3.27 17.69V104H495.2V92.53h37.96v-1.22q-.13-4.04-1.54-7.56-1.41-3.53-4.49-5.7-3.01-2.19-8.08-2.19-5.06 0-8.52 2.89-3.47 2.82-5.26 8.01-1.8 5.13-1.8 12.12v2.63q0 5.9 2.18 10.58t6.35 7.43q4.17 2.7 9.94 2.7 5.58 0 9.87-2.18 4.36-2.18 7.5-6.29l8.34 8.34q-3.27 4.93-9.88 8.97-6.54 3.98-16.8 3.98zM464.3 64.39h16.48l-23.98 69.37h-10.26l1.03-12.57zm-12.25 57 .77 12.37h-10.19l-24.17-69.37H435zm-65.88 13.65q-10.32 0-17.82-4.42-7.5-4.5-11.54-12.06-4.04-7.63-4.04-17.05v-2.63q0-10.84 4.1-18.85 4.1-8.08 11.22-12.5 7.18-4.43 16.22-4.43 10 0 16.6 4.36 6.61 4.3 9.88 12 3.27 7.62 3.27 17.69V104H360.4V92.53h37.95v-1.22q-.12-4.04-1.53-7.56-1.42-3.53-4.5-5.7-3-2.19-8.07-2.19t-8.53 2.89q-3.46 2.82-5.26 8.01-1.8 5.13-1.8 12.12v2.63q0 5.9 2.19 10.58 2.18 4.68 6.35 7.43 4.16 2.7 9.93 2.7 5.58 0 9.88-2.18 4.36-2.18 7.5-6.29l8.33 8.34q-3.27 4.93-9.87 8.97-6.54 3.98-16.8 3.98zm-107.64-1.28.12-13.27h19.75q8.6 0 14.36-3.72 5.77-3.72 8.72-10.65 2.95-6.98 2.95-16.67v-4.87q0-9.94-2.95-16.8-2.88-6.86-8.59-10.45-5.7-3.59-13.91-3.59h-20.84V40.41h20.84q12.5 0 21.93 5.51 9.48 5.52 14.8 15.45 5.33 9.94 5.33 23.34v4.74q0 13.47-5.32 23.4-5.33 9.94-14.94 15.46-9.56 5.45-22.38 5.45zm9.23 0h-16.54V40.4h16.54z" font-family="Heebo" font-size="131.3" font-weight="500" paint-order="markers fill stroke" style="-inkscape-font-specification:&quot;Heebo Medium&quot;"/>
+        </svg>
+      </a>
+      {{if .IsSigned}}
+      <a href="{{AppSubUrl}}/notifications" class="tooltip mobile-only" data-content='{{.locale.Tr "notifications"}}'>
+        <span class="text black">
+          <span class="fitted">{{svg "octicon-bell"}}</span>
+          <span class="ui red label mini{{if not $notificationUnreadCount}} hidden{{end}} notification_count">
+            {{$notificationUnreadCount}}
+          </span>
+        </span>
+      </a>
+      {{end}}
+      <div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
+        <i class="sidebar icon"></i>
+      </div>
+    </div>
+
+    <a class="item active" href="{{AppSubUrl}}">Projects</a>
+    <a class="item" href="https://wiki.blender.org">Docs</a>
+    <a class="item" href="https://code.blender.org">Blog</a>
+    <a class="item" href="https://devtalk.blender.org">Forum</a>
+
+    {{if and .IsSigned .MustChangePassword}}
+      <div class="right stackable menu">
+        <div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
+          <span class="text">
+            {{avatar .SignedUser 24 "tiny"}}
+            <span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
+            <span class="mobile-only">{{.SignedUser.Name}}</span>
+            <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
+          </span>
+          <div class="menu user-menu" tabindex="-1">
+            <div class="ui header">
+              {{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+            </div>
+
+            <div class="divider"></div>
+            <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+              {{svg "octicon-sign-out"}}
+              {{.locale.Tr "sign_out"}}<!-- Sign Out -->
+            </a>
+          </div><!-- end content avatar menu -->
+        </div><!-- end dropdown avatar menu -->
+      </div>
+    {{else if .IsSigned}}
+      <div class="right stackable menu">
+        {{if EnableTimetracking}}
+        <a class="active-stopwatch-trigger item ui label {{if not .ActiveStopwatch}}hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}">
+          <span class="text">
+            <span class="fitted item">
+              {{svg "octicon-stopwatch"}}
+              <span class="red" style="position:absolute; right:-0.6em; top:-0.6em;">{{svg "octicon-dot-fill"}}</span>
+            </span>
+            <span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
+          </span>
+        </a>
+        <div class="active-stopwatch-popup tippy-target">
+          <div class="df ac">
+            <a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
+              {{svg "octicon-issue-opened" 16 "mr-3"}}
+              <span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
+              <span class="ui primary label stopwatch-time my-0 mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+                {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
+              </span>
+            </a>
+            <form class="stopwatch-commit" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/toggle">
+              {{.CsrfTokenHtml}}
+              <button
+                type="submit"
+                class="ui button mini compact basic icon fitted tooltip"
+                data-content="{{.locale.Tr "repo.issues.stop_tracking"}}"
+                data-position="top right"
+              >{{svg "octicon-square-fill"}}</button>
+            </form>
+            <form class="stopwatch-cancel" method="POST" action="{{.ActiveStopwatch.IssueLink}}/times/stopwatch/cancel">
+              {{.CsrfTokenHtml}}
+              <button
+                type="submit"
+                class="ui button mini compact basic icon fitted tooltip"
+                data-content="{{.locale.Tr "repo.issues.cancel_tracking"}}"
+                data-position="top right"
+              >{{svg "octicon-trash"}}</button>
+            </form>
+          </div>
+        </div>
+        {{end}}
+
+        <a href="{{AppSubUrl}}/notifications" class="item tooltip not-mobile" data-content="{{.locale.Tr "notifications"}}" aria-label="{{.locale.Tr "notifications"}}">
+          <span class="text">
+            <span class="fitted">{{svg "octicon-bell"}}</span>
+            <span class="ui red label {{if not $notificationUnreadCount}}hidden{{end}} notification_count">
+              {{$notificationUnreadCount}}
+            </span>
+          </span>
+        </a>
+
+        <div class="ui dropdown jump item tooltip" data-content="{{.locale.Tr "create_new"}}">
+          <span class="text">
+            <span class="fitted">{{svg "octicon-plus"}}</span>
+            <span class="sr-mobile-only">{{.locale.Tr "create_new"}}</span>
+            <span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
+          </span>
+          <div class="menu">
+            <a class="item" href="{{AppSubUrl}}/repo/create">
+              <span class="fitted">{{svg "octicon-plus"}}</span> {{.locale.Tr "new_repo"}}
+            </a>
+            {{if not .DisableMigrations}}
+              <a class="item" href="{{AppSubUrl}}/repo/migrate">
+                <span class="fitted">{{svg "octicon-repo-push"}}</span> {{.locale.Tr "new_migrate"}}
+              </a>
+            {{end}}
+            {{if .SignedUser.CanCreateOrganization}}
+            <a class="item" href="{{AppSubUrl}}/org/create">
+              <span class="fitted">{{svg "octicon-organization"}}</span> {{.locale.Tr "new_org"}}
+            </a>
+            {{end}}
+          </div><!-- end content create new menu -->
+        </div><!-- end dropdown menu create new -->
+
+        <div class="ui dropdown jump item tooltip" tabindex="-1" data-content="{{.locale.Tr "user_profile_and_more"}}">
+          <span class="text">
+            {{avatar .SignedUser 24 "tiny"}}
+            <span class="sr-only">{{.locale.Tr "user_profile_and_more"}}</span>
+            <span class="mobile-only">{{.SignedUser.Name}}</span>
+            <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
+          </span>
+          <div class="menu user-menu" tabindex="-1">
+            <div class="ui header">
+              {{.locale.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
+            </div>
+
+            <div class="divider"></div>
+            <a class="item" href="{{.SignedUser.HomeLink}}">
+              {{svg "octicon-person"}}
+              {{.locale.Tr "your_profile"}}<!-- Your profile -->
+            </a>
+            {{if not .DisableStars}}
+              <a class="item" href="{{.SignedUser.HomeLink}}?tab=stars">
+                {{svg "octicon-star"}}
+                {{.locale.Tr "your_starred"}}
+              </a>
+            {{end}}
+            <a class="item" href="{{AppSubUrl}}/notifications/subscriptions">
+              {{svg "octicon-bell"}}
+              {{.locale.Tr "notification.subscriptions"}}<!-- Subscriptions -->
+            </a>
+            <a class="{{if .PageIsUserSettings}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
+              {{svg "octicon-tools"}}
+              {{.locale.Tr "your_settings"}}<!-- Your settings -->
+            </a>
+            <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
+              {{svg "octicon-question"}}
+              {{.locale.Tr "help"}}<!-- Help -->
+            </a>
+            {{if .IsAdmin}}
+              <div class="divider"></div>
+
+              <a class="{{if .PageIsAdmin}}active {{end}}item" href="{{AppSubUrl}}/admin">
+                {{svg "octicon-server"}}
+                {{.locale.Tr "admin_panel"}}<!-- Admin Panel -->
+              </a>
+            {{end}}
+
+            <div class="divider"></div>
+            <a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+              {{svg "octicon-sign-out"}}
+              {{.locale.Tr "sign_out"}}<!-- Sign Out -->
+            </a>
+          </div><!-- end content avatar menu -->
+        </div><!-- end dropdown avatar menu -->
+      </div><!-- end signed user right menu -->
+    {{else}}
+      <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.locale.Tr "help"}}</a>
+      <div class="right stackable menu">
+        {{if .ShowRegistrationButton}}
+          <a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
+            {{svg "octicon-person"}} {{.locale.Tr "register"}}
+          </a>
+        {{end}}
+        <a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
+          {{svg "octicon-sign-in"}} {{.locale.Tr "sign_in"}}
+        </a>
+      </div><!-- end anonymous right menu -->
+    {{end}}
+  </div>
+</div>
diff --git a/templates/custom/extra_links.tmpl b/templates/custom/extra_links.tmpl
index 94d839a..745f88c 100644
--- a/templates/custom/extra_links.tmpl
+++ b/templates/custom/extra_links.tmpl
@@ -1 +1 @@
-<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/blender/blender/issues/new">{{.locale.Tr "Report a Bug"}}</a>
+<a class="item" href="{{AppSubUrl}}/blender/blender/issues/new">{{.locale.Tr "Report a Bug"}}</a>