diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 24f6b37c8134..3347a91bf621 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin edit authentication">
+<div class="page-content admin edit authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 60b8f6fbe761..851254c09bbc 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin authentication">
+<div class="page-content admin authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index e72a82cbb3f5..c252f7d3f214 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new authentication">
+<div class="page-content admin new authentication">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 4d88c59feaec..00ad7a9a0e41 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin config">
+<div class="page-content admin config">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 911cdb9fef3a..e6d9f57c2e3b 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin dashboard">
+<div class="page-content admin dashboard">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 8a60088f0a10..752c0104434b 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 26169acaa0bf..8eeb0e526481 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new webhook">
+<div class="page-content admin new webhook">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index 3265a1d69a63..c09c6fcafe83 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin hooks">
+<div class="page-content admin hooks">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "repo/settings/webhook/list" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index c3600fa99608..5a38b92eef75 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin monitor">
+<div class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index d1d264c8c879..3320f5884c05 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin notice">
+<div class="page-content admin notice">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 4a0fd1611127..92b119d65160 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 567e72e03c62..6524c9839fe3 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin monitor">
+<div class="page-content admin monitor">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index df38831b6da5..fbadfeea78c6 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 7a046c6026d8..26c91c3155c6 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index e29b18f5beeb..7f1706e55a43 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin edit user">
+<div class="page-content admin edit user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index d6dd7d5c0396..dafeadaf964b 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin user">
+<div class="page-content admin user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index b05f81717f8f..885045dd0270 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="admin new user">
+<div class="page-content admin new user">
 	{{template "admin/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl
index bf7f85c5acec..9c880e59f2aa 100644
--- a/templates/explore/code.tmpl
+++ b/templates/explore/code.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		<form class="ui form ignore-dirty" style="max-width: 100%">
diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl
index ce86c0a8c16b..93810dcf4a16 100644
--- a/templates/explore/navbar.tmpl
+++ b/templates/explore/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="ui secondary pointing tabular top attached borderless stackable menu navbar">
+<div class="ui secondary pointing tabular top attached borderless stackable menu new-menu navbar">
 	<a class="{{if .PageIsExploreRepositories}}active{{end}} item" href="{{AppSubUrl}}/explore/repos">
 		{{svg "octicon-repo"}} {{.i18n.Tr "explore.repos"}}
 	</a>
diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl
index a83998543bfa..a2d62f3db28b 100644
--- a/templates/explore/organizations.tmpl
+++ b/templates/explore/organizations.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index c728219d3ea6..457ad74115e4 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore repositories">
+<div class="page-content explore repositories">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/repo_search" .}}
diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl
index a305e0db2497..64fa93d6e7f4 100644
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="explore users">
+<div class="page-content explore users">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
 		{{template "explore/search" .}}
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 721bb50dba19..fe3954d0eec1 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="home">
+<div class="page-content home">
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div>
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 94fb851a42da..62aaeaed9a35 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="install">
+<div class="page-content install">
 	<div class="ui middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<h3 class="ui top attached header">
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 82c8766a95ec..24a641a73a0c 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization new org">
+<div class="page-content organization new org">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 12630b70d777..54474965bd5e 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization profile mt-5">
+<div class="page-content organization profile">
 	{{/* overflow: auto is the clearfix - this avoids the image going beyond
 	the container where it is supposed to stay inside. */}}
 	<div class="ui container" style="overflow: auto">
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index f33f9be927aa..1a168da1331f 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization members">
+<div class="page-content organization members">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index a8d42b5476e3..9743d71cbff7 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings delete">
+<div class="page-content organization settings delete">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 35bb1610a872..96769c74468a 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings new webhook">
+<div class="page-content organization settings new webhook">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 825b1e941d47..cb0243bb1eb4 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings webhooks">
+<div class="page-content organization settings webhooks">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
index ed31890df539..61302c731aae 100644
--- a/templates/org/settings/labels.tmpl
+++ b/templates/org/settings/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings labels">
+<div class="page-content organization settings labels">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index d58c77ad10a2..348f8cb5331f 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization settings options">
+<div class="page-content organization settings options">
 	{{template "org/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl
index ef595f841ab2..51abf4ec4f12 100644
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index eeb9b1186a60..85f945c834c6 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization new team">
+<div class="page-content organization new team">
 	{{template "org/header" .}}
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl
index 16418b474d47..3b5f1b33fb3c 100644
--- a/templates/org/team/repositories.tmpl
+++ b/templates/org/team/repositories.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl
index e4be11ee52a6..0fae4eb6cf7d 100644
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="organization teams">
+<div class="page-content organization teams">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl
index c7886a3263e4..62abf5ef8812 100644
--- a/templates/post-install.tmpl
+++ b/templates/post-install.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="install">
+<div class="page-content install">
     <div class="ui container">
 		<div class="ui grid">
 			<div class="sixteen wide column content">
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index ba2750983c2c..b6d77f5eec35 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header">{{.DateFrom}} - {{.DateUntil}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 27b974787f45..85a95739a6e6 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui repository branches">
+<div class="page-content ui repository branches">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index fb60967e30b0..4bc96ae4597b 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository diff">
+<div class="page-content repository diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		{{$class := ""}}
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index dc729d9358cd..5a8a89fe147c 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "repo/sub_menu" .}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 39759bcc4c7e..4593e7752659 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new repo">
+<div class="page-content repository new repo">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 7daafa3e2a68..245bdaa54292 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository diff {{if .PageIsComparePull}}compare pull{{end}}">
+<div class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 
diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl
index 10eca8f5290a..08493944bf26 100644
--- a/templates/repo/editor/delete.tmpl
+++ b/templates/repo/editor/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor delete">
+<div class="page-content repository file editor delete">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index b991d2424259..695574cd99d6 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor edit">
+<div class="page-content repository file editor edit">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl
index 6ad7c7445feb..488465120ee7 100644
--- a/templates/repo/editor/upload.tmpl
+++ b/templates/repo/editor/upload.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file editor upload">
+<div class="page-content repository file editor upload">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index 3da76905337b..b5a39d0a9b18 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository quickstart">
+<div class="page-content repository quickstart">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl
index 461ac89c8968..28547f1aff1a 100644
--- a/templates/repo/forks.tmpl
+++ b/templates/repo/forks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository forks">
+<div class="page-content repository forks">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl
index fa027adc033c..e3b5cd38784e 100644
--- a/templates/repo/graph.tmpl
+++ b/templates/repo/graph.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository commits">
+<div class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div id="git-graph-container" class="ui segment{{if eq .Mode "monochrome"}} monochrome{{end}}">
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 0922bd73870b..80187a2fbf29 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file list {{if .IsBlame}}blame{{end}}">
+<div class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl
index 759c5437c1c9..0cec1ef63cbb 100644
--- a/templates/repo/issue/choose.tmpl
+++ b/templates/repo/issue/choose.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new issue">
+<div class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl
index d3df3b594457..373083814c2d 100644
--- a/templates/repo/issue/labels.tmpl
+++ b/templates/repo/issue/labels.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository labels">
+<div class="page-content repository labels">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 95aea0c13b3b..6125c01b74da 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index a78b20893fd3..9f0a2f99a792 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 215d4f3c7339..94d31d627e4d 100644
--- a/templates/repo/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new milestone">
+<div class="page-content repository new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index 22daf66b3725..4d16b0d0144c 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository milestones">
+<div class="page-content repository milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl
index 3c6bc05b109e..f8929b375d00 100644
--- a/templates/repo/issue/new.tmpl
+++ b/templates/repo/issue/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new issue">
+<div class="page-content repository new issue">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl
index c23bac3c6a68..bf253291f8cf 100644
--- a/templates/repo/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull">
+<div class="page-content repository view issue pull">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui two column stackable grid">
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
index 880faab888f5..d767de63f95d 100644
--- a/templates/repo/migrate/git.tmpl
+++ b/templates/repo/migrate/git.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 3ca7527cef7a..feab91a9ec18 100644
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index c2679e820c8f..54d7dc97e7a9 100644
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index 41f5f3c3bbec..4f6ac81186b8 100644
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl
index a8b1244523dd..8ada46e1d7dc 100644
--- a/templates/repo/migrate/migrate.tmpl
+++ b/templates/repo/migrate/migrate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new migrate">
+<div class="page-content repository new migrate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<div class="ui three stackable cards">
diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl
index fdda33a2c7e4..a4ec15fa9a66 100644
--- a/templates/repo/migrate/migrating.tmpl
+++ b/templates/repo/migrate/migrating.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository quickstart">
+<div class="page-content repository quickstart">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui grid">
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl
index 838bbdf1c1a0..080137f70d72 100644
--- a/templates/repo/projects/list.tmpl
+++ b/templates/repo/projects/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository milestones">
+<div class="page-content repository milestones">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl
index aabc09c80d4c..f668ab6018df 100644
--- a/templates/repo/projects/new.tmpl
+++ b/templates/repo/projects/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new milestone">
+<div class="page-content repository new milestone">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index ee82f2401024..d90a0d38ae0d 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository">
+<div class="page-content repository">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui three column stackable grid">
diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl
index 422295f55bca..ecfe09c1ecbf 100644
--- a/templates/repo/pulls/commits.tmpl
+++ b/templates/repo/pulls/commits.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull commits">
+<div class="page-content repository view issue pull commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="navbar">
diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl
index 4caebf0b563f..60f47408c26d 100644
--- a/templates/repo/pulls/files.tmpl
+++ b/templates/repo/pulls/files.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository view issue pull files diff">
+<div class="page-content repository view issue pull files diff">
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsSplitStyle}}fluid padded{{end}}">
 		<div class="navbar">
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl
index fb690e831185..360fe7372a1d 100644
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new fork">
+<div class="page-content repository new fork">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index a05d671b1558..cab054224ccc 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository release">
+<div class="page-content repository release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 7c38f540194a..98b6a2095f6b 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new release">
+<div class="page-content repository new release">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui dividing header">
diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl
index 6aa556773937..ca39c9a2f468 100644
--- a/templates/repo/search.tmpl
+++ b/templates/repo/search.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository file list">
+<div class="page-content repository file list">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui repo-search">
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index be68e9bcbc88..81e80215c5a2 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings edit">
+<div class="page-content repository settings edit">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 1d49fc54dc82..b6e659d592a4 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings collaboration">
+<div class="page-content repository settings collaboration">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index d6fb87bb83a1..8a75903bce11 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings">
+<div class="page-content repository settings">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 4d68d9bfb101..70a67554dda8 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings edit githook">
+<div class="page-content repository settings edit githook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 522ec75e8316..40bc787c8dcd 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings githooks">
+<div class="page-content repository settings githooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 38dd547468b7..b6a0581583cb 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index e5736a059f03..09eeb3f27fe8 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index cfef51b3cc05..83a2e317d57f 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index c895896bcd98..674c2b64508a 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container repository file list">
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 1bd48de15780..8a50c1bdf84b 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings lfs">
+<div class="page-content repository settings lfs">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 96414731bc98..0894ecbec267 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings options">
+<div class="page-content repository settings options">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 1fbd28d8bd5e..35d6d4ab11c9 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings branches">
+<div class="page-content repository settings branches">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index 6f486131f723..a9404790dc4a 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings webhooks">
+<div class="page-content repository settings webhooks">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index cf4c541bb0de..fc78db8648bd 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository settings new webhook">
+<div class="page-content repository settings new webhook">
 	{{template "repo/header" .}}
 	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl
index 235ebf23b682..6afb89b268df 100644
--- a/templates/repo/watchers.tmpl
+++ b/templates/repo/watchers.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository watchers">
+<div class="page-content repository watchers">
 	{{template "repo/header" .}}
 	{{template "repo/user_cards" .}}
 </div>
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl
index 002a36de96b1..06450a6ec497 100644
--- a/templates/repo/wiki/new.tmpl
+++ b/templates/repo/wiki/new.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki new">
+<div class="page-content repository wiki new">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl
index c3fb412c5727..3afa7772de60 100644
--- a/templates/repo/wiki/pages.tmpl
+++ b/templates/repo/wiki/pages.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki pages">
+<div class="page-content repository wiki pages">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<h2 class="ui header df ac sb">
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 5f1fa08a53fc..cd1adfb547cb 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki revisions">
+<div class="page-content repository wiki revisions">
 	{{template "repo/header" .}}
 	{{ $title := .title}}
 	<div class="ui container">
diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl
index d8de0fcb77cb..e9b7ecb6c959 100644
--- a/templates/repo/wiki/start.tmpl
+++ b/templates/repo/wiki/start.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki start">
+<div class="page-content repository wiki start">
 	{{template "repo/header" .}}
 	<div class="ui container">
 		<div class="ui center segment">
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 05a85a516877..255fe5250323 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository wiki view">
+<div class="page-content repository wiki view">
 	{{template "repo/header" .}}
 	{{ $title := .title}}
 	<div class="ui container">
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index bd739280d76d..c5f549bf540d 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,10 +1,12 @@
 {{template "base/head" .}}
-{{if .IsRepo}}<div class="repository">{{template "repo/header" .}}</div>{{end}}
-<div class="ui container center">
-	<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>
-	<div class="ui divider"></div>
-	<br>
-	<p>{{.i18n.Tr "error404" | Safe}}
-	{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+<div class="page-content ui container center {{if .IsRepo}}repository{{end}}">
+	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
+	<div class="ui container center">
+		<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p>
+		<div class="ui divider"></div>
+		<br>
+		<p>{{.i18n.Tr "error404" | Safe}}
+		{{if .ShowFooterVersion}}<p>{{.i18n.Tr "admin.config.app_ver"}}: {{AppVer}}</p>{{end}}
+	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index c66897822a46..d20b06b10951 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui container center">
+<div class="page-content ui container center">
 	<p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p>
 	<div class="ui divider"></div>
 	<br>
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl
index c3f136add429..7f9021ae4fa2 100644
--- a/templates/user/auth/activate.tmpl
+++ b/templates/user/auth/activate.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user activate">
+<div class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
diff --git a/templates/user/auth/change_passwd.tmpl b/templates/user/auth/change_passwd.tmpl
index d84796348ef1..b1d8c9db2cb8 100644
--- a/templates/user/auth/change_passwd.tmpl
+++ b/templates/user/auth/change_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui container">
 		{{template "user/auth/change_passwd_inner" .}}
 	</div>
diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl
index 386b4ed8fa9d..57e9d14ed4e8 100644
--- a/templates/user/auth/finalize_openid.tmpl
+++ b/templates/user/auth/finalize_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui container">
 		<div class="ui grid">
 			{{template "user/auth/finalize_openid_navbar" .}}
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index 111e42a3df9b..241deeed4a79 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user forgot password">
+<div class="page-content user forgot password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl
index b67bfa110c1f..4c637a46f827 100644
--- a/templates/user/auth/grant.tmpl
+++ b/templates/user/auth/grant.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="ui one column stackable center aligned page grid oauth2-authorize-application-box">
+<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box">
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
 			<h3 class="ui top attached header">
diff --git a/templates/user/auth/grant_error.tmpl b/templates/user/auth/grant_error.tmpl
index 0eb175fbe289..83bd882178f0 100644
--- a/templates/user/auth/grant_error.tmpl
+++ b/templates/user/auth/grant_error.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
-{{if .IsRepo}}<div class="repository">{{template "repo/header" .}}</div>{{end}}
-<div class="ui one column stackable center aligned page grid oauth2-authorize-application-box">
+<div class="page-content ui one column stackable center aligned page grid oauth2-authorize-application-box {{if .IsRepo}}repository{{end}}">
+	{{if .IsRepo}}{{template "repo/header" .}}{{end}}
 	<div class="column seven wide">
 		<div class="ui middle centered raised segments">
 			<h1 class="ui top attached header">
diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl
index 8e1509b8ce28..183c16aa127a 100644
--- a/templates/user/auth/link_account.tmpl
+++ b/templates/user/auth/link_account.tmpl
@@ -1,6 +1,5 @@
 {{template "base/head" .}}
-
-<div class="user link-account">
+<div class="page-content user link-account">
 	<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
 		<div class="new-menu-inner">
 			<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
diff --git a/templates/user/auth/prohibit_login.tmpl b/templates/user/auth/prohibit_login.tmpl
index eec0f08e7440..b773ef16e6b6 100644
--- a/templates/user/auth/prohibit_login.tmpl
+++ b/templates/user/auth/prohibit_login.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user activate">
+<div class="page-content user activate">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form">
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index 7d60fe4a867b..927cf6f5c3b2 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user reset password">
+<div class="page-content user reset password">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl
index cee40acfc4b9..4785b3094c64 100644
--- a/templates/user/auth/signin.tmpl
+++ b/templates/user/auth/signin.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui middle very relaxed page grid">
 		<div class="ui container column">
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
index 6df235ffc4e3..85ebcd90f8e5 100644
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -18,6 +18,4 @@
 		{{end}}
 	</div>
 </div>
-{{else}}
-	<div class="mt-4"></div>
 {{end}}
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index a9c0067baf5a..d7fb641e0d6b 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin openid">
+<div class="page-content user signin openid">
 	{{template "user/auth/signin_navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index 69319864732c..7b11731c8062 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin{{if .LinkAccountMode}} icon{{end}}">
+<div class="page-content user signin{{if .LinkAccountMode}} icon{{end}}">
 	<div class="ui middle very relaxed page grid">
 		{{template "user/auth/signup_inner" .}}
 	</div>
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index 9fce212c58cc..de97876190de 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signup">
+<div class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index 80e98dcc6173..3138cfe13b50 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signup">
+<div class="page-content user signup">
 	{{template "user/auth/signup_openid_navbar" .}}
 	<div class="ui container">
 				{{template "base/alert" .}}
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
index 56f9101500d8..b8b489242695 100644
--- a/templates/user/auth/twofa.tmpl
+++ b/templates/user/auth/twofa.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 78aab3e57567..44022300c386 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/auth/u2f.tmpl b/templates/user/auth/u2f.tmpl
index 1d1be09cbfbf..2013d149377d 100644
--- a/templates/user/auth/u2f.tmpl
+++ b/templates/user/auth/u2f.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user signin">
+<div class="page-content user signin">
 	<div class="ui middle centered very relaxed page grid">
 		<div class="column">
 			<h3 class="ui top attached header">
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index dc04d656518f..3eb8294e7725 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard feeds">
+<div class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 131ca40b3de0..d4e7cb38b6a3 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard issues">
+<div class="page-content dashboard issues">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 16b5cf728688..92624fb24fdf 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="dashboard issues repository milestones">
+<div class="page-content dashboard issues repository milestones">
 	{{template "user/dashboard/navbar" .}}
 	<div class="ui container">
 		<div class="ui stackable grid">
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index d35009107ae5..2f25e733877d 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -1,4 +1,4 @@
-<div class="user notification" id="notification_div" data-params="{{.Page.GetParams}}">
+<div class="page-content user notification" id="notification_div" data-params="{{.Page.GetParams}}">
 	<div class="ui container">
 		<h1 class="ui dividing header">{{.i18n.Tr "notification.notifications"}}</h1>
         <div class="ui top attached tabular menu">
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 1076efec0b52..12498868f480 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user profile mt-5">
+<div class="page-content user profile">
 	<div class="ui container">
 		<div class="ui stackable grid">
 			<div class="ui five wide column">
diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl
index 64f671ae4a7c..d4db08a77f34 100644
--- a/templates/user/project.tmpl
+++ b/templates/user/project.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="repository new repo">
+<div class="page-content repository new repo">
 	<div class="ui middle very relaxed page grid">
 		<div class="column">
 			<form class="ui form" action="{{.Link}}" method="post">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 8467d5b45fe1..d753f9082e4b 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings account">
+<div class="page-content user settings account">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 56f78d8e62b7..21ea14d5d8de 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings applications">
+<div class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index 495f8ec1688f..209b2a7c6fc8 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings applications">
+<div class="page-content user settings applications">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 3653761ac592..c88868d000f4 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings sshkeys">
+<div class="page-content user settings sshkeys">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 00b73f94d99f..8d03ddead9de 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings organization">
+<div class="page-content user settings organization">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 141be2d72da9..7ec8d2a15fc1 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings profile">
+<div class="page-content user settings profile">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 68ed8392fd90..312b19349e67 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings repos">
+<div class="page-content user settings repos">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/security.tmpl b/templates/user/settings/security.tmpl
index c2c99c79794d..891f7b953517 100644
--- a/templates/user/settings/security.tmpl
+++ b/templates/user/settings/security.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings security">
+<div class="page-content user settings security">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/templates/user/settings/twofa_enroll.tmpl b/templates/user/settings/twofa_enroll.tmpl
index 0205532ac8f4..c8ed0b77610f 100644
--- a/templates/user/settings/twofa_enroll.tmpl
+++ b/templates/user/settings/twofa_enroll.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings twofa">
+<div class="page-content user settings twofa">
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less
index 09e3ef7b7664..a3f223e0f5f2 100644
--- a/web_src/less/_admin.less
+++ b/web_src/less/_admin.less
@@ -1,8 +1,4 @@
 .admin {
-  &.notice {
-    padding-top: 15px;
-  }
-
   .table.segment {
     padding: 0;
     font-size: 13px;
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index d2dd9dcb3f0f..cb91fa118b72 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -238,6 +238,16 @@ a.muted:hover,
   color: var(--color-text-light-2);
 }
 
+.page-content {
+  margin-top: 15px;
+}
+
+.page-content .header-wrapper,
+.page-content .new-menu {
+  margin-top: -15px !important;
+  padding-top: 15px !important;
+}
+
 .ui.input.focus > input,
 .ui.input > input:focus {
   border-color: var(--color-primary);
@@ -515,6 +525,10 @@ a.muted:hover,
   height: auto;
 }
 
+.ui.loading.segment::before {
+  background: none;
+}
+
 .ui.loading.loading.input > i.icon svg {
   visibility: hidden;
 }
@@ -1101,7 +1115,6 @@ footer {
 }
 
 .ui.menu.new-menu {
-  padding-top: 15px;
   margin-bottom: 15px;
   background: var(--color-navbar);
   border-bottom: 1px solid var(--color-secondary) !important;
diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less
index 923026fcddb3..d340f2855332 100644
--- a/web_src/less/_dashboard.less
+++ b/web_src/less/_dashboard.less
@@ -71,7 +71,6 @@
     width: 100vw;
     padding-left: .5rem;
     padding-right: .5rem;
-    padding-top: 15px;
     .org-visibility .label {
       margin-left: 5px;
     }
diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less
index 90853d246458..5962d411e3af 100644
--- a/web_src/less/_explore.less
+++ b/web_src/less/_explore.less
@@ -1,7 +1,6 @@
 .explore {
   .navbar {
     justify-content: center;
-    padding-top: 15px !important;
     margin-bottom: 15px !important;
     background-color: var(--color-navbar) !important;
     border-width: 1px !important;
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 55cc4f78b76c..a830e14c18d4 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -143,7 +143,6 @@
 
   .header-wrapper {
     background-color: var(--color-navbar);
-    padding-top: 15px;
 
     .ui.tabs.divider {
       border-bottom: 0;