diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
new file mode 100644
index 0000000..b04d8bc
--- /dev/null
+++ b/templates/base/head_navbar.tmpl
@@ -0,0 +1,199 @@
+<div class="ui container" id="navbar">
+	<div class="item brand" style="justify-content: space-between;">
+		<a href="{{AppSubUrl}}/" aria-label="{{if .IsSigned}}{{.locale.Tr "dashboard"}}{{else}}{{.locale.Tr "home"}}{{end}}">
+			<img class="ui mini image" width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{.locale.Tr "logo"}}" aria-hidden="true">
+		</a>
+		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
+			<i class="sidebar icon"></i>
+		</div>
+	</div>
+
+	{{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" .}}
+
+	{{/* TODO
+		<div class="item">
+		<div class="ui icon input">
+		<input class="searchbox" type="text" placeholder="{{.locale.Tr "search_project"}}">
+		<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+		</div>
+		</div>
+	*/}}
+
+
+	{{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">
+			<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="ui popup very wide">
+				<div class="df ac">
+					<a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
+						{{svg "octicon-issue-opened"}}
+						<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
+							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
+							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>
+
+			<a href="{{AppSubUrl}}/notifications" class="item tooltip" data-content='{{.locale.Tr "notifications"}}'>
+				<span class="text">
+					<span class="fitted">{{svg "octicon-bell"}}</span>
+					<span class="sr-mobile-only">{{.locale.Tr "notifications"}}</span>
+					{{$notificationUnreadCount := 0}}
+					{{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}}
+					<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="{{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>
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 81be222..b9506cd 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -39,15 +39,32 @@
 			</div>
 		</div>
 
-		<div class="twelve wide center aligned centered column">
-			<h2>Contributing</h2>
+		<div class="twelve wide left aligned centered column">
+			<h2 class="center">Contributing</h2>
 
-			I haven't figured out a contribution solution that truly satisfies me.
-			If <a href="https://news.ycombinator.com/item?id=29830061">federation support for Gitea</a> gets implemented, then I might switch to using it.
-			<br />
-			In the meantime, here are temporary solutions for you to use:
+			<p>
+				I'll happily accept contributions that are done directly on Github.
+				If you'd like to use this website instead, then you'll need to login through Github first.
+				Here's a handy button for you:
+			</p>
+
+			<div class="ui middle grid">
+				<div class="sixteen wide center aligned centered row">
+					<a class="ui button" href="/user/oauth2/github">Login via Github</a>
+				</div>
+			</div>
+
+			<p>
+				The current solution for contributions (Login via Github) is more of a temporary solution, as I'm waiting for
+				<a href="https://github.com/go-gitea/gitea/issues/18240">federation support for Gitea</a> to get implemented.
+			</p>
+
+			<p>
+				If you'd like to host repositories on this instance or if you'd like to get an account without using Github,
+				then please contact me directly (you'll find my contact infos on my <a href="https://shadamethyst.xyz/">main website</a>).
+			</p>
 
-			<h3>Issues</h3>
+			<!-- <h3>Issues</h3>
 
 			While the repositories are all mirrored on Github, you can use Github's issue tracker to send issues.
 			<br />
@@ -63,7 +80,7 @@
 			The projects to which I expect direct contributions should already be primarily hosted on Github.
 			<br />
 			If you do want to contribute to them through this website, then I'll happily create an account for you here and give you access.
-			The difficulty with this method lies in the way mirroring works &mdash; pushing different commits to both Github and Gitea will likely break things, so this situation should be avoided.
+			The difficulty with this method lies in the way mirroring works &mdash; pushing different commits to both Github and Gitea will likely break things, so this situation should be avoided. -->
 		</div>
 	</div>
 </div>