From 08b37a8ec1067d35ca0ff889d5a478fb104d81b0 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 20:08:34 +0800
Subject: [PATCH 01/21] save changes for admin

---
 templates/admin/applications/list.tmpl        |  18 +-
 templates/admin/applications/oauth2_edit.tmpl |  11 +-
 templates/admin/auth/edit.tmpl                | 836 +++++++++---------
 templates/admin/auth/list.tmpl                |  72 +-
 templates/admin/auth/new.tmpl                 | 216 ++---
 templates/admin/config.tmpl                   | 782 ++++++++--------
 templates/admin/dashboard.tmpl                | 286 +++---
 templates/admin/emails/list.tmpl              | 178 ++--
 templates/admin/hook_new.tmpl                 | 106 +--
 templates/admin/hooks.tmpl                    |  14 +-
 templates/admin/monitor.tmpl                  |  70 +-
 templates/admin/navbar.tmpl                   |   5 +-
 templates/admin/notice.tmpl                   | 130 +--
 templates/admin/org/list.tmpl                 | 104 +--
 templates/admin/packages/list.tmpl            | 150 ++--
 templates/admin/queue.tmpl                    | 316 +++----
 templates/admin/repo/list.tmpl                | 178 ++--
 templates/admin/repo/unadopted.tmpl           | 174 ++--
 templates/admin/runners/base.tmpl             |   8 +-
 templates/admin/runners/edit.tmpl             |   8 +-
 templates/admin/stacktrace.tmpl               |  30 +-
 templates/admin/user/edit.tmpl                | 356 ++++----
 templates/admin/user/list.tmpl                | 204 ++---
 templates/admin/user/new.tmpl                 | 160 ++--
 24 files changed, 2253 insertions(+), 2159 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 4da6cb044659..4758b353a62f 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,13 +1,17 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		<div class="twelve wide column content">
-			{{template "base/alert" .}}
-			<h4 class="ui top attached header">
-					{{.locale.Tr "settings.applications"}}
-			</h4>
-			{{template "user/settings/applications_oauth2_list" .}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				<div class="twelve wide column content">
+					{{template "base/alert" .}}
+					<h4 class="ui top attached header">
+							{{.locale.Tr "settings.applications"}}
+					</h4>
+					{{template "user/settings/applications_oauth2_list" .}}
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index 20231c4b1ca9..ab28c11778e4 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,7 +1,12 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
-
-	{{template "user/settings/applications_oauth2_edit_form" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "user/settings/applications_oauth2_edit_form" .}}
+			</div>
+		</div>
+	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 49007e572da9..9baa4292e917 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,441 +1,445 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.auths.edit"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="id" value="{{.Source.ID}}">
-				<div class="inline field">
-					<label>{{$.locale.Tr "admin.auths.auth_type"}}</label>
-					<input type="hidden" id="auth_type" name="type" value="{{.Source.Type.Int}}">
-					<span>{{.Source.TypeName}}</span>
-				</div>
-				<div class="required inline field {{if .Err_Name}}error{{end}}">
-					<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
-					<input id="name" name="name" value="{{.Source.Name}}" autofocus required>
-				</div>
-
-				<!-- LDAP and DLDAP -->
-				{{if or .Source.IsLDAP .Source.IsDLDAP}}
-					{{$cfg:=.Source.Cfg}}
-					<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
-						<label>{{.locale.Tr "admin.auths.security_protocol"}}</label>
-						<div class="ui selection security-protocol dropdown">
-							<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol.Int}}">
-							<div class="text">{{$cfg.SecurityProtocolName}}</div>
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="menu">
-								{{range .SecurityProtocols}}
-									<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
-								{{end}}
-							</div>
-						</div>
-					</div>
-					<div class="required field">
-						<label for="host">{{.locale.Tr "admin.auths.host"}}</label>
-						<input id="host" name="host" value="{{$cfg.Host}}" placeholder="e.g. mydomain.com" required>
-					</div>
-					<div class="required field">
-						<label for="port">{{.locale.Tr "admin.auths.port"}}</label>
-						<input id="port" name="port" value="{{$cfg.Port}}"  placeholder="e.g. 636" required>
-					</div>
-					<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
-							<input name="skip_verify" type="checkbox" {{if .Source.SkipVerify}}checked{{end}}>
-						</div>
-					</div>
-					{{if .Source.IsLDAP}}
-						<div class="field">
-							<label for="bind_dn">{{.locale.Tr "admin.auths.bind_dn"}}</label>
-							<input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
-						</div>
-						<div class="field">
-							<label for="bind_password">{{.locale.Tr "admin.auths.bind_password"}}</label>
-							<input id="bind_password" name="bind_password" type="password" value="{{$cfg.BindPassword}}">
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.auths.edit"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="id" value="{{.Source.ID}}">
+						<div class="inline field">
+							<label>{{$.locale.Tr "admin.auths.auth_type"}}</label>
+							<input type="hidden" id="auth_type" name="type" value="{{.Source.Type.Int}}">
+							<span>{{.Source.TypeName}}</span>
 						</div>
-					{{end}}
-					<div class="{{if .Source.IsLDAP}}required{{end}} field">
-							<label for="user_base">{{.locale.Tr "admin.auths.user_base"}}</label>
-							<input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" {{if .Source.IsLDAP}}required{{end}}>
-					</div>
-					{{if .Source.IsDLDAP}}
-						<div class="required field">
-							<label for="user_dn">{{.locale.Tr "admin.auths.user_dn"}}</label>
-							<input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com" required>
+						<div class="required inline field {{if .Err_Name}}error{{end}}">
+							<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
+							<input id="name" name="name" value="{{.Source.Name}}" autofocus required>
 						</div>
-					{{end}}
-					<div class="required field">
-						<label for="filter">{{.locale.Tr "admin.auths.filter"}}</label>
-						<input id="filter" name="filter" value="{{$cfg.Filter}}" placeholder="e.g. (&(objectClass=posixAccount)(uid=%s))" required>
-					</div>
-					<div class="field">
-						<label for="admin_filter">{{.locale.Tr "admin.auths.admin_filter"}}</label>
-						<input id="admin_filter" name="admin_filter" value="{{$cfg.AdminFilter}}">
-					</div>
-					<div class="field">
-						<label for="restricted_filter">{{.locale.Tr "admin.auths.restricted_filter"}}</label>
-						<input id="restricted_filter" name="restricted_filter" value="{{$cfg.RestrictedFilter}}">
-						<p class="help">{{.locale.Tr "admin.auths.restricted_filter_helper"}}</p>
-					</div>
-					<div class="field">
-						<label for="attribute_username">{{.locale.Tr "admin.auths.attribute_username"}}</label>
-						<input id="attribute_username" name="attribute_username" value="{{$cfg.AttributeUsername}}" placeholder="{{.locale.Tr "admin.auths.attribute_username_placeholder"}}">
-					</div>
-					<div class="field">
-						<label for="attribute_name">{{.locale.Tr "admin.auths.attribute_name"}}</label>
-						<input id="attribute_name" name="attribute_name" value="{{$cfg.AttributeName}}">
-					</div>
-					<div class="field">
-						<label for="attribute_surname">{{.locale.Tr "admin.auths.attribute_surname"}}</label>
-						<input id="attribute_surname" name="attribute_surname" value="{{$cfg.AttributeSurname}}">
-					</div>
-					<div class="required field">
-						<label for="attribute_mail">{{.locale.Tr "admin.auths.attribute_mail"}}</label>
-						<input id="attribute_mail" name="attribute_mail" value="{{$cfg.AttributeMail}}" placeholder="e.g. mail" required>
-					</div>
-					<div class="field">
-						<label for="attribute_ssh_public_key">{{.locale.Tr "admin.auths.attribute_ssh_public_key"}}</label>
-						<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
-					</div>
-					<div class="field">
-						<label for="attribute_avatar">{{.locale.Tr "admin.auths.attribute_avatar"}}</label>
-						<input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="e.g. jpegPhoto">
-					</div>
 
+						<!-- LDAP and DLDAP -->
+						{{if or .Source.IsLDAP .Source.IsDLDAP}}
+							{{$cfg:=.Source.Cfg}}
+							<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
+								<label>{{.locale.Tr "admin.auths.security_protocol"}}</label>
+								<div class="ui selection security-protocol dropdown">
+									<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol.Int}}">
+									<div class="text">{{$cfg.SecurityProtocolName}}</div>
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="menu">
+										{{range .SecurityProtocols}}
+											<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
+										{{end}}
+									</div>
+								</div>
+							</div>
+							<div class="required field">
+								<label for="host">{{.locale.Tr "admin.auths.host"}}</label>
+								<input id="host" name="host" value="{{$cfg.Host}}" placeholder="e.g. mydomain.com" required>
+							</div>
+							<div class="required field">
+								<label for="port">{{.locale.Tr "admin.auths.port"}}</label>
+								<input id="port" name="port" value="{{$cfg.Port}}"  placeholder="e.g. 636" required>
+							</div>
+							<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
+									<input name="skip_verify" type="checkbox" {{if .Source.SkipVerify}}checked{{end}}>
+								</div>
+							</div>
+							{{if .Source.IsLDAP}}
+								<div class="field">
+									<label for="bind_dn">{{.locale.Tr "admin.auths.bind_dn"}}</label>
+									<input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
+								</div>
+								<div class="field">
+									<label for="bind_password">{{.locale.Tr "admin.auths.bind_password"}}</label>
+									<input id="bind_password" name="bind_password" type="password" value="{{$cfg.BindPassword}}">
+								</div>
+							{{end}}
+							<div class="{{if .Source.IsLDAP}}required{{end}} field">
+									<label for="user_base">{{.locale.Tr "admin.auths.user_base"}}</label>
+									<input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" {{if .Source.IsLDAP}}required{{end}}>
+							</div>
+							{{if .Source.IsDLDAP}}
+								<div class="required field">
+									<label for="user_dn">{{.locale.Tr "admin.auths.user_dn"}}</label>
+									<input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com" required>
+								</div>
+							{{end}}
+							<div class="required field">
+								<label for="filter">{{.locale.Tr "admin.auths.filter"}}</label>
+								<input id="filter" name="filter" value="{{$cfg.Filter}}" placeholder="e.g. (&(objectClass=posixAccount)(uid=%s))" required>
+							</div>
+							<div class="field">
+								<label for="admin_filter">{{.locale.Tr "admin.auths.admin_filter"}}</label>
+								<input id="admin_filter" name="admin_filter" value="{{$cfg.AdminFilter}}">
+							</div>
+							<div class="field">
+								<label for="restricted_filter">{{.locale.Tr "admin.auths.restricted_filter"}}</label>
+								<input id="restricted_filter" name="restricted_filter" value="{{$cfg.RestrictedFilter}}">
+								<p class="help">{{.locale.Tr "admin.auths.restricted_filter_helper"}}</p>
+							</div>
+							<div class="field">
+								<label for="attribute_username">{{.locale.Tr "admin.auths.attribute_username"}}</label>
+								<input id="attribute_username" name="attribute_username" value="{{$cfg.AttributeUsername}}" placeholder="{{.locale.Tr "admin.auths.attribute_username_placeholder"}}">
+							</div>
+							<div class="field">
+								<label for="attribute_name">{{.locale.Tr "admin.auths.attribute_name"}}</label>
+								<input id="attribute_name" name="attribute_name" value="{{$cfg.AttributeName}}">
+							</div>
+							<div class="field">
+								<label for="attribute_surname">{{.locale.Tr "admin.auths.attribute_surname"}}</label>
+								<input id="attribute_surname" name="attribute_surname" value="{{$cfg.AttributeSurname}}">
+							</div>
+							<div class="required field">
+								<label for="attribute_mail">{{.locale.Tr "admin.auths.attribute_mail"}}</label>
+								<input id="attribute_mail" name="attribute_mail" value="{{$cfg.AttributeMail}}" placeholder="e.g. mail" required>
+							</div>
+							<div class="field">
+								<label for="attribute_ssh_public_key">{{.locale.Tr "admin.auths.attribute_ssh_public_key"}}</label>
+								<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
+							</div>
+							<div class="field">
+								<label for="attribute_avatar">{{.locale.Tr "admin.auths.attribute_avatar"}}</label>
+								<input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="e.g. jpegPhoto">
+							</div>
 
-					<!-- ldap group begin -->
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.auths.enable_ldap_groups"}}</strong></label>
-							<input type="checkbox" name="groups_enabled" class="js-ldap-group-toggle" {{if $cfg.GroupsEnabled}}checked{{end}}>
-						</div>
-					</div>
-					<div id="ldap-group-options" class="ui segment secondary {{if not $cfg.GroupsEnabled}}gt-hidden{{end}}">
-						<div class="field">
-							<label>{{.locale.Tr "admin.auths.group_search_base"}}</label>
-							<input name="group_dn" value="{{$cfg.GroupDN}}" placeholder="e.g. ou=group,dc=mydomain,dc=com">
-						</div>
-						<div class="field">
-							<label>{{.locale.Tr "admin.auths.group_attribute_list_users"}}</label>
-							<input name="group_member_uid" value="{{$cfg.GroupMemberUID}}" placeholder="e.g. memberUid">
-						</div>
-						<div class="field">
-							<label>{{.locale.Tr "admin.auths.user_attribute_in_group"}}</label>
-							<input name="user_uid" value="{{$cfg.UserUID}}" placeholder="e.g. uid">
-						</div>
-						<div class="field">
-							<label>{{.locale.Tr "admin.auths.verify_group_membership"}}</label>
-							<input name="group_filter" value="{{$cfg.GroupFilter}}" placeholder="e.g. (|(cn=gitea_users)(cn=admins))">
-						</div>
-						<div class="field">
-							<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
-							<input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
-						</div>
-						<div class="ui checkbox">
-							<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
-							<input name="group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
-						</div>
-					</div>
-					<!-- ldap group end -->
 
-					{{if .Source.IsLDAP}}
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label for="use_paged_search"><strong>{{.locale.Tr "admin.auths.use_paged_search"}}</strong></label>
-								<input id="use_paged_search" name="use_paged_search" type="checkbox" {{if $cfg.UsePagedSearch}}checked{{end}}>
+							<!-- ldap group begin -->
+							<div class="inline field">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.auths.enable_ldap_groups"}}</strong></label>
+									<input type="checkbox" name="groups_enabled" class="js-ldap-group-toggle" {{if $cfg.GroupsEnabled}}checked{{end}}>
+								</div>
 							</div>
-						</div>
-						<div class="field required search-page-size{{if not $cfg.UsePagedSearch}} gt-hidden{{end}}">
-							<label for="search_page_size">{{.locale.Tr "admin.auths.search_page_size"}}</label>
-							<input id="search_page_size" name="search_page_size" value="{{if $cfg.UsePagedSearch}}{{$cfg.SearchPageSize}}{{end}}">
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
-								<input name="attributes_in_bind" type="checkbox" {{if $cfg.AttributesInBind}}checked{{end}}>
+							<div id="ldap-group-options" class="ui segment secondary {{if not $cfg.GroupsEnabled}}gt-hidden{{end}}">
+								<div class="field">
+									<label>{{.locale.Tr "admin.auths.group_search_base"}}</label>
+									<input name="group_dn" value="{{$cfg.GroupDN}}" placeholder="e.g. ou=group,dc=mydomain,dc=com">
+								</div>
+								<div class="field">
+									<label>{{.locale.Tr "admin.auths.group_attribute_list_users"}}</label>
+									<input name="group_member_uid" value="{{$cfg.GroupMemberUID}}" placeholder="e.g. memberUid">
+								</div>
+								<div class="field">
+									<label>{{.locale.Tr "admin.auths.user_attribute_in_group"}}</label>
+									<input name="user_uid" value="{{$cfg.UserUID}}" placeholder="e.g. uid">
+								</div>
+								<div class="field">
+									<label>{{.locale.Tr "admin.auths.verify_group_membership"}}</label>
+									<input name="group_filter" value="{{$cfg.GroupFilter}}" placeholder="e.g. (|(cn=gitea_users)(cn=admins))">
+								</div>
+								<div class="field">
+									<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
+									<input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
+								</div>
+								<div class="ui checkbox">
+									<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
+									<input name="group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
+								</div>
 							</div>
-						</div>
-					{{end}}
-					<div class="optional field">
-						<div class="ui checkbox">
-							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-						</div>
-					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label for="allow_deactivate_all"><strong>{{.locale.Tr "admin.auths.allow_deactivate_all"}}</strong></label>
-							<input id="allow_deactivate_all" name="allow_deactivate_all" type="checkbox" {{if $cfg.AllowDeactivateAll}}checked{{end}}>
-						</div>
-					</div>
-				{{end}}
+							<!-- ldap group end -->
 
-				<!-- SMTP -->
-				{{if .Source.IsSMTP}}
-					{{$cfg:=.Source.Cfg}}
-					<div class="inline required field">
-						<label>{{.locale.Tr "admin.auths.smtp_auth"}}</label>
-						<div class="ui selection type dropdown">
-							<input type="hidden" id="smtp_auth" name="smtp_auth" value="{{$cfg.Auth}}" required>
-							<div class="text">{{$cfg.Auth}}</div>
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="menu">
-								{{range .SMTPAuths}}
-									<div class="item" data-value="{{.}}">{{.}}</div>
-								{{end}}
+							{{if .Source.IsLDAP}}
+								<div class="inline field">
+									<div class="ui checkbox">
+										<label for="use_paged_search"><strong>{{.locale.Tr "admin.auths.use_paged_search"}}</strong></label>
+										<input id="use_paged_search" name="use_paged_search" type="checkbox" {{if $cfg.UsePagedSearch}}checked{{end}}>
+									</div>
+								</div>
+								<div class="field required search-page-size{{if not $cfg.UsePagedSearch}} gt-hidden{{end}}">
+									<label for="search_page_size">{{.locale.Tr "admin.auths.search_page_size"}}</label>
+									<input id="search_page_size" name="search_page_size" value="{{if $cfg.UsePagedSearch}}{{$cfg.SearchPageSize}}{{end}}">
+								</div>
+								<div class="inline field">
+									<div class="ui checkbox">
+										<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
+										<input name="attributes_in_bind" type="checkbox" {{if $cfg.AttributesInBind}}checked{{end}}>
+									</div>
+								</div>
+							{{end}}
+							<div class="optional field">
+								<div class="ui checkbox">
+									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="required field">
-						<label for="smtp_host">{{.locale.Tr "admin.auths.smtphost"}}</label>
-						<input id="smtp_host" name="smtp_host" value="{{$cfg.Host}}" required>
-					</div>
-					<div class="required field">
-						<label for="smtp_port">{{.locale.Tr "admin.auths.smtpport"}}</label>
-						<input id="smtp_port" name="smtp_port" value="{{$cfg.Port}}" required>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<label for="force_smtps"><strong>{{.locale.Tr "admin.auths.force_smtps"}}</strong></label>
-							<input id="force_smtps" name="force_smtps" type="checkbox" {{if $cfg.ForceSMTPS}}checked{{end}}>
-						</div>
-						<p class="help">{{.locale.Tr "admin.auths.force_smtps_helper"}}</p>
-					</div>
-					<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
-							<input name="skip_verify" type="checkbox" {{if $cfg.SkipVerify}}checked{{end}}>
-						</div>
-					</div>
-					<div class="field">
-						<label for="helo_hostname">{{.locale.Tr "admin.auths.helo_hostname"}}</label>
-						<input id="helo_hostname" name="helo_hostname" value="{{$cfg.HeloHostname}}">
-						<p class="help">{{.locale.Tr "admin.auths.helo_hostname_helper"}}</p>
-					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label for="disable_helo"><strong>{{.locale.Tr "admin.auths.disable_helo"}}</strong></label>
-							<input id="disable_helo" name="disable_helo" type="checkbox" {{if $cfg.DisableHelo}}checked{{end}}>
-						</div>
-					</div>
-					<div class="field">
-						<label for="allowed_domains">{{.locale.Tr "admin.auths.allowed_domains"}}</label>
-						<input id="allowed_domains" name="allowed_domains" value="{{$cfg.AllowedDomains}}">
-						<p class="help">{{.locale.Tr "admin.auths.allowed_domains_helper"}}</p>
-					</div>
-					<div class="optional field">
-						<div class="ui checkbox">
-							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-						</div>
-					</div>
-				{{end}}
+							<div class="inline field">
+								<div class="ui checkbox">
+									<label for="allow_deactivate_all"><strong>{{.locale.Tr "admin.auths.allow_deactivate_all"}}</strong></label>
+									<input id="allow_deactivate_all" name="allow_deactivate_all" type="checkbox" {{if $cfg.AllowDeactivateAll}}checked{{end}}>
+								</div>
+							</div>
+						{{end}}
 
-				<!-- PAM -->
-				{{if .Source.IsPAM}}
-					{{$cfg:=.Source.Cfg}}
-					<div class="required field">
-						<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
-						<input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required>
-					</div>
-					<div class="field">
-						<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
-						<input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}">
-					</div>
-					<div class="optional field">
-						<div class="ui checkbox">
-							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-						</div>
-					</div>
-				{{end}}
+						<!-- SMTP -->
+						{{if .Source.IsSMTP}}
+							{{$cfg:=.Source.Cfg}}
+							<div class="inline required field">
+								<label>{{.locale.Tr "admin.auths.smtp_auth"}}</label>
+								<div class="ui selection type dropdown">
+									<input type="hidden" id="smtp_auth" name="smtp_auth" value="{{$cfg.Auth}}" required>
+									<div class="text">{{$cfg.Auth}}</div>
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="menu">
+										{{range .SMTPAuths}}
+											<div class="item" data-value="{{.}}">{{.}}</div>
+										{{end}}
+									</div>
+								</div>
+							</div>
+							<div class="required field">
+								<label for="smtp_host">{{.locale.Tr "admin.auths.smtphost"}}</label>
+								<input id="smtp_host" name="smtp_host" value="{{$cfg.Host}}" required>
+							</div>
+							<div class="required field">
+								<label for="smtp_port">{{.locale.Tr "admin.auths.smtpport"}}</label>
+								<input id="smtp_port" name="smtp_port" value="{{$cfg.Port}}" required>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<label for="force_smtps"><strong>{{.locale.Tr "admin.auths.force_smtps"}}</strong></label>
+									<input id="force_smtps" name="force_smtps" type="checkbox" {{if $cfg.ForceSMTPS}}checked{{end}}>
+								</div>
+								<p class="help">{{.locale.Tr "admin.auths.force_smtps_helper"}}</p>
+							</div>
+							<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
+									<input name="skip_verify" type="checkbox" {{if $cfg.SkipVerify}}checked{{end}}>
+								</div>
+							</div>
+							<div class="field">
+								<label for="helo_hostname">{{.locale.Tr "admin.auths.helo_hostname"}}</label>
+								<input id="helo_hostname" name="helo_hostname" value="{{$cfg.HeloHostname}}">
+								<p class="help">{{.locale.Tr "admin.auths.helo_hostname_helper"}}</p>
+							</div>
+							<div class="inline field">
+								<div class="ui checkbox">
+									<label for="disable_helo"><strong>{{.locale.Tr "admin.auths.disable_helo"}}</strong></label>
+									<input id="disable_helo" name="disable_helo" type="checkbox" {{if $cfg.DisableHelo}}checked{{end}}>
+								</div>
+							</div>
+							<div class="field">
+								<label for="allowed_domains">{{.locale.Tr "admin.auths.allowed_domains"}}</label>
+								<input id="allowed_domains" name="allowed_domains" value="{{$cfg.AllowedDomains}}">
+								<p class="help">{{.locale.Tr "admin.auths.allowed_domains_helper"}}</p>
+							</div>
+							<div class="optional field">
+								<div class="ui checkbox">
+									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+								</div>
+							</div>
+						{{end}}
 
-				<!-- OAuth2 -->
-				{{if .Source.IsOAuth2}}
-					{{$cfg:=.Source.Cfg}}
-					<div class="inline required field">
-						<label>{{.locale.Tr "admin.auths.oauth2_provider"}}</label>
-						<div class="ui selection type dropdown">
-							<input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{$cfg.Provider}}" required>
-							<div class="text">{{.CurrentOAuth2Provider.DisplayName}}</div>
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="menu">
-								{{range .OAuth2Providers}}
-									<div class="item" data-value="{{.Name}}">{{.DisplayName}}</div>
-								{{end}}
+						<!-- PAM -->
+						{{if .Source.IsPAM}}
+							{{$cfg:=.Source.Cfg}}
+							<div class="required field">
+								<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
+								<input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required>
 							</div>
-						</div>
-					</div>
-					<div class="required field">
-						<label for="oauth2_key">{{.locale.Tr "admin.auths.oauth2_clientID"}}</label>
-						<input id="oauth2_key" name="oauth2_key" value="{{$cfg.ClientID}}" required>
-					</div>
-					<div class="required field">
-						<label for="oauth2_secret">{{.locale.Tr "admin.auths.oauth2_clientSecret"}}</label>
-						<input id="oauth2_secret" name="oauth2_secret" value="{{$cfg.ClientSecret}}" required>
-					</div>
-					<div class="optional field">
-						<label for="oauth2_icon_url">{{.locale.Tr "admin.auths.oauth2_icon_url"}}</label>
-						<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
-					</div>
-					<div class="open_id_connect_auto_discovery_url required field">
-						<label for="open_id_connect_auto_discovery_url">{{.locale.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
-						<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}">
-					</div>
-					<div class="optional field">
-						<div class="ui checkbox">
-							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-						</div>
-					</div>
-					<div class="oauth2_use_custom_url inline field">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label>
-							<input id="oauth2_use_custom_url" name="oauth2_use_custom_url" type="checkbox" {{if $cfg.CustomURLMapping}}checked{{end}}>
-						</div>
-					</div>
-					<div class="oauth2_use_custom_url_field oauth2_auth_url required field">
-						<label for="oauth2_auth_url">{{.locale.Tr "admin.auths.oauth2_authURL"}}</label>
-						<input id="oauth2_auth_url" name="oauth2_auth_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.AuthURL}}{{end}}">
-					</div>
-					<div class="oauth2_use_custom_url_field oauth2_token_url required field">
-						<label for="oauth2_token_url">{{.locale.Tr "admin.auths.oauth2_tokenURL"}}</label>
-						<input id="oauth2_token_url" name="oauth2_token_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.TokenURL}}{{end}}">
-					</div>
-					<div class="oauth2_use_custom_url_field oauth2_profile_url required field">
-						<label for="oauth2_profile_url">{{.locale.Tr "admin.auths.oauth2_profileURL"}}</label>
-						<input id="oauth2_profile_url" name="oauth2_profile_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.ProfileURL}}{{end}}">
-					</div>
-					<div class="oauth2_use_custom_url_field oauth2_email_url required field">
-						<label for="oauth2_email_url">{{.locale.Tr "admin.auths.oauth2_emailURL"}}</label>
-						<input id="oauth2_email_url" name="oauth2_email_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.EmailURL}}{{end}}">
-					</div>
-					<div class="oauth2_use_custom_url_field oauth2_tenant required field">
-						<label for="oauth2_tenant">{{.locale.Tr "admin.auths.oauth2_tenant"}}</label>
-						<input id="oauth2_tenant" name="oauth2_tenant" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.Tenant}}{{end}}">
-					</div>
+							<div class="field">
+								<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
+								<input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}">
+							</div>
+							<div class="optional field">
+								<div class="ui checkbox">
+									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+								</div>
+							</div>
+						{{end}}
 
-					{{range .OAuth2Providers}}{{if .CustomURLSettings}}
-						<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
-						<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
-						<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
-						<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
-						<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
-						<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
-					{{end}}{{end}}
+						<!-- OAuth2 -->
+						{{if .Source.IsOAuth2}}
+							{{$cfg:=.Source.Cfg}}
+							<div class="inline required field">
+								<label>{{.locale.Tr "admin.auths.oauth2_provider"}}</label>
+								<div class="ui selection type dropdown">
+									<input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{$cfg.Provider}}" required>
+									<div class="text">{{.CurrentOAuth2Provider.DisplayName}}</div>
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="menu">
+										{{range .OAuth2Providers}}
+											<div class="item" data-value="{{.Name}}">{{.DisplayName}}</div>
+										{{end}}
+									</div>
+								</div>
+							</div>
+							<div class="required field">
+								<label for="oauth2_key">{{.locale.Tr "admin.auths.oauth2_clientID"}}</label>
+								<input id="oauth2_key" name="oauth2_key" value="{{$cfg.ClientID}}" required>
+							</div>
+							<div class="required field">
+								<label for="oauth2_secret">{{.locale.Tr "admin.auths.oauth2_clientSecret"}}</label>
+								<input id="oauth2_secret" name="oauth2_secret" value="{{$cfg.ClientSecret}}" required>
+							</div>
+							<div class="optional field">
+								<label for="oauth2_icon_url">{{.locale.Tr "admin.auths.oauth2_icon_url"}}</label>
+								<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
+							</div>
+							<div class="open_id_connect_auto_discovery_url required field">
+								<label for="open_id_connect_auto_discovery_url">{{.locale.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
+								<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}">
+							</div>
+							<div class="optional field">
+								<div class="ui checkbox">
+									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+								</div>
+							</div>
+							<div class="oauth2_use_custom_url inline field">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label>
+									<input id="oauth2_use_custom_url" name="oauth2_use_custom_url" type="checkbox" {{if $cfg.CustomURLMapping}}checked{{end}}>
+								</div>
+							</div>
+							<div class="oauth2_use_custom_url_field oauth2_auth_url required field">
+								<label for="oauth2_auth_url">{{.locale.Tr "admin.auths.oauth2_authURL"}}</label>
+								<input id="oauth2_auth_url" name="oauth2_auth_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.AuthURL}}{{end}}">
+							</div>
+							<div class="oauth2_use_custom_url_field oauth2_token_url required field">
+								<label for="oauth2_token_url">{{.locale.Tr "admin.auths.oauth2_tokenURL"}}</label>
+								<input id="oauth2_token_url" name="oauth2_token_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.TokenURL}}{{end}}">
+							</div>
+							<div class="oauth2_use_custom_url_field oauth2_profile_url required field">
+								<label for="oauth2_profile_url">{{.locale.Tr "admin.auths.oauth2_profileURL"}}</label>
+								<input id="oauth2_profile_url" name="oauth2_profile_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.ProfileURL}}{{end}}">
+							</div>
+							<div class="oauth2_use_custom_url_field oauth2_email_url required field">
+								<label for="oauth2_email_url">{{.locale.Tr "admin.auths.oauth2_emailURL"}}</label>
+								<input id="oauth2_email_url" name="oauth2_email_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.EmailURL}}{{end}}">
+							</div>
+							<div class="oauth2_use_custom_url_field oauth2_tenant required field">
+								<label for="oauth2_tenant">{{.locale.Tr "admin.auths.oauth2_tenant"}}</label>
+								<input id="oauth2_tenant" name="oauth2_tenant" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.Tenant}}{{end}}">
+							</div>
 
-					<div class="field">
-						<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
-						<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}">
-					</div>
-					<div class="field">
-						<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
-						<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{$cfg.RequiredClaimName}}">
-						<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p>
-					</div>
-					<div class="field">
-						<label for="oauth2_required_claim_value">{{.locale.Tr "admin.auths.oauth2_required_claim_value"}}</label>
-						<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" value="{{$cfg.RequiredClaimValue}}">
-						<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}</p>
-					</div>
-					<div class="field">
-						<label for="oauth2_group_claim_name">{{.locale.Tr "admin.auths.oauth2_group_claim_name"}}</label>
-						<input id="oauth2_group_claim_name" name="oauth2_group_claim_name" value="{{$cfg.GroupClaimName}}">
-					</div>
-					<div class="field">
-						<label for="oauth2_admin_group">{{.locale.Tr "admin.auths.oauth2_admin_group"}}</label>
-						<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{$cfg.AdminGroup}}">
-					</div>
-					<div class="field">
-						<label for="oauth2_restricted_group">{{.locale.Tr "admin.auths.oauth2_restricted_group"}}</label>
-						<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{$cfg.RestrictedGroup}}">
-					</div>
-					<div class="field">
-						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
-						<input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
-					</div>
-					<div class="ui checkbox">
-						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
-						<input name="oauth2_group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
-					</div>
-				{{end}}
+							{{range .OAuth2Providers}}{{if .CustomURLSettings}}
+								<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
+								<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
+								<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
+								<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
+								<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
+								<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
+							{{end}}{{end}}
 
-				<!-- SSPI -->
-				{{if .Source.IsSSPI}}
-					{{$cfg:=.Source.Cfg}}
-					<div class="field">
-						<div class="ui checkbox">
-							<label for="sspi_auto_create_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_create_users"}}</strong></label>
-							<input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if $cfg.AutoCreateUsers}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<label for="sspi_auto_activate_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label>
-							<input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if $cfg.AutoActivateUsers}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<label for="sspi_strip_domain_names"><strong>{{.locale.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label>
-							<input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if $cfg.StripDomainNames}}checked{{end}}>
-							<p class="help">{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p>
-						</div>
-					</div>
-					<div class="required field">
-						<label for="sspi_separator_replacement">{{.locale.Tr "admin.auths.sspi_separator_replacement"}}</label>
-						<input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{$cfg.SeparatorReplacement}}" required>
-						<p class="help">{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}</p>
-					</div>
-					<div class="field">
-						<label for="sspi_default_language">{{.locale.Tr "admin.auths.sspi_default_language"}}</label>
-						<div class="ui language selection dropdown" id="sspi_default_language">
-							<input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}">
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div>
-							<div class="menu">
-								<div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div>
-							{{range .AllLangs}}
-								<div class="item{{if eq $cfg.DefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
-							{{end}}
+							<div class="field">
+								<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
+								<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}">
+							</div>
+							<div class="field">
+								<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
+								<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{$cfg.RequiredClaimName}}">
+								<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p>
+							</div>
+							<div class="field">
+								<label for="oauth2_required_claim_value">{{.locale.Tr "admin.auths.oauth2_required_claim_value"}}</label>
+								<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" value="{{$cfg.RequiredClaimValue}}">
+								<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}</p>
+							</div>
+							<div class="field">
+								<label for="oauth2_group_claim_name">{{.locale.Tr "admin.auths.oauth2_group_claim_name"}}</label>
+								<input id="oauth2_group_claim_name" name="oauth2_group_claim_name" value="{{$cfg.GroupClaimName}}">
+							</div>
+							<div class="field">
+								<label for="oauth2_admin_group">{{.locale.Tr "admin.auths.oauth2_admin_group"}}</label>
+								<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{$cfg.AdminGroup}}">
+							</div>
+							<div class="field">
+								<label for="oauth2_restricted_group">{{.locale.Tr "admin.auths.oauth2_restricted_group"}}</label>
+								<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{$cfg.RestrictedGroup}}">
+							</div>
+							<div class="field">
+								<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
+								<input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
+							</div>
+							<div class="ui checkbox">
+								<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
+								<input name="oauth2_group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
+							</div>
+						{{end}}
+
+						<!-- SSPI -->
+						{{if .Source.IsSSPI}}
+							{{$cfg:=.Source.Cfg}}
+							<div class="field">
+								<div class="ui checkbox">
+									<label for="sspi_auto_create_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_create_users"}}</strong></label>
+									<input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if $cfg.AutoCreateUsers}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<label for="sspi_auto_activate_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label>
+									<input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if $cfg.AutoActivateUsers}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<label for="sspi_strip_domain_names"><strong>{{.locale.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label>
+									<input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if $cfg.StripDomainNames}}checked{{end}}>
+									<p class="help">{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p>
+								</div>
+							</div>
+							<div class="required field">
+								<label for="sspi_separator_replacement">{{.locale.Tr "admin.auths.sspi_separator_replacement"}}</label>
+								<input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{$cfg.SeparatorReplacement}}" required>
+								<p class="help">{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}</p>
+							</div>
+							<div class="field">
+								<label for="sspi_default_language">{{.locale.Tr "admin.auths.sspi_default_language"}}</label>
+								<div class="ui language selection dropdown" id="sspi_default_language">
+									<input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}">
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div>
+									<div class="menu">
+										<div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div>
+									{{range .AllLangs}}
+										<div class="item{{if eq $cfg.DefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
+									{{end}}
+									</div>
+								</div>
+								<p class="help">{{.locale.Tr "admin.auths.sspi_default_language_helper"}}</p>
+							</div>
+						{{end}}
+						{{if .Source.IsLDAP}}
+							<div class="inline field">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
+									<input name="is_sync_enabled" type="checkbox" {{if .Source.IsSyncEnabled}}checked{{end}}>
+								</div>
+							</div>
+						{{end}}
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
+								<input name="is_active" type="checkbox" {{if .Source.IsActive}}checked{{end}}>
 							</div>
 						</div>
-						<p class="help">{{.locale.Tr "admin.auths.sspi_default_language_helper"}}</p>
-					</div>
-				{{end}}
-				{{if .Source.IsLDAP}}
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
-							<input name="is_sync_enabled" type="checkbox" {{if .Source.IsSyncEnabled}}checked{{end}}>
-						</div>
-					</div>
-				{{end}}
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
-						<input name="is_active" type="checkbox" {{if .Source.IsActive}}checked{{end}}>
-					</div>
-				</div>
 
-				<div class="field">
-					<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button>
-					<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</button>
+						<div class="field">
+							<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button>
+							<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 3b8d17ff7d23..9bdb0583a7b4 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,41 +1,45 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/auths/new">{{.locale.Tr "admin.auths.new"}}</a>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/auths/new">{{.locale.Tr "admin.auths.new"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th>ID</th>
+								<th>{{.locale.Tr "admin.auths.name"}}</th>
+								<th>{{.locale.Tr "admin.auths.type"}}</th>
+								<th>{{.locale.Tr "admin.auths.enabled"}}</th>
+								<th>{{.locale.Tr "admin.auths.updated"}}</th>
+								<th>{{.locale.Tr "admin.users.created"}}</th>
+								<th>{{.locale.Tr "admin.users.edit"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Sources}}
+								<tr>
+									<td>{{.ID}}</td>
+									<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
+									<td>{{.TypeName}}</td>
+									<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+									<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
 			</div>
-		</h4>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th>ID</th>
-						<th>{{.locale.Tr "admin.auths.name"}}</th>
-						<th>{{.locale.Tr "admin.auths.type"}}</th>
-						<th>{{.locale.Tr "admin.auths.enabled"}}</th>
-						<th>{{.locale.Tr "admin.auths.updated"}}</th>
-						<th>{{.locale.Tr "admin.users.created"}}</th>
-						<th>{{.locale.Tr "admin.users.edit"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Sources}}
-						<tr>
-							<td>{{.ID}}</td>
-							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
-							<td>{{.TypeName}}</td>
-							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index b7715cb5fe42..696c3ddac226 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,124 +1,128 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.auths.new"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<!-- Types and name -->
-				<div class="inline required field {{if .Err_Type}}error{{end}}">
-					<label>{{.locale.Tr "admin.auths.auth_type"}}</label>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="auth_type" name="type" value="{{.type}}">
-						<div class="text">{{.CurrentTypeName}}</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							{{range .AuthSources}}
-								<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
-							{{end}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.auths.new"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<!-- Types and name -->
+						<div class="inline required field {{if .Err_Type}}error{{end}}">
+							<label>{{.locale.Tr "admin.auths.auth_type"}}</label>
+							<div class="ui selection type dropdown">
+								<input type="hidden" id="auth_type" name="type" value="{{.type}}">
+								<div class="text">{{.CurrentTypeName}}</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									{{range .AuthSources}}
+										<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
+									{{end}}
+								</div>
+							</div>
+						</div>
+						<div class="required inline field {{if .Err_Name}}error{{end}}">
+							<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
+							<input id="name" name="name" value="{{.name}}" autofocus required>
 						</div>
-					</div>
-				</div>
-				<div class="required inline field {{if .Err_Name}}error{{end}}">
-					<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
-					<input id="name" name="name" value="{{.name}}" autofocus required>
-				</div>
 
-				<!-- LDAP and DLDAP -->
-				{{template "admin/auth/source/ldap" .}}
+						<!-- LDAP and DLDAP -->
+						{{template "admin/auth/source/ldap" .}}
 
-				<!-- SMTP -->
-				{{template "admin/auth/source/smtp" .}}
+						<!-- SMTP -->
+						{{template "admin/auth/source/smtp" .}}
 
-				<!-- PAM -->
-				<div class="pam required field {{if not (eq .type 4)}}gt-hidden{{end}}">
-					<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
-					<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}">
-					<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
-					<input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}">
-				</div>
-				<div class="pam optional field {{if not (eq .type 4)}}gt-hidden{{end}}">
-					<div class="ui checkbox">
-						<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-						<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if .skip_local_two_fa}}checked{{end}}>
-						<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-					</div>
-				</div>
+						<!-- PAM -->
+						<div class="pam required field {{if not (eq .type 4)}}gt-hidden{{end}}">
+							<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
+							<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}">
+							<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
+							<input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}">
+						</div>
+						<div class="pam optional field {{if not (eq .type 4)}}gt-hidden{{end}}">
+							<div class="ui checkbox">
+								<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+								<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if .skip_local_two_fa}}checked{{end}}>
+								<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+							</div>
+						</div>
 
-				<!-- OAuth2 -->
-				{{template "admin/auth/source/oauth" .}}
+						<!-- OAuth2 -->
+						{{template "admin/auth/source/oauth" .}}
 
-				<!-- SSPI -->
-				{{template "admin/auth/source/sspi" .}}
+						<!-- SSPI -->
+						{{template "admin/auth/source/sspi" .}}
 
-				<div class="ldap field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
-						<input name="attributes_in_bind" type="checkbox" {{if .attributes_in_bind}}checked{{end}}>
-					</div>
-				</div>
-				<div class="ldap inline field {{if not (eq .type 2)}}gt-hidden{{end}}">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
-						<input name="is_sync_enabled" type="checkbox" {{if .is_sync_enabled}}checked{{end}}>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
-						<input name="is_active" type="checkbox" {{if .is_active}}checked{{end}}>
-					</div>
-				</div>
+						<div class="ldap field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
+								<input name="attributes_in_bind" type="checkbox" {{if .attributes_in_bind}}checked{{end}}>
+							</div>
+						</div>
+						<div class="ldap inline field {{if not (eq .type 2)}}gt-hidden{{end}}">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
+								<input name="is_sync_enabled" type="checkbox" {{if .is_sync_enabled}}checked{{end}}>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
+								<input name="is_active" type="checkbox" {{if .is_active}}checked{{end}}>
+							</div>
+						</div>
 
-				<div class="field">
-					<button class="ui green button">{{.locale.Tr "admin.auths.new"}}</button>
+						<div class="field">
+							<button class="ui green button">{{.locale.Tr "admin.auths.new"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.auths.tips"}}
-		</h4>
-		<div class="ui attached segment">
-			<h5>GMail Settings:</h5>
-			<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.auths.tips"}}
+				</h4>
+				<div class="ui attached segment">
+					<h5>GMail Settings:</h5>
+					<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
 
-			<h5>{{.locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>
-			<p>{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}</p>
+					<h5>{{.locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>
+					<p>{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}</p>
 
-			<h5 class="ui top attached header">{{.locale.Tr "admin.auths.tip.oauth2_provider"}}</h5>
-			<div class="ui attached segment">
-				<li>Bitbucket</li>
-				<span>{{.locale.Tr "admin.auths.tip.bitbucket"}}</span>
-				<li>Dropbox</li>
-				<span>{{.locale.Tr "admin.auths.tip.dropbox"}}</span>
-				<li>Facebook</li>
-				<span>{{.locale.Tr "admin.auths.tip.facebook"}}</span>
-				<li>GitHub</li>
-				<span>{{.locale.Tr "admin.auths.tip.github"}}</span>
-				<li>GitLab</li>
-				<span>{{.locale.Tr "admin.auths.tip.gitlab"}}</span>
-				<li>Google</li>
-				<span>{{.locale.Tr "admin.auths.tip.google_plus"}}</span>
-				<li>OpenID Connect</li>
-				<span>{{.locale.Tr "admin.auths.tip.openid_connect"}}</span>
-				<li>Twitter</li>
-				<span>{{.locale.Tr "admin.auths.tip.twitter"}}</span>
-				<li>Discord</li>
-				<span>{{.locale.Tr "admin.auths.tip.discord"}}</span>
-				<li>Gitea</li>
-				<span>{{.locale.Tr "admin.auths.tip.gitea"}}</span>
-				<li>Nextcloud</li>
-				<span>{{.locale.Tr "admin.auths.tip.nextcloud"}}</span>
-				<li>Yandex</li>
-				<span>{{.locale.Tr "admin.auths.tip.yandex"}}</span>
-				<li>Mastodon</li>
-				<span>{{.locale.Tr "admin.auths.tip.mastodon"}}</span>
+					<h5 class="ui top attached header">{{.locale.Tr "admin.auths.tip.oauth2_provider"}}</h5>
+					<div class="ui attached segment">
+						<li>Bitbucket</li>
+						<span>{{.locale.Tr "admin.auths.tip.bitbucket"}}</span>
+						<li>Dropbox</li>
+						<span>{{.locale.Tr "admin.auths.tip.dropbox"}}</span>
+						<li>Facebook</li>
+						<span>{{.locale.Tr "admin.auths.tip.facebook"}}</span>
+						<li>GitHub</li>
+						<span>{{.locale.Tr "admin.auths.tip.github"}}</span>
+						<li>GitLab</li>
+						<span>{{.locale.Tr "admin.auths.tip.gitlab"}}</span>
+						<li>Google</li>
+						<span>{{.locale.Tr "admin.auths.tip.google_plus"}}</span>
+						<li>OpenID Connect</li>
+						<span>{{.locale.Tr "admin.auths.tip.openid_connect"}}</span>
+						<li>Twitter</li>
+						<span>{{.locale.Tr "admin.auths.tip.twitter"}}</span>
+						<li>Discord</li>
+						<span>{{.locale.Tr "admin.auths.tip.discord"}}</span>
+						<li>Gitea</li>
+						<span>{{.locale.Tr "admin.auths.tip.gitea"}}</span>
+						<li>Nextcloud</li>
+						<span>{{.locale.Tr "admin.auths.tip.nextcloud"}}</span>
+						<li>Yandex</li>
+						<span>{{.locale.Tr "admin.auths.tip.yandex"}}</span>
+						<li>Mastodon</li>
+						<span>{{.locale.Tr "admin.auths.tip.mastodon"}}</span>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 14281c70c068..bb033c871886 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,429 +1,433 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.server_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.app_name"}}</dt>
-				<dd>{{AppName}}</dd>
-				<dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
-				<dd>{{AppVer}}{{.AppBuiltWith}}</dd>
-				<dt>{{.locale.Tr "admin.config.custom_conf"}}</dt>
-				<dd>{{.CustomConf}}</dd>
-				<dt>{{.locale.Tr "admin.config.app_url"}}</dt>
-				<dd>{{.AppUrl}}</dd>
-				<dt>{{.locale.Tr "admin.config.domain"}}</dt>
-				<dd>{{.Domain}}</dd>
-				<dt>{{.locale.Tr "admin.config.offline_mode"}}</dt>
-				<dd>{{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.disable_router_log"}}</dt>
-				<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.server_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.app_name"}}</dt>
+						<dd>{{AppName}}</dd>
+						<dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
+						<dd>{{AppVer}}{{.AppBuiltWith}}</dd>
+						<dt>{{.locale.Tr "admin.config.custom_conf"}}</dt>
+						<dd>{{.CustomConf}}</dd>
+						<dt>{{.locale.Tr "admin.config.app_url"}}</dt>
+						<dd>{{.AppUrl}}</dd>
+						<dt>{{.locale.Tr "admin.config.domain"}}</dt>
+						<dd>{{.Domain}}</dd>
+						<dt>{{.locale.Tr "admin.config.offline_mode"}}</dt>
+						<dd>{{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.disable_router_log"}}</dt>
+						<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<dt>{{.locale.Tr "admin.config.run_user"}}</dt>
-				<dd>{{.RunUser}}</dd>
-				<dt>{{.locale.Tr "admin.config.run_mode"}}</dt>
-				<dd>{{.RunMode}}</dd>
+						<dt>{{.locale.Tr "admin.config.run_user"}}</dt>
+						<dd>{{.RunUser}}</dd>
+						<dt>{{.locale.Tr "admin.config.run_mode"}}</dt>
+						<dd>{{.RunMode}}</dd>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<dt>{{.locale.Tr "admin.config.git_version"}}</dt>
-				<dd>{{.GitVersion}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_version"}}</dt>
+						<dd>{{.GitVersion}}</dd>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<dt>{{.locale.Tr "admin.config.repo_root_path"}}</dt>
-				<dd>{{.RepoRootPath}}</dd>
-				<dt>{{.locale.Tr "admin.config.static_file_root_path"}}</dt>
-				<dd>{{.StaticRootPath}}</dd>
-				<dt>{{.locale.Tr "admin.config.custom_file_root_path"}}</dt>
-				<dd>{{.CustomRootPath}}</dd>
-				<dt>{{.locale.Tr "admin.config.log_file_root_path"}}</dt>
-				<dd>{{.LogRootPath}}</dd>
-				<dt>{{.locale.Tr "admin.config.script_type"}}</dt>
-				<dd>{{.ScriptType}}</dd>
-				<dt>{{.locale.Tr "admin.config.reverse_auth_user"}}</dt>
-				<dd>{{.ReverseProxyAuthUser}}</dd>
+						<dt>{{.locale.Tr "admin.config.repo_root_path"}}</dt>
+						<dd>{{.RepoRootPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.static_file_root_path"}}</dt>
+						<dd>{{.StaticRootPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.custom_file_root_path"}}</dt>
+						<dd>{{.CustomRootPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.log_file_root_path"}}</dt>
+						<dd>{{.LogRootPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.script_type"}}</dt>
+						<dd>{{.ScriptType}}</dd>
+						<dt>{{.locale.Tr "admin.config.reverse_auth_user"}}</dt>
+						<dd>{{.ReverseProxyAuthUser}}</dd>
 
-				{{if .EnvVars}}
-				<div class="ui divider"></div>
-				{{range .EnvVars}}
-				<dt>{{.Name}}</dt>
-				<dd>{{.Value}}</dd>
-				{{end}}
-				{{end}}
+						{{if .EnvVars}}
+						<div class="ui divider"></div>
+						{{range .EnvVars}}
+						<dt>{{.Name}}</dt>
+						<dd>{{.Value}}</dd>
+						{{end}}
+						{{end}}
 
-			</dl>
-		</div>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.ssh_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
-				<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{if not .SSH.Disabled}}
-					<dt>{{.locale.Tr "admin.config.ssh_start_builtin_server"}}</dt>
-					<dd>{{if .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-					<dt>{{.locale.Tr "admin.config.ssh_domain"}}</dt>
-					<dd>{{.SSH.Domain}}</dd>
-					<dt>{{.locale.Tr "admin.config.ssh_port"}}</dt>
-					<dd>{{.SSH.Port}}</dd>
-					<dt>{{.locale.Tr "admin.config.ssh_listen_port"}}</dt>
-					<dd>{{.SSH.ListenPort}}</dd>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.ssh_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
+						<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{if not .SSH.Disabled}}
+							<dt>{{.locale.Tr "admin.config.ssh_start_builtin_server"}}</dt>
+							<dd>{{if .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+							<dt>{{.locale.Tr "admin.config.ssh_domain"}}</dt>
+							<dd>{{.SSH.Domain}}</dd>
+							<dt>{{.locale.Tr "admin.config.ssh_port"}}</dt>
+							<dd>{{.SSH.Port}}</dd>
+							<dt>{{.locale.Tr "admin.config.ssh_listen_port"}}</dt>
+							<dd>{{.SSH.ListenPort}}</dd>
 
-					{{if not .SSH.StartBuiltinServer}}
-						<dt>{{.locale.Tr "admin.config.ssh_root_path"}}</dt>
-						<dd>{{.SSH.RootPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.ssh_key_test_path"}}</dt>
-						<dd>{{.SSH.KeyTestPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.ssh_keygen_path"}}</dt>
-						<dd>{{.SSH.KeygenPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
-						<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{if .SSH.MinimumKeySizeCheck}}
-							<dt>{{.locale.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
-							<dd>{{.SSH.MinimumKeySizes}}</dd>
+							{{if not .SSH.StartBuiltinServer}}
+								<dt>{{.locale.Tr "admin.config.ssh_root_path"}}</dt>
+								<dd>{{.SSH.RootPath}}</dd>
+								<dt>{{.locale.Tr "admin.config.ssh_key_test_path"}}</dt>
+								<dd>{{.SSH.KeyTestPath}}</dd>
+								<dt>{{.locale.Tr "admin.config.ssh_keygen_path"}}</dt>
+								<dd>{{.SSH.KeygenPath}}</dd>
+								<dt>{{.locale.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
+								<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+								{{if .SSH.MinimumKeySizeCheck}}
+									<dt>{{.locale.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
+									<dd>{{.SSH.MinimumKeySizes}}</dd>
+								{{end}}
+							{{end}}
 						{{end}}
-					{{end}}
-				{{end}}
-			</dl>
-		</div>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.lfs_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
-				<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{if .LFS.StartServer}}
-					<dt>{{.locale.Tr "admin.config.lfs_content_path"}}</dt>
-					<dd>{{.LFS.Path}}</dd>
-					<dt>{{.locale.Tr "admin.config.lfs_http_auth_expiry"}}</dt>
-					<dd>{{.LFS.HTTPAuthExpiry}}</dd>
-				{{end}}
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.lfs_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
+						<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{if .LFS.StartServer}}
+							<dt>{{.locale.Tr "admin.config.lfs_content_path"}}</dt>
+							<dd>{{.LFS.Path}}</dd>
+							<dt>{{.locale.Tr "admin.config.lfs_http_auth_expiry"}}</dt>
+							<dd>{{.LFS.HTTPAuthExpiry}}</dd>
+						{{end}}
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.db_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.db_type"}}</dt>
-				<dd>{{.DbCfg.Type}}</dd>
-				{{if not (eq .DbCfg.Type "sqlite3")}}
-					<dt>{{.locale.Tr "admin.config.db_host"}}</dt>
-					<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
-					<dt>{{.locale.Tr "admin.config.db_name"}}</dt>
-					<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
-					<dt>{{.locale.Tr "admin.config.db_user"}}</dt>
-					<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
-				{{end}}
-				{{if eq .DbCfg.Type "postgres"}}
-					<dt>{{.locale.Tr "admin.config.db_schema"}}</dt>
-					<dd>{{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}</dd>
-					<dt>{{.locale.Tr "admin.config.db_ssl_mode"}}</dt>
-					<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
-				{{end}}
-				{{if eq .DbCfg.Type "sqlite3"}}
-					<dt>{{.locale.Tr "admin.config.db_path"}}</dt>
-					<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
-				{{end}}
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.db_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.db_type"}}</dt>
+						<dd>{{.DbCfg.Type}}</dd>
+						{{if not (eq .DbCfg.Type "sqlite3")}}
+							<dt>{{.locale.Tr "admin.config.db_host"}}</dt>
+							<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
+							<dt>{{.locale.Tr "admin.config.db_name"}}</dt>
+							<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
+							<dt>{{.locale.Tr "admin.config.db_user"}}</dt>
+							<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
+						{{end}}
+						{{if eq .DbCfg.Type "postgres"}}
+							<dt>{{.locale.Tr "admin.config.db_schema"}}</dt>
+							<dd>{{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}</dd>
+							<dt>{{.locale.Tr "admin.config.db_ssl_mode"}}</dt>
+							<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
+						{{end}}
+						{{if eq .DbCfg.Type "sqlite3"}}
+							<dt>{{.locale.Tr "admin.config.db_path"}}</dt>
+							<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
+						{{end}}
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.service_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
-				<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
-				<dd>{{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.allow_only_internal_registration"}}</dt>
-				<dd>{{if .Service.AllowOnlyInternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.allow_only_external_registration"}}</dt>
-				<dd>{{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.show_registration_button"}}</dt>
-				<dd>{{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.enable_openid_signup"}}</dt>
-				<dd>{{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.enable_openid_signin"}}</dt>
-				<dd>{{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.require_sign_in_view"}}</dt>
-				<dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.mail_notify"}}</dt>
-				<dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.disable_key_size_check"}}</dt>
-				<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.enable_captcha"}}</dt>
-				<dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.default_keep_email_private"}}</dt>
-				<dd>{{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.default_allow_create_organization"}}</dt>
-				<dd>{{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.enable_timetracking"}}</dt>
-				<dd>{{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{if .Service.EnableTimetracking}}
-					<dt>{{.locale.Tr "admin.config.default_enable_timetracking"}}</dt>
-					<dd>{{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-					<dt>{{.locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
-					<dd>{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{end}}
-				<dt>{{.locale.Tr "admin.config.default_visibility_organization"}}</dt>
-				<dd>{{.Service.DefaultOrgVisibility}}</dd>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.service_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
+						<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
+						<dd>{{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.allow_only_internal_registration"}}</dt>
+						<dd>{{if .Service.AllowOnlyInternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.allow_only_external_registration"}}</dt>
+						<dd>{{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.show_registration_button"}}</dt>
+						<dd>{{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.enable_openid_signup"}}</dt>
+						<dd>{{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.enable_openid_signin"}}</dt>
+						<dd>{{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.require_sign_in_view"}}</dt>
+						<dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.mail_notify"}}</dt>
+						<dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.disable_key_size_check"}}</dt>
+						<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.enable_captcha"}}</dt>
+						<dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.default_keep_email_private"}}</dt>
+						<dd>{{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.default_allow_create_organization"}}</dt>
+						<dd>{{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.enable_timetracking"}}</dt>
+						<dd>{{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{if .Service.EnableTimetracking}}
+							<dt>{{.locale.Tr "admin.config.default_enable_timetracking"}}</dt>
+							<dd>{{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+							<dt>{{.locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
+							<dd>{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{end}}
+						<dt>{{.locale.Tr "admin.config.default_visibility_organization"}}</dt>
+						<dd>{{.Service.DefaultOrgVisibility}}</dd>
 
-				<dt>{{.locale.Tr "admin.config.no_reply_address"}}</dt>
-				<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.default_enable_dependencies"}}</dt>
-				<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.config.active_code_lives"}}</dt>
-				<dd>{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
-				<dt>{{.locale.Tr "admin.config.reset_password_code_lives"}}</dt>
-				<dd>{{.Service.ResetPwdCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
-			</dl>
-		</div>
+						<dt>{{.locale.Tr "admin.config.no_reply_address"}}</dt>
+						<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.default_enable_dependencies"}}</dt>
+						<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.config.active_code_lives"}}</dt>
+						<dd>{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
+						<dt>{{.locale.Tr "admin.config.reset_password_code_lives"}}</dt>
+						<dd>{{.Service.ResetPwdCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.webhook_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
-				<dd>{{.Webhook.QueueLength}}</dd>
-				<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
-				<dd>{{.Webhook.DeliverTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.skip_tls_verify"}}</dt>
-				<dd>{{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.webhook_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
+						<dd>{{.Webhook.QueueLength}}</dd>
+						<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
+						<dd>{{.Webhook.DeliverTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.skip_tls_verify"}}</dt>
+						<dd>{{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.mailer_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
-				<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{if .MailerEnabled}}
-					<dt>{{.locale.Tr "admin.config.mailer_name"}}</dt>
-					<dd>{{.Mailer.Name}}</dd>
-					{{if eq .Mailer.Protocol "sendmail"}}
-						<dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt>
-						<dd>{{svg "octicon-check"}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt>
-						<dd>{{.Mailer.SendmailPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_sendmail_args"}}</dt>
-						<dd>{{.Mailer.SendmailArgs}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
-						<dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-					{{else if eq .Mailer.Protocol "dummy"}}
-						<dt>{{.locale.Tr "admin.config.mailer_use_dummy"}}</dt>
-						<dd>{{svg "octicon-check"}}</dd>
-					{{else}}{{/* SMTP family */}}
-						<dt>{{.locale.Tr "admin.config.mailer_protocol"}}</dt>
-						<dd>{{.Mailer.Protocol}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_enable_helo"}}</dt>
-						<dd>{{if .Mailer.EnableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_smtp_addr"}}</dt>
-						<dd>{{.Mailer.SMTPAddr}}</dd>
-						<dt>{{.locale.Tr "admin.config.mailer_smtp_port"}}</dt>
-						<dd>{{.Mailer.SMTPPort}}</dd>
-					{{end}}
-					<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
-					<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
-					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="inline field ui left">
-							<div class="ui input">
-								<input type="email" name="email" placeholder="{{.locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
-							</div>
-						</div>
-						<button class="ui green button" id="test-mail-btn">{{.locale.Tr "admin.config.send_test_mail"}}</button>
-					</form>
-				{{end}}
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.mailer_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
+						<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{if .MailerEnabled}}
+							<dt>{{.locale.Tr "admin.config.mailer_name"}}</dt>
+							<dd>{{.Mailer.Name}}</dd>
+							{{if eq .Mailer.Protocol "sendmail"}}
+								<dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt>
+								<dd>{{svg "octicon-check"}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt>
+								<dd>{{.Mailer.SendmailPath}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_sendmail_args"}}</dt>
+								<dd>{{.Mailer.SendmailArgs}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
+								<dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+							{{else if eq .Mailer.Protocol "dummy"}}
+								<dt>{{.locale.Tr "admin.config.mailer_use_dummy"}}</dt>
+								<dd>{{svg "octicon-check"}}</dd>
+							{{else}}{{/* SMTP family */}}
+								<dt>{{.locale.Tr "admin.config.mailer_protocol"}}</dt>
+								<dd>{{.Mailer.Protocol}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_enable_helo"}}</dt>
+								<dd>{{if .Mailer.EnableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_smtp_addr"}}</dt>
+								<dd>{{.Mailer.SMTPAddr}}</dd>
+								<dt>{{.locale.Tr "admin.config.mailer_smtp_port"}}</dt>
+								<dd>{{.Mailer.SMTPPort}}</dd>
+							{{end}}
+							<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
+							<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
+							<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
+								{{.CsrfTokenHtml}}
+								<div class="inline field ui left">
+									<div class="ui input">
+										<input type="email" name="email" placeholder="{{.locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
+									</div>
+								</div>
+								<button class="ui green button" id="test-mail-btn">{{.locale.Tr "admin.config.send_test_mail"}}</button>
+							</form>
+						{{end}}
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.cache_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
-				<dd>{{.CacheAdapter}}</dd>
-				{{if eq .CacheAdapter "memory"}}
-					<dt>{{.locale.Tr "admin.config.cache_interval"}}</dt>
-					<dd>{{.CacheInterval}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				{{end}}
-				{{if .CacheConn}}
-					<dt>{{.locale.Tr "admin.config.cache_conn"}}</dt>
-					<dd><code>{{.CacheConn}}</code></dd>
-					<dt>{{.locale.Tr "admin.config.cache_item_ttl"}}</dt>
-					<dd><code>{{.CacheItemTTL}}</code></dd>
-				{{end}}
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.cache_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
+						<dd>{{.CacheAdapter}}</dd>
+						{{if eq .CacheAdapter "memory"}}
+							<dt>{{.locale.Tr "admin.config.cache_interval"}}</dt>
+							<dd>{{.CacheInterval}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						{{end}}
+						{{if .CacheConn}}
+							<dt>{{.locale.Tr "admin.config.cache_conn"}}</dt>
+							<dd><code>{{.CacheConn}}</code></dd>
+							<dt>{{.locale.Tr "admin.config.cache_item_ttl"}}</dt>
+							<dd><code>{{.CacheItemTTL}}</code></dd>
+						{{end}}
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.session_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
-				<dd>{{.SessionConfig.Provider}}</dd>
-				<dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
-				<dd><code>{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}</code></dd>
-				<dt>{{.locale.Tr "admin.config.cookie_name"}}</dt>
-				<dd>{{.SessionConfig.CookieName}}</dd>
-				<dt>{{.locale.Tr "admin.config.gc_interval_time"}}</dt>
-				<dd>{{.SessionConfig.Gclifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.session_life_time"}}</dt>
-				<dd>{{.SessionConfig.Maxlifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.https_only"}}</dt>
-				<dd>{{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.session_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
+						<dd>{{.SessionConfig.Provider}}</dd>
+						<dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
+						<dd><code>{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}</code></dd>
+						<dt>{{.locale.Tr "admin.config.cookie_name"}}</dt>
+						<dd>{{.SessionConfig.CookieName}}</dd>
+						<dt>{{.locale.Tr "admin.config.gc_interval_time"}}</dt>
+						<dd>{{.SessionConfig.Gclifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.session_life_time"}}</dt>
+						<dd>{{.SessionConfig.Maxlifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.https_only"}}</dt>
+						<dd>{{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.picture_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
-				<dd>
-					<div class="ui toggle checkbox">
-						<input type="checkbox" name="picture.disable_gravatar" version="{{.SystemSettings.GetVersion "picture.disable_gravatar"}}"{{if .SystemSettings.GetBool "picture.disable_gravatar"}} checked{{end}} title="{{.locale.Tr "admin.config.disable_gravatar"}}">
-					</div>
-				</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.config.enable_federated_avatar"}}</dt>
-				<dd>
-					<div class="ui toggle checkbox">
-						<input type="checkbox" name="picture.enable_federated_avatar" version="{{.SystemSettings.GetVersion "picture.enable_federated_avatar"}}"{{if .SystemSettings.GetBool "picture.enable_federated_avatar"}} checked{{end}} title="{{.locale.Tr "admin.config.enable_federated_avatar"}}">
-					</div>
-				</dd>
-			</dl>
-		</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.picture_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
+						<dd>
+							<div class="ui toggle checkbox">
+								<input type="checkbox" name="picture.disable_gravatar" version="{{.SystemSettings.GetVersion "picture.disable_gravatar"}}"{{if .SystemSettings.GetBool "picture.disable_gravatar"}} checked{{end}} title="{{.locale.Tr "admin.config.disable_gravatar"}}">
+							</div>
+						</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.config.enable_federated_avatar"}}</dt>
+						<dd>
+							<div class="ui toggle checkbox">
+								<input type="checkbox" name="picture.enable_federated_avatar" version="{{.SystemSettings.GetVersion "picture.enable_federated_avatar"}}"{{if .SystemSettings.GetBool "picture.enable_federated_avatar"}} checked{{end}} title="{{.locale.Tr "admin.config.enable_federated_avatar"}}">
+							</div>
+						</dd>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.git_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
-				<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
-				<dd>{{.Git.MaxGitDiffLines}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_max_diff_line_characters"}}</dt>
-				<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_max_diff_files"}}</dt>
-				<dd>{{.Git.MaxGitDiffFiles}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_gc_args"}}</dt>
-				<dd><code>{{.Git.GCArgs}}</code></dd>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.git_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
+						<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
+						<dd>{{.Git.MaxGitDiffLines}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_max_diff_line_characters"}}</dt>
+						<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_max_diff_files"}}</dt>
+						<dd>{{.Git.MaxGitDiffFiles}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_gc_args"}}</dt>
+						<dd><code>{{.Git.GCArgs}}</code></dd>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<dt>{{.locale.Tr "admin.config.git_enable_reflogs"}}</dt>
-				<dd>{{if .Git.Reflog.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_enable_reflogs"}}</dt>
+						<dd>{{if .Git.Reflog.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
 
-				{{if .Git.Reflog.Enabled}}
-					<dt>{{.locale.Tr "admin.config.git_reflog_expiry_time"}}</dt>
-					<dd>{{.locale.Tr "tool.days" .Git.Reflog.Expiration}}</dd>
-				{{end}}
+						{{if .Git.Reflog.Enabled}}
+							<dt>{{.locale.Tr "admin.config.git_reflog_expiry_time"}}</dt>
+							<dd>{{.locale.Tr "tool.days" .Git.Reflog.Expiration}}</dd>
+						{{end}}
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<dt>{{.locale.Tr "admin.config.git_migrate_timeout"}}</dt>
-				<dd>{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_mirror_timeout"}}</dt>
-				<dd>{{.Git.Timeout.Mirror}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_clone_timeout"}}</dt>
-				<dd>{{.Git.Timeout.Clone}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_pull_timeout"}}</dt>
-				<dd>{{.Git.Timeout.Pull}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-				<dt>{{.locale.Tr "admin.config.git_gc_timeout"}}</dt>
-				<dd>{{.Git.Timeout.GC}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-			</dl>
-		</div>
+						<dt>{{.locale.Tr "admin.config.git_migrate_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_mirror_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Mirror}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_clone_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Clone}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_pull_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Pull}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.locale.Tr "admin.config.git_gc_timeout"}}</dt>
+						<dd>{{.Git.Timeout.GC}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+					</dl>
+				</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.config.log_config"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				{{range .Loggers.default.SubLogDescriptions}}
-					<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-					<dd>{{.Name}} ({{.Provider}})</dd>
-					<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-					<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
-				{{end}}
-				<div class="ui divider"></div>
-				<dt>{{$.locale.Tr "admin.config.router_log_mode"}}</dt>
-				{{if .DisableRouterLog}}
-					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
-				{{else}}
-					{{if .Loggers.router.SubLogDescriptions}}
-						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-						{{range .Loggers.router.SubLogDescriptions}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.config.log_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						{{range .Loggers.default.SubLogDescriptions}}
 							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
 							<dd>{{.Name}} ({{.Provider}})</dd>
 							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
 							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 						{{end}}
-					{{else}}
-						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-					{{end}}
-				{{end}}
-				<div class="ui divider"></div>
-				<dt>{{$.locale.Tr "admin.config.access_log_mode"}}</dt>
-				{{if .EnableAccessLog}}
-					{{if .Loggers.access.SubLogDescriptions}}
-						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-						{{range .Loggers.access.SubLogDescriptions}}
-							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-							<dd>{{.Name}} ({{.Provider}})</dd>
-							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+						<div class="ui divider"></div>
+						<dt>{{$.locale.Tr "admin.config.router_log_mode"}}</dt>
+						{{if .DisableRouterLog}}
+							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+						{{else}}
+							{{if .Loggers.router.SubLogDescriptions}}
+								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+								{{range .Loggers.router.SubLogDescriptions}}
+									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+									<dd>{{.Name}} ({{.Provider}})</dd>
+									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+								{{end}}
+							{{else}}
+								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+							{{end}}
 						{{end}}
-					{{else}}
-						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-					{{end}}
-					<dt>{{$.locale.Tr "admin.config.access_log_template"}}</dt>
-					<dd><code>{{$.AccessLogTemplate}}</code></dd>
-				{{else}}
-					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
-				{{end}}
-				<div class="ui divider"></div>
-				<dt>{{$.locale.Tr "admin.config.xorm_log_mode"}}</dt>
-				{{if .EnableXORMLog}}
-					{{if .Loggers.xorm.SubLogDescriptions}}
-						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-						{{range .Loggers.xorm.SubLogDescriptions}}
-							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-							<dd>{{.Name}} ({{.Provider}})</dd>
-							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+						<div class="ui divider"></div>
+						<dt>{{$.locale.Tr "admin.config.access_log_mode"}}</dt>
+						{{if .EnableAccessLog}}
+							{{if .Loggers.access.SubLogDescriptions}}
+								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+								{{range .Loggers.access.SubLogDescriptions}}
+									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+									<dd>{{.Name}} ({{.Provider}})</dd>
+									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+								{{end}}
+							{{else}}
+								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+							{{end}}
+							<dt>{{$.locale.Tr "admin.config.access_log_template"}}</dt>
+							<dd><code>{{$.AccessLogTemplate}}</code></dd>
+						{{else}}
+							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+						{{end}}
+						<div class="ui divider"></div>
+						<dt>{{$.locale.Tr "admin.config.xorm_log_mode"}}</dt>
+						{{if .EnableXORMLog}}
+							{{if .Loggers.xorm.SubLogDescriptions}}
+								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+								{{range .Loggers.xorm.SubLogDescriptions}}
+									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+									<dd>{{.Name}} ({{.Provider}})</dd>
+									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+								{{end}}
+							{{else}}
+								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+							{{end}}
+							<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
+							<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{else}}
+							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
 						{{end}}
-					{{else}}
-						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-					{{end}}
-					<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
-					<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-				{{else}}
-					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
-				{{end}}
-			</dl>
+					</dl>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index fc1b1f43857e..60cfd17f7406 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,148 +1,152 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{if .NeedUpdate}}
-			<div class="ui negative message flash-error">
-				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
-			</div>
-		{{end}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.dashboard.statistic"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>
-				{{.locale.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}}
-			</p>
-		</div>
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.dashboard.operations"}}
-		</h4>
-		<form method="post" action="{{AppSubUrl}}/admin">
-			{{.CsrfTokenHtml}}
-			<div class="ui attached table segment">
-				<table class="ui very basic table">
-					<tbody>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.delete_repo_archives"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.delete_missing_repos"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.git_gc_repos"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
-							<tr>
-								<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
-								{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
-								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-							</tr>
-							<tr>
-								<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
-								{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
-								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-							</tr>
-						{{end}}
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.sync_external_users"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.repo_health_check"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-						<tr>
-							<td>{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td>
-							<td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</form>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{if .NeedUpdate}}
+					<div class="ui negative message flash-error">
+						<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
+					</div>
+				{{end}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.dashboard.statistic"}}
+				</h4>
+				<div class="ui attached segment">
+					<p>
+						{{.locale.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}}
+					</p>
+				</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.dashboard.operations"}}
+				</h4>
+				<form method="post" action="{{AppSubUrl}}/admin">
+					{{.CsrfTokenHtml}}
+					<div class="ui attached table segment">
+						<table class="ui very basic table">
+							<tbody>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.delete_repo_archives"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.delete_missing_repos"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.git_gc_repos"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
+									<tr>
+										<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
+										{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
+										<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+									</tr>
+									<tr>
+										<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
+										{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
+										<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+									</tr>
+								{{end}}
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.sync_external_users"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.repo_health_check"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+								<tr>
+									<td>{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td>
+									<td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</form>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.dashboard.system_status"}}
-		</h4>
-		<div class="ui attached table segment">
-			<dl class="dl-horizontal admin-dl-horizontal">
-				<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
-				<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
-				<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
-				<dd>{{.SysStatus.NumGoroutine}}</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.dashboard.current_memory_usage"}}</dt>
-				<dd>{{.SysStatus.MemAllocated}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.total_memory_allocated"}}</dt>
-				<dd>{{.SysStatus.MemTotal}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.memory_obtained"}}</dt>
-				<dd>{{.SysStatus.MemSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.pointer_lookup_times"}}</dt>
-				<dd>{{.SysStatus.Lookups}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.memory_allocate_times"}}</dt>
-				<dd>{{.SysStatus.MemMallocs}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.memory_free_times"}}</dt>
-				<dd>{{.SysStatus.MemFrees}}</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.dashboard.current_heap_usage"}}</dt>
-				<dd>{{.SysStatus.HeapAlloc}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
-				<dd>{{.SysStatus.HeapSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.heap_memory_idle"}}</dt>
-				<dd>{{.SysStatus.HeapIdle}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.heap_memory_in_use"}}</dt>
-				<dd>{{.SysStatus.HeapInuse}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.heap_memory_released"}}</dt>
-				<dd>{{.SysStatus.HeapReleased}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.heap_objects"}}</dt>
-				<dd>{{.SysStatus.HeapObjects}}</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
-				<dd>{{.SysStatus.StackInuse}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
-				<dd>{{.SysStatus.StackSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.mspan_structures_usage"}}</dt>
-				<dd>{{.SysStatus.MSpanInuse}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.mspan_structures_obtained"}}</dt>
-				<dd>{{.SysStatus.MSpanSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.mcache_structures_usage"}}</dt>
-				<dd>{{.SysStatus.MCacheInuse}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.mcache_structures_obtained"}}</dt>
-				<dd>{{.SysStatus.MCacheSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}</dt>
-				<dd>{{.SysStatus.BuckHashSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.gc_metadata_obtained"}}</dt>
-				<dd>{{.SysStatus.GCSys}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
-				<dd>{{.SysStatus.OtherSys}}</dd>
-				<div class="ui divider"></div>
-				<dt>{{.locale.Tr "admin.dashboard.next_gc_recycle"}}</dt>
-				<dd>{{.SysStatus.NextGC}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.last_gc_time"}}</dt>
-				<dd>{{.SysStatus.LastGC}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.total_gc_pause"}}</dt>
-				<dd>{{.SysStatus.PauseTotalNs}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.last_gc_pause"}}</dt>
-				<dd>{{.SysStatus.PauseNs}}</dd>
-				<dt>{{.locale.Tr "admin.dashboard.gc_times"}}</dt>
-				<dd>{{.SysStatus.NumGC}}</dd>
-			</dl>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.dashboard.system_status"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
+						<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
+						<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
+						<dd>{{.SysStatus.NumGoroutine}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.dashboard.current_memory_usage"}}</dt>
+						<dd>{{.SysStatus.MemAllocated}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.total_memory_allocated"}}</dt>
+						<dd>{{.SysStatus.MemTotal}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.memory_obtained"}}</dt>
+						<dd>{{.SysStatus.MemSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.pointer_lookup_times"}}</dt>
+						<dd>{{.SysStatus.Lookups}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.memory_allocate_times"}}</dt>
+						<dd>{{.SysStatus.MemMallocs}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.memory_free_times"}}</dt>
+						<dd>{{.SysStatus.MemFrees}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.dashboard.current_heap_usage"}}</dt>
+						<dd>{{.SysStatus.HeapAlloc}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
+						<dd>{{.SysStatus.HeapSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.heap_memory_idle"}}</dt>
+						<dd>{{.SysStatus.HeapIdle}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.heap_memory_in_use"}}</dt>
+						<dd>{{.SysStatus.HeapInuse}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.heap_memory_released"}}</dt>
+						<dd>{{.SysStatus.HeapReleased}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.heap_objects"}}</dt>
+						<dd>{{.SysStatus.HeapObjects}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
+						<dd>{{.SysStatus.StackInuse}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
+						<dd>{{.SysStatus.StackSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.mspan_structures_usage"}}</dt>
+						<dd>{{.SysStatus.MSpanInuse}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.mspan_structures_obtained"}}</dt>
+						<dd>{{.SysStatus.MSpanSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.mcache_structures_usage"}}</dt>
+						<dd>{{.SysStatus.MCacheInuse}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.mcache_structures_obtained"}}</dt>
+						<dd>{{.SysStatus.MCacheSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}</dt>
+						<dd>{{.SysStatus.BuckHashSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.gc_metadata_obtained"}}</dt>
+						<dd>{{.SysStatus.GCSys}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
+						<dd>{{.SysStatus.OtherSys}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.locale.Tr "admin.dashboard.next_gc_recycle"}}</dt>
+						<dd>{{.SysStatus.NextGC}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.last_gc_time"}}</dt>
+						<dd>{{.SysStatus.LastGC}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.total_gc_pause"}}</dt>
+						<dd>{{.SysStatus.PauseTotalNs}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.last_gc_pause"}}</dt>
+						<dd>{{.SysStatus.PauseNs}}</dd>
+						<dt>{{.locale.Tr "admin.dashboard.gc_times"}}</dt>
+						<dd>{{.SysStatus.NumGC}}</dd>
+					</dl>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index d8fa986cff3e..c72b34860fed 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,105 +1,109 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui right floated secondary filter menu">
-			<!-- Sort -->
-				<div class="ui dropdown type jump item">
-					<span class="text">
-						{{.locale.Tr "repo.issues.filter_sort"}}
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-					</span>
-					<div class="menu">
-						<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a>
-						<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>
-						<a class="{{if eq .SortType "username"}}active {{end}}item" href="{{$.Link}}?sort=username&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name"}}</a>
-						<a class="{{if eq .SortType "reverseusername"}}active {{end}}item" href="{{$.Link}}?sort=reverseusername&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name_reverse"}}</a>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui right floated secondary filter menu">
+					<!-- Sort -->
+						<div class="ui dropdown type jump item">
+							<span class="text">
+								{{.locale.Tr "repo.issues.filter_sort"}}
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							</span>
+							<div class="menu">
+								<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a>
+								<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>
+								<a class="{{if eq .SortType "username"}}active {{end}}item" href="{{$.Link}}?sort=username&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name"}}</a>
+								<a class="{{if eq .SortType "reverseusername"}}active {{end}}item" href="{{$.Link}}?sort=reverseusername&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name_reverse"}}</a>
+							</div>
+						</div>
 					</div>
+					<form class="ui form ignore-dirty"  style="max-width: 90%">
+						<div class="ui fluid action input">
+							<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+						</div>
+					</form>
 				</div>
-			</div>
-			<form class="ui form ignore-dirty"  style="max-width: 90%">
-				<div class="ui fluid action input">
-					<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th data-sortt-asc="username" data-sortt-desc="reverseusername">
+									{{.locale.Tr "admin.users.name"}}
+									{{SortArrow "username" "reverseusername" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.users.full_name"}}</th>
+								<th data-sortt-asc="email" data-sortt-desc="reverseemail" data-sortt-default="true">
+									{{.locale.Tr "email"}}
+									{{SortArrow "email" "reverseemail" $.SortType true}}
+								</th>
+								<th>{{.locale.Tr "admin.emails.primary"}}</th>
+								<th>{{.locale.Tr "admin.emails.activated"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Emails}}
+								<tr>
+									<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
+									<td><span class="text truncate">{{.FullName}}</span></td>
+									<td><span class="text email">{{.Email}}</span></td>
+									<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>
+										{{if .CanChange}}
+											<a class="link-email-action" href data-uid="{{.UID}}"
+												data-email="{{.Email}}"
+												data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
+												data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
+												{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
+											</a>
+										{{else}}
+											{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
+										{{end}}
+									</td>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
 				</div>
-			</form>
-		</div>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th data-sortt-asc="username" data-sortt-desc="reverseusername">
-							{{.locale.Tr "admin.users.name"}}
-							{{SortArrow "username" "reverseusername" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.users.full_name"}}</th>
-						<th data-sortt-asc="email" data-sortt-desc="reverseemail" data-sortt-default="true">
-							{{.locale.Tr "email"}}
-							{{SortArrow "email" "reverseemail" $.SortType true}}
-						</th>
-						<th>{{.locale.Tr "admin.emails.primary"}}</th>
-						<th>{{.locale.Tr "admin.emails.activated"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Emails}}
-						<tr>
-							<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
-							<td><span class="text truncate">{{.FullName}}</span></td>
-							<td><span class="text email">{{.Email}}</span></td>
-							<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>
-								{{if .CanChange}}
-									<a class="link-email-action" href data-uid="{{.UID}}"
-										data-email="{{.Email}}"
-										data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
-										data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
-										{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-									</a>
-								{{else}}
-									{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-								{{end}}
-							</td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-		</div>
 
-		{{template "base/paginate" .}}
+				{{template "base/paginate" .}}
 
-		<div class="ui basic modal" id="change-email-modal">
-			<div class="ui icon header">
-				{{.locale.Tr "admin.emails.change_email_header"}}
-			</div>
-			<div class="content center">
-				<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
+				<div class="ui basic modal" id="change-email-modal">
+					<div class="ui icon header">
+						{{.locale.Tr "admin.emails.change_email_header"}}
+					</div>
+					<div class="content center">
+						<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
 
-				<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
-					{{$.CsrfTokenHtml}}
+						<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
+							{{$.CsrfTokenHtml}}
 
-					<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
-					<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
-					<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
-					<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
+							<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
+							<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
+							<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
+							<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
 
-					<input type="hidden" id="form-uid" name="uid" value="" required>
-					<input type="hidden" id="form-email" name="email" value="" required>
-					<input type="hidden" id="form-primary" name="primary" value="" required>
-					<input type="hidden" id="form-activate" name="activate" value="" required>
+							<input type="hidden" id="form-uid" name="uid" value="" required>
+							<input type="hidden" id="form-email" name="email" value="" required>
+							<input type="hidden" id="form-primary" name="primary" value="" required>
+							<input type="hidden" id="form-activate" name="activate" value="" required>
 
-					<div class="center">
-						{{template "base/delete_modal_actions" .}}
+							<div class="center">
+								{{template "base/delete_modal_actions" .}}
+							</div>
+						</form>
 					</div>
-				</form>
+				</div>
+
 			</div>
 		</div>
-
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 0c018ff2939e..cbff3756489f 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,59 +1,63 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{if .PageIsAdminDefaultHooksNew}}
-				{{.locale.Tr "admin.defaulthooks.add_webhook"}}
-			{{else if .PageIsAdminSystemHooksNew}}
-				{{.locale.Tr "admin.systemhooks.add_webhook"}}
-			{{else if .Webhook.IsSystemWebhook}}
-				{{.locale.Tr "admin.systemhooks.update_webhook"}}
-			{{else}}
-				{{.locale.Tr "admin.defaulthooks.update_webhook"}}
-			{{end}}
-			<div class="ui right">
-				{{if eq .HookType "gitea"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-				{{else if eq .HookType "gogs"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-				{{else if eq .HookType "slack"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-				{{else if eq .HookType "discord"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-				{{else if eq .HookType "dingtalk"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-				{{else if eq .HookType "telegram"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-				{{else if eq .HookType "msteams"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-				{{else if eq .HookType "feishu"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-				{{else if eq .HookType "matrix"}}
-					{{svg "gitea-matrix" 26}}
-				{{else if eq .HookType "wechatwork"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-				{{else if eq .HookType "packagist"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-				{{end}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{if .PageIsAdminDefaultHooksNew}}
+						{{.locale.Tr "admin.defaulthooks.add_webhook"}}
+					{{else if .PageIsAdminSystemHooksNew}}
+						{{.locale.Tr "admin.systemhooks.add_webhook"}}
+					{{else if .Webhook.IsSystemWebhook}}
+						{{.locale.Tr "admin.systemhooks.update_webhook"}}
+					{{else}}
+						{{.locale.Tr "admin.defaulthooks.update_webhook"}}
+					{{end}}
+					<div class="ui right">
+						{{if eq .HookType "gitea"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+						{{else if eq .HookType "gogs"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+						{{else if eq .HookType "slack"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+						{{else if eq .HookType "discord"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+						{{else if eq .HookType "dingtalk"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+						{{else if eq .HookType "telegram"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+						{{else if eq .HookType "msteams"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+						{{else if eq .HookType "feishu"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+						{{else if eq .HookType "matrix"}}
+							{{svg "gitea-matrix" 26}}
+						{{else if eq .HookType "wechatwork"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+						{{else if eq .HookType "packagist"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+						{{end}}
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					{{template "repo/settings/webhook/gitea" .}}
+					{{template "repo/settings/webhook/gogs" .}}
+					{{template "repo/settings/webhook/slack" .}}
+					{{template "repo/settings/webhook/discord" .}}
+					{{template "repo/settings/webhook/dingtalk" .}}
+					{{template "repo/settings/webhook/telegram" .}}
+					{{template "repo/settings/webhook/msteams" .}}
+					{{template "repo/settings/webhook/feishu" .}}
+					{{template "repo/settings/webhook/matrix" .}}
+					{{template "repo/settings/webhook/wechatwork" .}}
+					{{template "repo/settings/webhook/packagist" .}}
+				</div>
+
+				{{template "repo/settings/webhook/history" .}}
 			</div>
-		</h4>
-		<div class="ui attached segment">
-			{{template "repo/settings/webhook/gitea" .}}
-			{{template "repo/settings/webhook/gogs" .}}
-			{{template "repo/settings/webhook/slack" .}}
-			{{template "repo/settings/webhook/discord" .}}
-			{{template "repo/settings/webhook/dingtalk" .}}
-			{{template "repo/settings/webhook/telegram" .}}
-			{{template "repo/settings/webhook/msteams" .}}
-			{{template "repo/settings/webhook/feishu" .}}
-			{{template "repo/settings/webhook/matrix" .}}
-			{{template "repo/settings/webhook/wechatwork" .}}
-			{{template "repo/settings/webhook/packagist" .}}
 		</div>
-
-		{{template "repo/settings/webhook/history" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index 26f92c706410..41b743c56c6a 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,13 +1,17 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
 
-		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
-		{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
+				{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
+				{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
 
-		{{template "repo/settings/webhook/delete_modal" .}}
+				{{template "repo/settings/webhook/delete_modal" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index d53e9e18dcc8..c9a43c3bad2b 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,40 +1,44 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "admin/cron" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queues"}}
-		</h4>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Queues}}
-						<tr>
-							<td>{{.Name}}</td>
-							<td>{{.Type}}</td>
-							<td>{{.ExemplarType}}</td>
-							<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-							<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-							<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-		</div>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "admin/cron" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queues"}}
+				</h4>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Queues}}
+								<tr>
+									<td>{{.Name}}</td>
+									<td>{{.Type}}</td>
+									<td>{{.ExemplarType}}</td>
+									<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+									<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+									<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
 
-		{{template "admin/process" .}}
+				{{template "admin/process" .}}
+			</div>
+		</div>
 	</div>
 </div>
 <div class="ui small basic delete modal">
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index 97ee9171671d..73102197b586 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -1,5 +1,6 @@
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
-	<div class="new-menu-inner">
+<div class="four wide column">
+	<div class="ui fluid vertical menu">
+		<div class="header item">{{.locale.Tr "org.settings"}}</div>
 		<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
 			{{.locale.Tr "admin.dashboard"}}
 		</a>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index dd17bde036ad..0f77ff854f77 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,73 +1,77 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin notice">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
-		</h4>
-		<div class="ui attached table segment">
-			<table id="notice-table" class="ui very basic select selectable table unstackable">
-				<thead>
-					<tr>
-						<th></th>
-						<th>ID</th>
-						<th>{{.locale.Tr "admin.notices.type"}}</th>
-						<th>{{.locale.Tr "admin.notices.desc"}}</th>
-						<th width="100px">{{.locale.Tr "admin.users.created"}}</th>
-						<th>{{.locale.Tr "admin.notices.op"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Notices}}
-						<tr>
-							<td class="collapsing">
-								<div class="ui fitted checkbox" data-id="{{.ID}}">
-									<input type="checkbox">
-								</div>
-							</td>
-							<td>{{.ID}}</td>
-							<td>{{$.locale.Tr .TrStr}}</td>
-							<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-							<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-				{{if .Notices}}
-					<tfoot class="full-width">
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
+				</h4>
+				<div class="ui attached table segment">
+					<table id="notice-table" class="ui very basic select selectable table unstackable">
+						<thead>
 							<tr>
 								<th></th>
-								<th colspan="5">
-									<form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
-										{{.CsrfTokenHtml}}
-										<button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
-									</form>
-									<div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
-										<span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
-										<div class="menu">
-											<div class="item select action" data-action="select-all">
-												{{.locale.Tr "admin.notices.select_all"}}
-											</div>
-											<div class="item select action" data-action="deselect-all">
-												{{.locale.Tr "admin.notices.deselect_all"}}
-											</div>
-											<div class="item select action" data-action="inverse">
-												{{.locale.Tr "admin.notices.inverse_selection"}}
-											</div>
-										</div>
-									</div>
-									<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
-										{{.locale.Tr "admin.notices.delete_selected"}}
-									</button>
-								</th>
+								<th>ID</th>
+								<th>{{.locale.Tr "admin.notices.type"}}</th>
+								<th>{{.locale.Tr "admin.notices.desc"}}</th>
+								<th width="100px">{{.locale.Tr "admin.users.created"}}</th>
+								<th>{{.locale.Tr "admin.notices.op"}}</th>
 							</tr>
-					</tfoot>
-				{{end}}
-			</table>
-		</div>
+						</thead>
+						<tbody>
+							{{range .Notices}}
+								<tr>
+									<td class="collapsing">
+										<div class="ui fitted checkbox" data-id="{{.ID}}">
+											<input type="checkbox">
+										</div>
+									</td>
+									<td>{{.ID}}</td>
+									<td>{{$.locale.Tr .TrStr}}</td>
+									<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+									<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
+								</tr>
+							{{end}}
+						</tbody>
+						{{if .Notices}}
+							<tfoot class="full-width">
+									<tr>
+										<th></th>
+										<th colspan="5">
+											<form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
+												{{.CsrfTokenHtml}}
+												<button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
+											</form>
+											<div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
+												<span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
+												<div class="menu">
+													<div class="item select action" data-action="select-all">
+														{{.locale.Tr "admin.notices.select_all"}}
+													</div>
+													<div class="item select action" data-action="deselect-all">
+														{{.locale.Tr "admin.notices.deselect_all"}}
+													</div>
+													<div class="item select action" data-action="inverse">
+														{{.locale.Tr "admin.notices.inverse_selection"}}
+													</div>
+												</div>
+											</div>
+											<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
+												{{.locale.Tr "admin.notices.delete_selected"}}
+											</button>
+										</th>
+									</tr>
+							</tfoot>
+						{{end}}
+					</table>
+				</div>
 
-		{{template "base/paginate" .}}
+				{{template "base/paginate" .}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index f114b90fc7b5..2d568b2c5aa4 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,58 +1,62 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					{{template "admin/base/search" .}}
+				</div>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
+								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
+									{{.locale.Tr "admin.orgs.name"}}
+									{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
+								</th>
+								<th>{{.locale.Tr "admin.orgs.teams"}}</th>
+								<th>{{.locale.Tr "admin.orgs.members"}}</th>
+								<th>{{.locale.Tr "admin.users.repos"}}</th>
+								<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
+									{{.locale.Tr "admin.users.created"}}
+									{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.users.edit"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Users}}
+								<tr>
+									<td>{{.ID}}</td>
+									<td>
+										<a href="{{.HomeLink}}">{{.Name}}</a>
+										{{if .Visibility.IsPrivate}}
+											<span class="text gold">{{svg "octicon-lock"}}</span>
+										{{end}}
+									</td>
+									<td>{{.NumTeams}}</td>
+									<td>{{.NumMembers}}</td>
+									<td>{{.NumRepos}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+									<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
+
+				{{template "base/paginate" .}}
 			</div>
-		</h4>
-		<div class="ui attached segment">
-			{{template "admin/base/search" .}}
-		</div>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
-						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
-							{{.locale.Tr "admin.orgs.name"}}
-							{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
-						</th>
-						<th>{{.locale.Tr "admin.orgs.teams"}}</th>
-						<th>{{.locale.Tr "admin.orgs.members"}}</th>
-						<th>{{.locale.Tr "admin.users.repos"}}</th>
-						<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
-							{{.locale.Tr "admin.users.created"}}
-							{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.users.edit"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Users}}
-						<tr>
-							<td>{{.ID}}</td>
-							<td>
-								<a href="{{.HomeLink}}">{{.Name}}</a>
-								{{if .Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
-								{{end}}
-							</td>
-							<td>{{.NumTeams}}</td>
-							<td>{{.NumMembers}}</td>
-							<td>{{.NumRepos}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-							<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
 		</div>
-
-		{{template "base/paginate" .}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 121f575861d9..21eec70dc35d 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,82 +1,86 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
-			{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
-			{{.locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form ignore-dirty">
-				<div class="ui fluid action input">
-					<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-					<select class="ui dropdown" name="type">
-						<option value="">{{.locale.Tr "packages.filter.type"}}</option>
-						<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
-						{{range $type := .AvailableTypes}}
-						<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
-						{{end}}
-					</select>
-					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-				</div>
-			</form>
-		</div>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th>ID</th>
-						<th>{{.locale.Tr "admin.packages.owner"}}</th>
-						<th>{{.locale.Tr "admin.packages.type"}}</th>
-						<th data-sortt-asc="name_asc" data-sortt-desc="name_desc">
-							{{.locale.Tr "admin.packages.name"}}
-							{{SortArrow "name_asc" "name_desc" .SortType false}}
-						</th>
-						<th data-sortt-asc="version_desc" data-sortt-desc="version_asc">
-							{{.locale.Tr "admin.packages.version"}}
-							{{SortArrow "version_desc" "version_asc" .SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.packages.creator"}}</th>
-						<th>{{.locale.Tr "admin.packages.repository"}}</th>
-						<th>{{.locale.Tr "admin.packages.size"}}</th>
-						<th data-sortt-asc="created_asc" data-sortt-desc="created_desc">
-							{{.locale.Tr "admin.packages.published"}}
-							{{SortArrow "created_asc" "created_desc" .SortType true}}
-						</th>
-						<th>{{.locale.Tr "admin.notices.op"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .PackageDescriptors}}
-						<tr>
-							<td>{{.Version.ID}}</td>
-							<td>
-								<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
-								{{if .Owner.Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
+					{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
+					{{.locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form ignore-dirty">
+						<div class="ui fluid action input">
+							<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+							<select class="ui dropdown" name="type">
+								<option value="">{{.locale.Tr "packages.filter.type"}}</option>
+								<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
+								{{range $type := .AvailableTypes}}
+								<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
 								{{end}}
-							</td>
-							<td>{{.Package.Type.Name}}</td>
-							<td class="text truncate email">{{.Package.Name}}</td>
-							<td><a href="{{.FullWebLink}}" class="text truncate email">{{.Version.Version}}</a></td>
-							<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
-							<td>
-							{{if .Repository}}
-								<a href="{{.Repository.Link}}">{{.Repository.Name}}</a>
+							</select>
+							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+						</div>
+					</form>
+				</div>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th>ID</th>
+								<th>{{.locale.Tr "admin.packages.owner"}}</th>
+								<th>{{.locale.Tr "admin.packages.type"}}</th>
+								<th data-sortt-asc="name_asc" data-sortt-desc="name_desc">
+									{{.locale.Tr "admin.packages.name"}}
+									{{SortArrow "name_asc" "name_desc" .SortType false}}
+								</th>
+								<th data-sortt-asc="version_desc" data-sortt-desc="version_asc">
+									{{.locale.Tr "admin.packages.version"}}
+									{{SortArrow "version_desc" "version_asc" .SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.packages.creator"}}</th>
+								<th>{{.locale.Tr "admin.packages.repository"}}</th>
+								<th>{{.locale.Tr "admin.packages.size"}}</th>
+								<th data-sortt-asc="created_asc" data-sortt-desc="created_desc">
+									{{.locale.Tr "admin.packages.published"}}
+									{{SortArrow "created_asc" "created_desc" .SortType true}}
+								</th>
+								<th>{{.locale.Tr "admin.notices.op"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .PackageDescriptors}}
+								<tr>
+									<td>{{.Version.ID}}</td>
+									<td>
+										<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
+										{{if .Owner.Visibility.IsPrivate}}
+											<span class="text gold">{{svg "octicon-lock"}}</span>
+										{{end}}
+									</td>
+									<td>{{.Package.Type.Name}}</td>
+									<td class="text truncate email">{{.Package.Name}}</td>
+									<td><a href="{{.FullWebLink}}" class="text truncate email">{{.Version.Version}}</a></td>
+									<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
+									<td>
+									{{if .Repository}}
+										<a href="{{.Repository.Link}}">{{.Repository.Name}}</a>
+									{{end}}
+									</td>
+									<td>{{FileSize .CalculateBlobSize}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
+									<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
+								</tr>
 							{{end}}
-							</td>
-							<td>{{FileSize .CalculateBlobSize}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
-							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-		</div>
+						</tbody>
+					</table>
+				</div>
 
-		{{template "base/paginate" .}}
+				{{template "base/paginate" .}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 767c235a385e..d3d50132536d 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,183 +1,187 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
-		</h4>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table">
-				<thead>
-					<tr>
-						<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td>{{.Queue.Name}}</td>
-						<td>{{.Queue.Type}}</td>
-						<td>{{.Queue.ExemplarType}}</td>
-						<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-						<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
-						<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-		{{if lt $sum 0}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.nopool.title"}}
-		</h4>
-		<div class="ui attached segment">
-			{{if eq .Queue.Type "wrapped"}}
-			<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
-			{{else if eq .Queue.Type "persistable-channel"}}
-			<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
-			{{else}}
-			<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
-			{{end}}
-		</div>
-		{{else}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.settings.title"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
-			<form method="POST" action="{{.Link}}/set">
-				{{$.CsrfTokenHtml}}
-				<div class="ui form">
-					<div class="inline field">
-						<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
-						<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
-					</div>
-					<div class="inline field">
-						<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
-						<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
-					</div>
-					<div class="inline field">
-						<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
-						<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
-					</div>
-					<div class="inline field">
-						<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
-						<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
-					</div>
-					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
+				</h4>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table">
+						<thead>
+							<tr>
+								<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>{{.Queue.Name}}</td>
+								<td>{{.Queue.Type}}</td>
+								<td>{{.Queue.ExemplarType}}</td>
+								<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+								<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
+								<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+							</tr>
+						</tbody>
+					</table>
 				</div>
-			</form>
-		</div>
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
-			<form method="POST" action="{{.Link}}/add">
-				{{$.CsrfTokenHtml}}
-				<div class="ui form">
-					<div class="fields">
-						<div class="field">
-							<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
-							<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
-						</div>
-						<div class="field">
-							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
-							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
-						</div>
-					</div>
-					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
+				{{if lt $sum 0}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queue.nopool.title"}}
+				</h4>
+				<div class="ui attached segment">
+					{{if eq .Queue.Type "wrapped"}}
+					<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
+					{{else if eq .Queue.Type "persistable-channel"}}
+					<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
+					{{else}}
+					<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
+					{{end}}
 				</div>
-			</form>
-		</div>
-		{{if .Queue.Pausable}}
-			{{if .Queue.IsPaused}}
+				{{else}}
 				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
+					{{.locale.Tr "admin.monitor.queue.settings.title"}}
 				</h4>
 				<div class="ui attached segment">
-					<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
-					<form method="POST" action="{{.Link}}/resume">
+					<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
+					<form method="POST" action="{{.Link}}/set">
 						{{$.CsrfTokenHtml}}
 						<div class="ui form">
-							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
+							<div class="inline field">
+								<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
+								<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
+							</div>
+							<div class="inline field">
+								<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
+								<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
+							</div>
+							<div class="inline field">
+								<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
+								<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
+							</div>
+							<div class="inline field">
+								<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
+								<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
+							</div>
+							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
 						</div>
 					</form>
 				</div>
-			{{else}}
 				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
+					{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
 				</h4>
 				<div class="ui attached segment">
-					<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
-					<form method="POST" action="{{.Link}}/pause">
+					<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
+					<form method="POST" action="{{.Link}}/add">
 						{{$.CsrfTokenHtml}}
 						<div class="ui form">
-							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
+							<div class="fields">
+								<div class="field">
+									<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
+									<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
+								</div>
+								<div class="field">
+									<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
+									<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
+								</div>
+							</div>
+							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
 						</div>
 					</form>
 				</div>
-			{{end}}
-		{{end}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
-			<form method="POST" action="{{.Link}}/flush">
-				{{$.CsrfTokenHtml}}
-				<div class="ui form">
-					<div class="fields">
-						<div class="field">
-							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
-							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
+				{{if .Queue.Pausable}}
+					{{if .Queue.IsPaused}}
+						<h4 class="ui top attached header">
+							{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
+						</h4>
+						<div class="ui attached segment">
+							<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
+							<form method="POST" action="{{.Link}}/resume">
+								{{$.CsrfTokenHtml}}
+								<div class="ui form">
+									<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
+								</div>
+							</form>
 						</div>
-					</div>
-					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
-				</div>
-			</form>
-		</div>
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
-		</h4>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table">
-				<thead>
-					<tr>
-						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-						<th>{{.locale.Tr "admin.monitor.start"}}</th>
-						<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Queue.Workers}}
-					<tr>
-						<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
-						<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
-						<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
-						<td>
-							<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
-						</td>
-					</tr>
 					{{else}}
-						<tr>
-							<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
-						</tr>
+						<h4 class="ui top attached header">
+							{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
+						</h4>
+						<div class="ui attached segment">
+							<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
+							<form method="POST" action="{{.Link}}/pause">
+								{{$.CsrfTokenHtml}}
+								<div class="ui form">
+									<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
+								</div>
+							</form>
+						</div>
 					{{end}}
-				</tbody>
-			</table>
-		</div>
-		{{end}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.queue.configuration"}}
-		</h4>
-		<div class="ui attached segment">
-			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
+				{{end}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
+				</h4>
+				<div class="ui attached segment">
+					<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
+					<form method="POST" action="{{.Link}}/flush">
+						{{$.CsrfTokenHtml}}
+						<div class="ui form">
+							<div class="fields">
+								<div class="field">
+									<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
+									<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
+								</div>
+							</div>
+							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
+						</div>
+					</form>
+				</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
+				</h4>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table">
+						<thead>
+							<tr>
+								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+								<th>{{.locale.Tr "admin.monitor.start"}}</th>
+								<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
+								<th></th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Queue.Workers}}
+							<tr>
+								<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
+								<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
+								<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
+								<td>
+									<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
+								</td>
+							</tr>
+							{{else}}
+								<tr>
+									<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
+				{{end}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.queue.configuration"}}
+				</h4>
+				<div class="ui attached segment">
+					<pre>{{.Queue.Configuration | JsonPrettyPrint}}
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index f8e2bbc8444e..9b3138e8fc2b 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,97 +1,101 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos/unadopted">{{.locale.Tr "admin.repos.unadopted"}}</a>
-			</div>
-		</h4>
-		<div class="ui attached segment">
-			{{template "admin/repo/search" .}}
-		</div>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
-						<th>{{.locale.Tr "admin.repos.owner"}}</th>
-						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
-							{{.locale.Tr "admin.repos.name"}}
-							{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.repos.watches"}}</th>
-						<th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
-							{{.locale.Tr "admin.repos.stars"}}
-							{{SortArrow "moststars" "feweststars" $.SortType false}}
-						</th>
-						<th  data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
-							{{.locale.Tr "admin.repos.forks"}}
-							{{SortArrow "mostforks" "fewestforks" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.repos.issues"}}</th>
-						<th  data-sortt-asc="size" data-sortt-desc="reversesize">
-							{{.locale.Tr "admin.repos.size"}}
-							{{SortArrow "size" "reversesize" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.users.created"}}</th>
-						<th>{{.locale.Tr "admin.notices.op"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Repos}}
-						<tr>
-							<td>{{.ID}}</td>
-							<td>
-								<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
-								{{if .Owner.Visibility.IsPrivate}}
-									<span class="text gold">{{svg "octicon-lock"}}</span>
-								{{end}}
-							</td>
-							<td>
-								<a href="{{.Link}}">{{.Name}}</a>
-								{{if .IsArchived}}
-									<span class="ui basic mini label">{{$.locale.Tr "repo.desc.archived"}}</span>
-								{{end}}
-								{{if .IsTemplate}}
-									{{if .IsPrivate}}
-										<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private_template"}}</span>
-									{{else}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos/unadopted">{{.locale.Tr "admin.repos.unadopted"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					{{template "admin/repo/search" .}}
+				</div>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
+								<th>{{.locale.Tr "admin.repos.owner"}}</th>
+								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
+									{{.locale.Tr "admin.repos.name"}}
+									{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.repos.watches"}}</th>
+								<th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
+									{{.locale.Tr "admin.repos.stars"}}
+									{{SortArrow "moststars" "feweststars" $.SortType false}}
+								</th>
+								<th  data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
+									{{.locale.Tr "admin.repos.forks"}}
+									{{SortArrow "mostforks" "fewestforks" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.repos.issues"}}</th>
+								<th  data-sortt-asc="size" data-sortt-desc="reversesize">
+									{{.locale.Tr "admin.repos.size"}}
+									{{SortArrow "size" "reversesize" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.users.created"}}</th>
+								<th>{{.locale.Tr "admin.notices.op"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Repos}}
+								<tr>
+									<td>{{.ID}}</td>
+									<td>
+										<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
 										{{if .Owner.Visibility.IsPrivate}}
-											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal_template"}}</span>
+											<span class="text gold">{{svg "octicon-lock"}}</span>
 										{{end}}
-									{{end}}
-								{{else}}
-									{{if .IsPrivate}}
-										<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private"}}</span>
-									{{else}}
-										{{if .Owner.Visibility.IsPrivate}}
-											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal"}}</span>
+									</td>
+									<td>
+										<a href="{{.Link}}">{{.Name}}</a>
+										{{if .IsArchived}}
+											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.archived"}}</span>
 										{{end}}
-									{{end}}
-								{{end}}
-								{{if .IsFork}}
-									{{svg "octicon-repo-forked"}}
-								{{else if .IsMirror}}
-									{{svg "octicon-mirror"}}
-								{{end}}
-							</td>
-							<td>{{.NumWatches}}</td>
-							<td>{{.NumStars}}</td>
-							<td>{{.NumForks}}</td>
-							<td>{{.NumIssues}}</td>
-							<td>{{FileSize .Size}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-		</div>
+										{{if .IsTemplate}}
+											{{if .IsPrivate}}
+												<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private_template"}}</span>
+											{{else}}
+												{{if .Owner.Visibility.IsPrivate}}
+													<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal_template"}}</span>
+												{{end}}
+											{{end}}
+										{{else}}
+											{{if .IsPrivate}}
+												<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private"}}</span>
+											{{else}}
+												{{if .Owner.Visibility.IsPrivate}}
+													<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal"}}</span>
+												{{end}}
+											{{end}}
+										{{end}}
+										{{if .IsFork}}
+											{{svg "octicon-repo-forked"}}
+										{{else if .IsMirror}}
+											{{svg "octicon-mirror"}}
+										{{end}}
+									</td>
+									<td>{{.NumWatches}}</td>
+									<td>{{.NumStars}}</td>
+									<td>{{.NumForks}}</td>
+									<td>{{.NumIssues}}</td>
+									<td>{{FileSize .Size}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+									<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
 
-		{{template "base/paginate" .}}
+				{{template "base/paginate" .}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index a8e04850d0dd..edaa6ee97e28 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,101 +1,105 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.repos.unadopted"}}
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos">{{.locale.Tr "admin.repos.repo_manage_panel"}}</a>
-			</div>
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form ignore-dirty">
-				<div class="ui fluid action input">
-				<input name="search" value="true" type="hidden">
-				<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "repo.adopt_search"}}" autofocus>
-				<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.repos.unadopted"}}
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos">{{.locale.Tr "admin.repos.repo_manage_panel"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form ignore-dirty">
+						<div class="ui fluid action input">
+						<input name="search" value="true" type="hidden">
+						<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "repo.adopt_search"}}" autofocus>
+						<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
-		{{if .search}}
-			<div class="ui attached segment settings">
-				{{if .Dirs}}
-					<div class="ui middle aligned divided list">
-						{{range $dirI, $dir := .Dirs}}
-							<div class="item">
-								<div class="content">
-									<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
-									<span class="name">{{$dir}}</span>
-									<div class="right floated content">
-										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-										<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
-											<div class="header">
-												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
-											</div>
-											<div class="content">
-												<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
-											</div>
-											<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
-												{{$.CsrfTokenHtml}}
-												<input type="hidden" name="id" value="{{$dir}}">
-												<input type="hidden" name="action" value="adopt">
-												<input type="hidden" name="q" value="{{$.Keyword}}">
-												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
-													<button class="ui red basic inverted cancel button">
-														{{svg "octicon-trash" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.no"}}
-													</button>
-													<button class="ui green basic inverted ok button">
-														{{svg "octicon-check" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.yes"}}
-													</button>
+				{{if .search}}
+					<div class="ui attached segment settings">
+						{{if .Dirs}}
+							<div class="ui middle aligned divided list">
+								{{range $dirI, $dir := .Dirs}}
+									<div class="item">
+										<div class="content">
+											<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
+											<span class="name">{{$dir}}</span>
+											<div class="right floated content">
+												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
+												<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+													{{svg "octicon-x" 16 "close inside"}}
+													<div class="header">
+														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
+													</div>
+													<div class="content">
+														<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
+													</div>
+													<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
+														{{$.CsrfTokenHtml}}
+														<input type="hidden" name="id" value="{{$dir}}">
+														<input type="hidden" name="action" value="adopt">
+														<input type="hidden" name="q" value="{{$.Keyword}}">
+														<input type="hidden" name="page" value="{{$.CurrentPage}}">
+														<div class="actions">
+															<button class="ui red basic inverted cancel button">
+																{{svg "octicon-trash" 16 "gt-mr-2"}}
+																{{$.locale.Tr "modal.no"}}
+															</button>
+															<button class="ui green basic inverted ok button">
+																{{svg "octicon-check" 16 "gt-mr-2"}}
+																{{$.locale.Tr "modal.yes"}}
+															</button>
+														</div>
+													</form>
 												</div>
-											</form>
-										</div>
-										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-										<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-											{{svg "octicon-x" 16 "close inside"}}
-											<div class="header">
-												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
-											</div>
-											<div class="content">
-												<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
-											</div>
-											<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
-												{{$.CsrfTokenHtml}}
-												<input type="hidden" name="id" value="{{$dir}}">
-												<input type="hidden" name="action" value="delete">
-												<input type="hidden" name="q" value="{{$.Keyword}}">
-												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">
-													<button class="ui red basic inverted cancel button">
-														{{svg "octicon-trash" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.no"}}
-													</button>
-													<button class="ui green basic inverted ok button">
-														{{svg "octicon-check" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.yes"}}
-													</button>
+												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+												<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+													{{svg "octicon-x" 16 "close inside"}}
+													<div class="header">
+														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+													</div>
+													<div class="content">
+														<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
+													</div>
+													<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
+														{{$.CsrfTokenHtml}}
+														<input type="hidden" name="id" value="{{$dir}}">
+														<input type="hidden" name="action" value="delete">
+														<input type="hidden" name="q" value="{{$.Keyword}}">
+														<input type="hidden" name="page" value="{{$.CurrentPage}}">
+														<div class="actions">
+															<button class="ui red basic inverted cancel button">
+																{{svg "octicon-trash" 16 "gt-mr-2"}}
+																{{$.locale.Tr "modal.no"}}
+															</button>
+															<button class="ui green basic inverted ok button">
+																{{svg "octicon-check" 16 "gt-mr-2"}}
+																{{$.locale.Tr "modal.yes"}}
+															</button>
+														</div>
+													</form>
 												</div>
-											</form>
+											</div>
 										</div>
 									</div>
-								</div>
+								{{end}}
 							</div>
+							{{template "base/paginate" .}}
+						{{else}}
+							<div class="item">
+								{{.locale.Tr "admin.repos.unadopted.no_more"}}
+							</div>
+							{{template "base/paginate" .}}
 						{{end}}
 					</div>
-					{{template "base/paginate" .}}
-				{{else}}
-					<div class="item">
-						{{.locale.Tr "admin.repos.unadopted.no_more"}}
-					</div>
-					{{template "base/paginate" .}}
 				{{end}}
 			</div>
-		{{end}}
+		</div>
 	</div>
 </div>
 
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index a00a4dbc2615..0561dbd05d22 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -1,8 +1,12 @@
 {{template "base/head" .}}
 <div class="page-content admin runners">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "shared/actions/runner_list" .}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "shared/actions/runner_list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index 0963e97a5b6c..4c966f5ea0c7 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -1,8 +1,12 @@
 {{template "base/head" .}}
 <div class="page-content admin runners">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "shared/actions/runner_edit" .}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "shared/actions/runner_edit" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 4e16036ae3a3..dfc6ab157d5e 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,19 +1,23 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/monitor">{{.locale.Tr "admin.monitor"}}</a>
-			</div>
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui relaxed divided list">
-				{{range .ProcessStacks}}
-					{{template "admin/stacktrace-row" dict "Process" . "root" $}}
-				{{end}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/monitor">{{.locale.Tr "admin.monitor"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui relaxed divided list">
+						{{range .ProcessStacks}}
+							{{template "admin/stacktrace-row" dict "Process" . "root" $}}
+						{{end}}
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 4fd0d892f258..8c520a36b31e 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,197 +1,201 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.users.edit_account"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<div class="field {{if .Err_UserName}}error{{end}}">
-					<label for="user_name">{{.locale.Tr "username"}}</label>
-					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
-				</div>
-				<!-- Types and name -->
-				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
-					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
-						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
-							{{range .Sources}}
-								<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
-							{{end}}
-						</div>
-					</div>
-				</div>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.users.edit_account"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<div class="field {{if .Err_UserName}}error{{end}}">
+							<label for="user_name">{{.locale.Tr "username"}}</label>
+							<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
+						</div>
+						<!-- Types and name -->
+						<div class="inline required field {{if .Err_LoginType}}error{{end}}">
+							<label>{{.locale.Tr "admin.users.auth_source"}}</label>
+							<div class="ui selection type dropdown">
+								<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
+								<div class="text">{{.locale.Tr "admin.users.local"}}</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
+									{{range .Sources}}
+										<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
+									{{end}}
+								</div>
+							</div>
+						</div>
 
-				<div class="inline field {{if .Err_Visibility}}error{{end}}">
-					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-					<div class="ui selection type dropdown">
-						{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
-						{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
-						{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
-						<div class="text">
-							{{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-							{{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-							{{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-						</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							{{range $mode := .AllowedUserVisibilityModes}}
-								{{if $mode.IsPublic}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-								{{else if $mode.IsLimited}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-								{{else if $mode.IsPrivate}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-								{{end}}
-							{{end}}
-						</div>
-					</div>
-				</div>
+						<div class="inline field {{if .Err_Visibility}}error{{end}}">
+							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+							<div class="ui selection type dropdown">
+								{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
+								{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
+								{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
+								<div class="text">
+									{{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+									{{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+									{{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+								</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									{{range $mode := .AllowedUserVisibilityModes}}
+										{{if $mode.IsPublic}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+										{{else if $mode.IsLimited}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+										{{else if $mode.IsPrivate}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+										{{end}}
+									{{end}}
+								</div>
+							</div>
+						</div>
 
-				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}gt-hidden{{end}}">
-					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-					<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
-				</div>
-				<div class="field {{if .Err_FullName}}error{{end}}">
-					<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
-					<input id="full_name" name="full_name" value="{{.User.FullName}}">
-				</div>
-				<div class="required field {{if .Err_Email}}error{{end}}">
-					<label for="email">{{.locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
-				</div>
-				<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}gt-hidden{{end}}">
-					<label for="password">{{.locale.Tr "password"}}</label>
-					<input id="password" name="password" type="password" autocomplete="new-password">
-					<p class="help">{{.locale.Tr "admin.users.password_helper"}}</p>
-				</div>
-				<div class="field {{if .Err_Website}}error{{end}}">
-					<label for="website">{{.locale.Tr "settings.website"}}</label>
-					<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
-				</div>
-				<div class="field {{if .Err_Location}}error{{end}}">
-					<label for="location">{{.locale.Tr "settings.location"}}</label>
-					<input id="location" name="location" value="{{.User.Location}}">
-				</div>
+						<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}gt-hidden{{end}}">
+							<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
+							<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
+						</div>
+						<div class="field {{if .Err_FullName}}error{{end}}">
+							<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
+							<input id="full_name" name="full_name" value="{{.User.FullName}}">
+						</div>
+						<div class="required field {{if .Err_Email}}error{{end}}">
+							<label for="email">{{.locale.Tr "email"}}</label>
+							<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
+						</div>
+						<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}gt-hidden{{end}}">
+							<label for="password">{{.locale.Tr "password"}}</label>
+							<input id="password" name="password" type="password" autocomplete="new-password">
+							<p class="help">{{.locale.Tr "admin.users.password_helper"}}</p>
+						</div>
+						<div class="field {{if .Err_Website}}error{{end}}">
+							<label for="website">{{.locale.Tr "settings.website"}}</label>
+							<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
+						</div>
+						<div class="field {{if .Err_Location}}error{{end}}">
+							<label for="location">{{.locale.Tr "settings.location"}}</label>
+							<input id="location" name="location" value="{{.User.Location}}">
+						</div>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
-					<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
-					<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
-					<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
-				</div>
+						<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
+							<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
+							<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
+							<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
+						</div>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.is_activated"}}</strong></label>
-						<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.prohibit_login"}}</strong></label>
-						<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.is_admin"}}</strong></label>
-						<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.is_restricted"}}</strong></label>
-						<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
-					</div>
-				</div>
-				<div class="inline field {{if DisableGitHooks}}gt-hidden{{end}}">
-					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "admin.users.allow_git_hook_tooltip"}}">
-						<label><strong>{{.locale.Tr "admin.users.allow_git_hook"}}</strong></label>
-						<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
-					</div>
-				</div>
-				<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}gt-hidden{{end}}">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.allow_import_local"}}</strong></label>
-						<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
-					</div>
-				</div>
-				{{if not .DisableRegularOrgCreation}}
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.allow_create_organization"}}</strong></label>
-						<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
-					</div>
-				</div>
-				{{end}}
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.is_activated"}}</strong></label>
+								<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.prohibit_login"}}</strong></label>
+								<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.is_admin"}}</strong></label>
+								<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.is_restricted"}}</strong></label>
+								<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
+							</div>
+						</div>
+						<div class="inline field {{if DisableGitHooks}}gt-hidden{{end}}">
+							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "admin.users.allow_git_hook_tooltip"}}">
+								<label><strong>{{.locale.Tr "admin.users.allow_git_hook"}}</strong></label>
+								<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
+							</div>
+						</div>
+						<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}gt-hidden{{end}}">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.allow_import_local"}}</strong></label>
+								<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
+							</div>
+						</div>
+						{{if not .DisableRegularOrgCreation}}
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.allow_create_organization"}}</strong></label>
+								<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
+							</div>
+						</div>
+						{{end}}
 
-				{{if .TwoFactorEnabled}}
-				<div class="ui divider"></div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
-						<input name="reset_2fa" type="checkbox">
-					</div>
-				</div>
-				{{end}}
+						{{if .TwoFactorEnabled}}
+						<div class="ui divider"></div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
+								<input name="reset_2fa" type="checkbox">
+							</div>
+						</div>
+						{{end}}
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<div class="field">
-					<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
-					<button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
+						<div class="field">
+							<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
+							<button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.avatar"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-				{{.CsrfTokenHtml}}
-				{{if not (DisableGravatar $.Context)}}
-				<div class="inline field">
-					<div class="ui radio checkbox">
-						<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
-						<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
-					</div>
-				</div>
-				<div class="field {{if .Err_Gravatar}}error{{end}}">
-					<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
-					<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
-				</div>
-				{{end}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.avatar"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+						{{.CsrfTokenHtml}}
+						{{if not (DisableGravatar $.Context)}}
+						<div class="inline field">
+							<div class="ui radio checkbox">
+								<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
+								<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
+							</div>
+						</div>
+						<div class="field {{if .Err_Gravatar}}error{{end}}">
+							<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
+							<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
+						</div>
+						{{end}}
 
-				<div class="inline field">
-					<div class="ui radio checkbox">
-						<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
-						<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
-					</div>
-				</div>
+						<div class="inline field">
+							<div class="ui radio checkbox">
+								<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
+								<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
+							</div>
+						</div>
 
-				<div class="inline field">
-					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" >
-				</div>
+						<div class="inline field">
+							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+							<input name="avatar" type="file" >
+						</div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
+						</div>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 50b9d136190e..4b797b1488ed 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,113 +1,117 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/users/new">{{.locale.Tr "admin.users.new_account"}}</a>
-			</div>
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form ignore-dirty" id="user-list-search-form">
-
-				<!-- Right Menu -->
-				<div class="ui right floated secondary filter menu">
-					<!-- Status Filter Menu Item -->
-					<div class="ui dropdown type jump item">
-						<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
-						<div class="menu">
-							<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
-							<div class="ui divider"></div>
-							<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_admin"}}</label>
-							<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_admin"}}</label>
-							<div class="ui divider"></div>
-							<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_active"}}</label>
-							<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_active"}}</label>
-							<div class="ui divider"></div>
-							<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_restricted"}}</label>
-							<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_restricted"}}</label>
-							<div class="ui divider"></div>
-							<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
-							<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
-							<div class="ui divider"></div>
-							<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
-							<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
-						</div>
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/users/new">{{.locale.Tr "admin.users.new_account"}}</a>
 					</div>
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form ignore-dirty" id="user-list-search-form">
 
-					<!-- Sort Menu Item -->
-					<div class="ui dropdown type jump item">
-						<span class="text">
-							{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						</span>
-						<div class="menu">
-							<button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button>
-							<button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button>
-							<button class="item" name="sort" value="alphabetically">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</button>
-							<button class="item" name="sort" value="reversealphabetically">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</button>
-							<button class="item" name="sort" value="recentupdate">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</button>
-							<button class="item" name="sort" value="leastupdate">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</button>
+						<!-- Right Menu -->
+						<div class="ui right floated secondary filter menu">
+							<!-- Status Filter Menu Item -->
+							<div class="ui dropdown type jump item">
+								<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
+								<div class="menu">
+									<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
+									<div class="ui divider"></div>
+									<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_admin"}}</label>
+									<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_admin"}}</label>
+									<div class="ui divider"></div>
+									<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_active"}}</label>
+									<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_active"}}</label>
+									<div class="ui divider"></div>
+									<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_restricted"}}</label>
+									<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_restricted"}}</label>
+									<div class="ui divider"></div>
+									<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
+									<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
+									<div class="ui divider"></div>
+									<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
+									<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
+								</div>
+							</div>
+
+							<!-- Sort Menu Item -->
+							<div class="ui dropdown type jump item">
+								<span class="text">
+									{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								</span>
+								<div class="menu">
+									<button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button>
+									<button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button>
+									<button class="item" name="sort" value="alphabetically">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</button>
+									<button class="item" name="sort" value="reversealphabetically">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</button>
+									<button class="item" name="sort" value="recentupdate">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</button>
+									<button class="item" name="sort" value="leastupdate">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</button>
+								</div>
+							</div>
 						</div>
-					</div>
-				</div>
 
-				<!-- Search Text -->
-				<div class="ui fluid action input" style="max-width: 70%;">
-					<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+						<!-- Search Text -->
+						<div class="ui fluid action input" style="max-width: 70%;">
+							<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
-		<div class="ui attached table segment">
-			<table class="ui very basic striped table unstackable">
-				<thead>
-					<tr>
-						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th>
-						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
-							{{.locale.Tr "admin.users.name"}}
-							{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
-						</th>
-						<th>{{.locale.Tr "email"}}</th>
-						<th>{{.locale.Tr "admin.users.activated"}}</th>
-						<th>{{.locale.Tr "admin.users.admin"}}</th>
-						<th>{{.locale.Tr "admin.users.restricted"}}</th>
-						<th>{{.locale.Tr "admin.users.2fa"}}</th>
-						<th>{{.locale.Tr "admin.users.repos"}}</th>
-						<th>{{.locale.Tr "admin.users.created"}}</th>
-						<th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin">
-							{{.locale.Tr "admin.users.last_login"}}
-							{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
-						</th>
-						<th>{{.locale.Tr "admin.users.edit"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Users}}
-						<tr>
-							<td>{{.ID}}</td>
-							<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
-							<td><span class="text truncate email">{{.Email}}</span></td>
-							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{.NumRepos}}</td>
-							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-							{{if .LastLoginUnix}}
-								<td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td>
-							{{else}}
-								<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
+				<div class="ui attached table segment">
+					<table class="ui very basic striped table unstackable">
+						<thead>
+							<tr>
+								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th>
+								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
+									{{.locale.Tr "admin.users.name"}}
+									{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
+								</th>
+								<th>{{.locale.Tr "email"}}</th>
+								<th>{{.locale.Tr "admin.users.activated"}}</th>
+								<th>{{.locale.Tr "admin.users.admin"}}</th>
+								<th>{{.locale.Tr "admin.users.restricted"}}</th>
+								<th>{{.locale.Tr "admin.users.2fa"}}</th>
+								<th>{{.locale.Tr "admin.users.repos"}}</th>
+								<th>{{.locale.Tr "admin.users.created"}}</th>
+								<th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin">
+									{{.locale.Tr "admin.users.last_login"}}
+									{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
+								</th>
+								<th>{{.locale.Tr "admin.users.edit"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Users}}
+								<tr>
+									<td>{{.ID}}</td>
+									<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
+									<td><span class="text truncate email">{{.Email}}</span></td>
+									<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{.NumRepos}}</td>
+									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+									{{if .LastLoginUnix}}
+										<td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td>
+									{{else}}
+										<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
+									{{end}}
+									<td><a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
+								</tr>
 							{{end}}
-							<td><a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-		</div>
+						</tbody>
+					</table>
+				</div>
 
-		{{template "base/paginate" .}}
+				{{template "base/paginate" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 3f25c30c8b5d..258209170849 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,93 +1,97 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content admin new user">
-	{{template "admin/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "admin.users.new_account"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<!-- Types and name -->
-				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
-					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
-						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
-							{{range .Sources}}
-								<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
-							{{end}}
+		<div class="ui grid">
+			{{template "admin/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "admin.users.new_account"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<!-- Types and name -->
+						<div class="inline required field {{if .Err_LoginType}}error{{end}}">
+							<label>{{.locale.Tr "admin.users.auth_source"}}</label>
+							<div class="ui selection type dropdown">
+								<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
+								<div class="text">{{.locale.Tr "admin.users.local"}}</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
+									{{range .Sources}}
+										<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
+									{{end}}
+								</div>
+							</div>
+						</div>
+
+						<div class="inline field {{if .Err_Visibility}}error{{end}}">
+							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+							<div class="ui selection type dropdown">
+								<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
+								<div class="text">
+									{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+									{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+									{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+								</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									{{range $mode := .AllowedUserVisibilityModes}}
+										{{if $mode.IsPublic}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+										{{else if $mode.IsLimited}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+										{{else if $mode.IsPrivate}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+										{{end}}
+									{{end}}
+								</div>
+							</div>
 						</div>
-					</div>
-				</div>
 
-				<div class="inline field {{if .Err_Visibility}}error{{end}}">
-					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-					<div class="ui selection type dropdown">
-						<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
-						<div class="text">
-							{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-							{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+						<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}gt-hidden{{end}}">
+							<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
+							<input id="login_name" name="login_name" value="{{.login_name}}">
 						</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							{{range $mode := .AllowedUserVisibilityModes}}
-								{{if $mode.IsPublic}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-								{{else if $mode.IsLimited}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-								{{else if $mode.IsPrivate}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-								{{end}}
-							{{end}}
+						<div class="required field {{if .Err_UserName}}error{{end}}">
+							<label for="user_name">{{.locale.Tr "username"}}</label>
+							<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+						</div>
+						<div class="required field {{if .Err_Email}}error{{end}}">
+							<label for="email">{{.locale.Tr "email"}}</label>
+							<input id="email" name="email" type="email" value="{{.email}}" required>
+						</div>
+						<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}gt-hidden{{end}}">
+							<label for="password">{{.locale.Tr "password"}}</label>
+							<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
 						</div>
-					</div>
-				</div>
 
-				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}gt-hidden{{end}}">
-					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-					<input id="login_name" name="login_name" value="{{.login_name}}">
-				</div>
-				<div class="required field {{if .Err_UserName}}error{{end}}">
-					<label for="user_name">{{.locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-				</div>
-				<div class="required field {{if .Err_Email}}error{{end}}">
-					<label for="email">{{.locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.email}}" required>
-				</div>
-				<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}gt-hidden{{end}}">
-					<label for="password">{{.locale.Tr "password"}}</label>
-					<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
-				</div>
+						<div class="inline field local {{if ne .login_type "0-0"}}gt-hidden{{end}}">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
+								<input name="must_change_password" type="checkbox" checked>
+							</div>
+						</div>
 
-				<div class="inline field local {{if ne .login_type "0-0"}}gt-hidden{{end}}">
-					<div class="ui checkbox">
-						<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
-						<input name="must_change_password" type="checkbox" checked>
-					</div>
-				</div>
+						<!-- Send register notify e-mail -->
+						{{if .CanSendEmail}}
+							<div class="inline field">
+								<div class="ui checkbox">
+									<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
+									<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
+								</div>
+							</div>
+						{{end}}
 
-				<!-- Send register notify e-mail -->
-				{{if .CanSendEmail}}
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
-							<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
+						<div class="field">
+							<button class="ui green button">{{.locale.Tr "admin.users.new_account"}}</button>
 						</div>
-					</div>
-				{{end}}
-
-				<div class="field">
-					<button class="ui green button">{{.locale.Tr "admin.users.new_account"}}</button>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>

From cf0452b2ec0ef5e000771377e17da5a96044a98d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 09:57:11 +0800
Subject: [PATCH 02/21] rebase

---
 .../settings/applications_oauth2_edit.tmpl    |  11 +-
 templates/user/settings/account.tmpl          | 284 +++++-----
 templates/user/settings/appearance.tmpl       | 310 +++++------
 templates/user/settings/applications.tmpl     | 488 +++++++++---------
 .../settings/applications_oauth2_edit.tmpl    |  11 +-
 templates/user/settings/hook_new.tmpl         |  92 ++--
 templates/user/settings/hooks.tmpl            |   8 +-
 templates/user/settings/keys.tmpl             |  14 +-
 templates/user/settings/navbar.tmpl           |   5 +-
 templates/user/settings/organization.tmpl     |  70 +--
 templates/user/settings/packages.tmpl         |  40 +-
 .../settings/packages_cleanup_rules_edit.tmpl |  10 +-
 .../packages_cleanup_rules_preview.tmpl       |   8 +-
 templates/user/settings/profile.tmpl          | 238 ++++-----
 templates/user/settings/repos.tmpl            | 119 +++--
 templates/user/settings/secrets.tmpl          |  10 +-
 .../user/settings/security/security.tmpl      |  20 +-
 .../user/settings/security/twofa_enroll.tmpl  |  44 +-
 18 files changed, 924 insertions(+), 858 deletions(-)

diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl
index 861651a15e7d..b686f7ffb7c3 100644
--- a/templates/org/settings/applications_oauth2_edit.tmpl
+++ b/templates/org/settings/applications_oauth2_edit.tmpl
@@ -1,7 +1,12 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-
-	{{template "user/settings/applications_oauth2_edit_form" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "org/header" .}}
+			<div class="twelve wide column content">
+				{{template "user/settings/applications_oauth2_edit_form" .}}
+			</div>
+		</div>
+	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 53f7d021e0b6..14f798b3da9c 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,162 +1,166 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings account">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.password"}}
-		</h4>
-		<div class="ui attached segment">
-			{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}}
-			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/account" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				{{if .SignedUser.IsPasswordSet}}
-				<div class="required field {{if .Err_OldPassword}}error{{end}}">
-					<label for="old_password">{{.locale.Tr "settings.old_password"}}</label>
-					<input id="old_password" name="old_password" type="password" autocomplete="current-password" autofocus required>
-				</div>
-				{{end}}
-				<div class="required field {{if .Err_Password}}error{{end}}">
-					<label for="password">{{.locale.Tr "settings.new_password"}}</label>
-					<input id="password" name="password" type="password" autocomplete="new-password" required>
-				</div>
-				<div class="required field {{if .Err_Password}}error{{end}}">
-					<label for="retype">{{.locale.Tr "settings.retype_new_password"}}</label>
-					<input id="retype" name="retype" type="password" autocomplete="new-password" required>
-				</div>
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.password"}}
+				</h4>
+				<div class="ui attached segment">
+					{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}}
+					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/account" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						{{if .SignedUser.IsPasswordSet}}
+						<div class="required field {{if .Err_OldPassword}}error{{end}}">
+							<label for="old_password">{{.locale.Tr "settings.old_password"}}</label>
+							<input id="old_password" name="old_password" type="password" autocomplete="current-password" autofocus required>
+						</div>
+						{{end}}
+						<div class="required field {{if .Err_Password}}error{{end}}">
+							<label for="password">{{.locale.Tr "settings.new_password"}}</label>
+							<input id="password" name="password" type="password" autocomplete="new-password" required>
+						</div>
+						<div class="required field {{if .Err_Password}}error{{end}}">
+							<label for="retype">{{.locale.Tr "settings.retype_new_password"}}</label>
+							<input id="retype" name="retype" type="password" autocomplete="new-password" required>
+						</div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.change_password"}}</button>
-					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.change_password"}}</button>
+							<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+						</div>
+					</form>
+					{{else}}
+					<div class="ui info message">
+						<p class="text left">{{$.locale.Tr "settings.password_change_disabled"}}</p>
+					</div>
+					{{end}}
 				</div>
-			</form>
-			{{else}}
-			<div class="ui info message">
-				<p class="text left">{{$.locale.Tr "settings.password_change_disabled"}}</p>
-			</div>
-			{{end}}
-		</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.manage_emails"}}
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui email list">
-				{{if $.EnableNotifyMail}}
-				<div class="item">
-					<form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post">
-						{{.locale.Tr "settings.email_desc"}}
-						<div class="right floated content">
-							<div class="field">
-								<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
-							</div>
-						</div>
-						<div class="right floated content">
-							{{$.CsrfTokenHtml}}
-							<input name="_method" type="hidden" value="NOTIFICATION">
-							<div class="field">
-								<div class="ui selection dropdown" tabindex="0">
-									<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="text"></div>
-									<div class="menu">
-										<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
-										<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
-										<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
-										<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.manage_emails"}}
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui email list">
+						{{if $.EnableNotifyMail}}
+						<div class="item">
+							<form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post">
+								{{.locale.Tr "settings.email_desc"}}
+								<div class="right floated content">
+									<div class="field">
+										<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
 									</div>
 								</div>
-							</div>
-						</div>
-					</form>
-				</div>
-				{{end}}
-				{{range .Emails}}
-					<div class="item">
-						{{if not .IsPrimary}}
-							<div class="right floated content">
-								<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
-									{{$.locale.Tr "settings.delete_email"}}
-								</button>
-							</div>
-							{{if .CanBePrimary}}
 								<div class="right floated content">
-									<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
-										{{$.CsrfTokenHtml}}
-										<input name="_method" type="hidden" value="PRIMARY">
-										<input name="id" type="hidden" value="{{.ID}}">
-										<button class="ui primary tiny button">{{$.locale.Tr "settings.primary_email"}}</button>
-									</form>
+									{{$.CsrfTokenHtml}}
+									<input name="_method" type="hidden" value="NOTIFICATION">
+									<div class="field">
+										<div class="ui selection dropdown" tabindex="0">
+											<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
+											{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+											<div class="text"></div>
+											<div class="menu">
+												<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
+												<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
+												<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
+												<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
+											</div>
+										</div>
+									</div>
 								</div>
-							{{end}}
+							</form>
+						</div>
 						{{end}}
-						{{if not .IsActivated}}
-							<div class="right floated content">
-								<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
-									{{$.CsrfTokenHtml}}
-									<input name="_method" type="hidden" value="SENDACTIVATION">
-									<input name="id" type="hidden" value="{{.ID}}">
-									{{if $.ActivationsPending}}
-										<button disabled class="ui primary tiny button">{{$.locale.Tr "settings.activations_pending"}}</button>
+						{{range .Emails}}
+							<div class="item">
+								{{if not .IsPrimary}}
+									<div class="right floated content">
+										<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
+											{{$.locale.Tr "settings.delete_email"}}
+										</button>
+									</div>
+									{{if .CanBePrimary}}
+										<div class="right floated content">
+											<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
+												{{$.CsrfTokenHtml}}
+												<input name="_method" type="hidden" value="PRIMARY">
+												<input name="id" type="hidden" value="{{.ID}}">
+												<button class="ui primary tiny button">{{$.locale.Tr "settings.primary_email"}}</button>
+											</form>
+										</div>
+									{{end}}
+								{{end}}
+								{{if not .IsActivated}}
+									<div class="right floated content">
+										<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
+											{{$.CsrfTokenHtml}}
+											<input name="_method" type="hidden" value="SENDACTIVATION">
+											<input name="id" type="hidden" value="{{.ID}}">
+											{{if $.ActivationsPending}}
+												<button disabled class="ui primary tiny button">{{$.locale.Tr "settings.activations_pending"}}</button>
+											{{else}}
+												<button class="ui primary tiny button">{{$.locale.Tr "settings.activate_email"}}</button>
+											{{end}}
+										</form>
+									</div>
+								{{end}}
+								<div class="content">
+									<strong>{{.Email}}</strong>
+									{{if .IsPrimary}}
+										<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>
+									{{end}}
+									{{if .IsActivated}}
+										<div class="ui green label">{{$.locale.Tr "settings.activated"}}</div>
 									{{else}}
-										<button class="ui primary tiny button">{{$.locale.Tr "settings.activate_email"}}</button>
+										<div class="ui label">{{$.locale.Tr "settings.requires_activation"}}</div>
 									{{end}}
-								</form>
+								</div>
 							</div>
 						{{end}}
-						<div class="content">
-							<strong>{{.Email}}</strong>
-							{{if .IsPrimary}}
-								<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>
-							{{end}}
-							{{if .IsActivated}}
-								<div class="ui green label">{{$.locale.Tr "settings.activated"}}</div>
-							{{else}}
-								<div class="ui label">{{$.locale.Tr "settings.requires_activation"}}</div>
-							{{end}}
-						</div>
 					</div>
-				{{end}}
-			</div>
-		</div>
-		<div class="ui attached bottom segment">
-			<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="required field {{if .Err_Email}}error{{end}}">
-					<label for="email">{{.locale.Tr "settings.add_new_email"}}</label>
-					<input id="email" name="email" type="email" required {{if not .CanAddEmails}}disabled{{end}}>
 				</div>
-				<button class="ui green button" {{if not .CanAddEmails}}disabled{{end}}>
-					{{.locale.Tr "settings.add_email"}}
-				</button>
-			</form>
-		</div>
-
-		<h4 class="ui top attached error header">
-			{{.locale.Tr "settings.delete_account"}}
-		</h4>
-		<div class="ui attached error segment">
-			<div class="ui red message">
-				<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
-				{{if .UserDeleteWithComments}}
-				<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
-				{{end}}
-			</div>
-			<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<div class="required field {{if .Err_Password}}error{{end}}">
-					<label for="password-confirmation">{{.locale.Tr "password"}}</label>
-					<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
+				<div class="ui attached bottom segment">
+					<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="required field {{if .Err_Email}}error{{end}}">
+							<label for="email">{{.locale.Tr "settings.add_new_email"}}</label>
+							<input id="email" name="email" type="email" required {{if not .CanAddEmails}}disabled{{end}}>
+						</div>
+						<button class="ui green button" {{if not .CanAddEmails}}disabled{{end}}>
+							{{.locale.Tr "settings.add_email"}}
+						</button>
+					</form>
 				</div>
-				<div class="field">
-					<button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
-						{{.locale.Tr "settings.confirm_delete_account"}}
-					</button>
-					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+
+				<h4 class="ui top attached error header">
+					{{.locale.Tr "settings.delete_account"}}
+				</h4>
+				<div class="ui attached error segment">
+					<div class="ui red message">
+						<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
+						{{if .UserDeleteWithComments}}
+						<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
+						{{end}}
+					</div>
+					<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<div class="required field {{if .Err_Password}}error{{end}}">
+							<label for="password-confirmation">{{.locale.Tr "password"}}</label>
+							<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
+						</div>
+						<div class="field">
+							<button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
+								{{.locale.Tr "settings.confirm_delete_account"}}
+							</button>
+							<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+						</div>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index c78caedc96b3..d4a3a59e4b3b 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -1,173 +1,177 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
 
-		<!-- Theme -->
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.manage_themes"}}
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui email list">
-				<div class="item">
-					{{.locale.Tr "settings.theme_desc"}}
-				</div>
+				<!-- Theme -->
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.manage_themes"}}
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui email list">
+						<div class="item">
+							{{.locale.Tr "settings.theme_desc"}}
+						</div>
 
-			<form class="ui form" action="{{.Link}}/theme" method="post">
-				{{.CsrfTokenHtml}}
-					<div class="field">
-						<label for="ui">{{.locale.Tr "settings.ui"}}</label>
-						<div class="ui selection dropdown" id="ui">
-							<input name="theme" type="hidden" value="{{.SignedUser.Theme}}">
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="text">
-								{{range $i,$a := .AllThemes}}
-									{{if eq $.SignedUser.Theme $a}}{{$a}}{{end}}
-								{{end}}
-							</div>
+					<form class="ui form" action="{{.Link}}/theme" method="post">
+						{{.CsrfTokenHtml}}
+							<div class="field">
+								<label for="ui">{{.locale.Tr "settings.ui"}}</label>
+								<div class="ui selection dropdown" id="ui">
+									<input name="theme" type="hidden" value="{{.SignedUser.Theme}}">
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="text">
+										{{range $i,$a := .AllThemes}}
+											{{if eq $.SignedUser.Theme $a}}{{$a}}{{end}}
+										{{end}}
+									</div>
 
-							<div class="menu">
-							{{range $i,$a := .AllThemes}}
-								<div class="item{{if eq $.SignedUser.Theme $a}} active selected{{end}}" data-value="{{$a}}">
-									{{$a}}
+									<div class="menu">
+									{{range $i,$a := .AllThemes}}
+										<div class="item{{if eq $.SignedUser.Theme $a}} active selected{{end}}" data-value="{{$a}}">
+											{{$a}}
+										</div>
+									{{end}}
+									</div>
 								</div>
-							{{end}}
 							</div>
+
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_theme"}}</button>
 						</div>
+					</form>
 					</div>
-
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_theme"}}</button>
 				</div>
-			</form>
-			</div>
-		</div>
 
-		<!-- Language -->
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.language"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}/language" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="field">
-					<div class="ui language selection dropdown" id="language">
-						<input name="language" type="hidden" value="{{.SignedUser.Language}}">
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="text">{{range .AllLangs}}{{if eq $.SignedUser.Language .Lang}}{{.Name}}{{end}}{{end}}</div>
-						<div class="menu">
-						{{range .AllLangs}}
-							<div class="item{{if eq $.SignedUser.Language .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
-						{{end}}
+				<!-- Language -->
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.language"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}/language" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="field">
+							<div class="ui language selection dropdown" id="language">
+								<input name="language" type="hidden" value="{{.SignedUser.Language}}">
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="text">{{range .AllLangs}}{{if eq $.SignedUser.Language .Lang}}{{.Name}}{{end}}{{end}}</div>
+								<div class="menu">
+								{{range .AllLangs}}
+									<div class="item{{if eq $.SignedUser.Language .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
+								{{end}}
+								</div>
+							</div>
 						</div>
-					</div>
-				</div>
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_language"}}</button>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_language"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
 
-		<!-- Shown comment event types -->
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.hidden_comment_types"}}
-		</h4>
-		<div class="ui attached segment">
-			<p class="help">
-				{{.locale.Tr "settings.hidden_comment_types_description"}}
-			</p>
-			<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="inline field">
-					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
-						<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
-					</div>
-				</div>
+				<!-- Shown comment event types -->
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.hidden_comment_types"}}
+				</h4>
+				<div class="ui attached segment">
+					<p class="help">
+						{{.locale.Tr "settings.hidden_comment_types_description"}}
+					</p>
+					<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="inline field">
+							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
+								<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
+							</div>
+						</div>
 
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox">
-						<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
-					</div>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
-						<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
-						<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
-					</div>
-				</div>
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "save"}}</button>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
+								<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
+								<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
+							</div>
+						</div>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "save"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 2694f5cad0d4..51a2f43dc00f 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,270 +1,274 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.manage_access_token"}}
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui key list">
-				<div class="item">
-					{{.locale.Tr "settings.tokens_desc"}}
-				</div>
-				{{range .Tokens}}
-					<div class="item">
-						<div class="right floated content">
-								<button class="ui red tiny button delete-button" data-modal-id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-									{{svg "octicon-trash" 16 "gt-mr-2"}}
-									{{$.locale.Tr "settings.delete_token"}}
-								</button>
-						</div>
-						<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.token_state_desc"}}"{{end}}>{{svg "fontawesome-send" 36}}</i>
-						<div class="content">
-							<details><summary><strong>{{.Name}}</strong></summary>
-								<p class="gt-my-2">{{$.locale.Tr "settings.scopes_list"}}</p>
-								<ul class="gt-my-2">
-								{{range .Scope.StringSlice}}
-									<li>{{.}}</li>
-								{{end}}
-								</ul>
-							</details>
-							<div class="activity meta">
-								<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.manage_access_token"}}
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui key list">
+						<div class="item">
+							{{.locale.Tr "settings.tokens_desc"}}
+						</div>
+						{{range .Tokens}}
+							<div class="item">
+								<div class="right floated content">
+										<button class="ui red tiny button delete-button" data-modal-id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+											{{svg "octicon-trash" 16 "gt-mr-2"}}
+											{{$.locale.Tr "settings.delete_token"}}
+										</button>
+								</div>
+								<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.token_state_desc"}}"{{end}}>{{svg "fontawesome-send" 36}}</i>
+								<div class="content">
+									<details><summary><strong>{{.Name}}</strong></summary>
+										<p class="gt-my-2">{{$.locale.Tr "settings.scopes_list"}}</p>
+										<ul class="gt-my-2">
+										{{range .Scope.StringSlice}}
+											<li>{{.}}</li>
+										{{end}}
+										</ul>
+									</details>
+									<div class="activity meta">
+										<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
+									</div>
+								</div>
 							</div>
-						</div>
+						{{end}}
 					</div>
-				{{end}}
-			</div>
-		</div>
-		<div class="ui attached bottom segment">
-			<h5 class="ui top header">
-				{{.locale.Tr "settings.generate_new_token"}}
-			</h5>
-			<p>{{.locale.Tr "settings.new_token_desc"}}</p>
-			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="field {{if .Err_Name}}error{{end}}">
-					<label for="name">{{.locale.Tr "settings.token_name"}}</label>
-					<input id="name" name="name" value="{{.name}}" autofocus required>
 				</div>
-				<details class="ui optional field">
-					<summary class="gt-p-2">
-						{{.locale.Tr "settings.select_scopes"}}
-					</summary>
-					<div class="field gt-pl-2">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="repo">
-							<label>repo</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="repo:status">
-								<label>repo:status</label>
+				<div class="ui attached bottom segment">
+					<h5 class="ui top header">
+						{{.locale.Tr "settings.generate_new_token"}}
+					</h5>
+					<p>{{.locale.Tr "settings.new_token_desc"}}</p>
+					<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="field {{if .Err_Name}}error{{end}}">
+							<label for="name">{{.locale.Tr "settings.token_name"}}</label>
+							<input id="name" name="name" value="{{.name}}" autofocus required>
+						</div>
+						<details class="ui optional field">
+							<summary class="gt-p-2">
+								{{.locale.Tr "settings.select_scopes"}}
+							</summary>
+							<div class="field gt-pl-2">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="repo">
+									<label>repo</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="public_repo">
-								<label>public_repo</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="repo:status">
+										<label>repo:status</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="public_repo">
+										<label>public_repo</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:org">
-							<label>admin:org</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:org">
-								<label>write:org</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:org">
+									<label>admin:org</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:org">
-								<label>read:org</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:org">
+										<label>write:org</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:org">
+										<label>read:org</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:public_key">
-							<label>admin:public_key</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:public_key">
-								<label>write:public_key</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:public_key">
+									<label>admin:public_key</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:public_key">
-								<label>read:public_key</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:public_key">
+										<label>write:public_key</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:public_key">
+										<label>read:public_key</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:repo_hook">
-							<label>admin:repo_hook</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:repo_hook">
-								<label>write:repo_hook</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:repo_hook">
+									<label>admin:repo_hook</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:repo_hook">
-								<label>read:repo_hook</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:repo_hook">
+										<label>write:repo_hook</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:repo_hook">
+										<label>read:repo_hook</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:org_hook">
-							<label>admin:org_hook</label>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:user_hook">
-							<label>admin:user_hook</label>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="notification">
-							<label>notification</label>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="user">
-							<label>user</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:user">
-								<label>read:user</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:org_hook">
+									<label>admin:org_hook</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="user:email">
-								<label>user:email</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:user_hook">
+									<label>admin:user_hook</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="user:follow">
-								<label>user:follow</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="notification">
+									<label>notification</label>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="delete_repo">
-							<label>delete_repo</label>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="package">
-							<label>package</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:package">
-								<label>write:package</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="user">
+									<label>user</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:package">
-								<label>read:package</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:user">
+										<label>read:user</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="user:email">
+										<label>user:email</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="user:follow">
+										<label>user:follow</label>
+									</div>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="delete:package">
-								<label>delete:package</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="delete_repo">
+									<label>delete_repo</label>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:gpg_key">
-							<label>admin:gpg_key</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:gpg_key">
-								<label>write:gpg_key</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="package">
+									<label>package</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:gpg_key">
-								<label>read:gpg_key</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:package">
+										<label>write:package</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:package">
+										<label>read:package</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="delete:package">
+										<label>delete:package</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="admin:application">
-							<label>admin:application</label>
-						</div>
-					</div>
-					<div class="field gt-pl-4">
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="write:application">
-								<label>write:application</label>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:gpg_key">
+									<label>admin:gpg_key</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input class="enable-system" type="checkbox" name="scope" value="read:application">
-								<label>read:application</label>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:gpg_key">
+										<label>write:gpg_key</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:gpg_key">
+										<label>read:gpg_key</label>
+									</div>
+								</div>
 							</div>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-system" type="checkbox" name="scope" value="sudo">
-							<label>sudo</label>
-						</div>
-					</div>
-				</details>
-				<button class="ui green button">
-					{{.locale.Tr "settings.generate_token"}}
-				</button>
-			</form>
-		</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="admin:application">
+									<label>admin:application</label>
+								</div>
+							</div>
+							<div class="field gt-pl-4">
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="write:application">
+										<label>write:application</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input class="enable-system" type="checkbox" name="scope" value="read:application">
+										<label>read:application</label>
+									</div>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-system" type="checkbox" name="scope" value="sudo">
+									<label>sudo</label>
+								</div>
+							</div>
+						</details>
+						<button class="ui green button">
+							{{.locale.Tr "settings.generate_token"}}
+						</button>
+					</form>
+				</div>
 
-		{{if .EnableOAuth2}}
-			{{template "user/settings/grants_oauth2" .}}
-			{{template "user/settings/applications_oauth2" .}}
-		{{end}}
+				{{if .EnableOAuth2}}
+					{{template "user/settings/grants_oauth2" .}}
+					{{template "user/settings/applications_oauth2" .}}
+				{{end}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index d2ca83b90d12..eb55def38800 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,8 +1,13 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
-	{{template "user/settings/navbar" .}}
-
-	{{template "user/settings/applications_oauth2_edit_form" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "user/settings/applications_oauth2_edit_form" .}}
+			</div>
+		</div>
+	</div>
 </div>
 
 {{template "base/footer" .}}
diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index 20aaf65f62d7..24a0ac58571b 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,52 +1,56 @@
 {{template "base/head" .}}
 <div class="page-content user  settings new webhook">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		<div class="twelve wide column content">
-			{{template "base/alert" .}}
-			<h4 class="ui top attached header">
-				{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-				<div class="ui right">
-					{{if eq .HookType "gitea"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-					{{else if eq .HookType "gogs"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-					{{else if eq .HookType "slack"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-					{{else if eq .HookType "discord"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-					{{else if eq .HookType "dingtalk"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-					{{else if eq .HookType "telegram"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-					{{else if eq .HookType "msteams"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-					{{else if eq .HookType "feishu"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-					{{else if eq .HookType "matrix"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
-					{{else if eq .HookType "wechatwork"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-					{{else if eq .HookType "packagist"}}
-						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-					{{end}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				<div class="twelve wide column content">
+					{{template "base/alert" .}}
+					<h4 class="ui top attached header">
+						{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
+						<div class="ui right">
+							{{if eq .HookType "gitea"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+							{{else if eq .HookType "gogs"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+							{{else if eq .HookType "slack"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+							{{else if eq .HookType "discord"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+							{{else if eq .HookType "dingtalk"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+							{{else if eq .HookType "telegram"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+							{{else if eq .HookType "msteams"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+							{{else if eq .HookType "feishu"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+							{{else if eq .HookType "matrix"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
+							{{else if eq .HookType "wechatwork"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+							{{else if eq .HookType "packagist"}}
+								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+							{{end}}
+						</div>
+					</h4>
+					<div class="ui attached segment">
+						{{template "repo/settings/webhook/gitea" .}}
+						{{template "repo/settings/webhook/gogs" .}}
+						{{template "repo/settings/webhook/slack" .}}
+						{{template "repo/settings/webhook/discord" .}}
+						{{template "repo/settings/webhook/dingtalk" .}}
+						{{template "repo/settings/webhook/telegram" .}}
+						{{template "repo/settings/webhook/msteams" .}}
+						{{template "repo/settings/webhook/feishu" .}}
+						{{template "repo/settings/webhook/matrix" .}}
+						{{template "repo/settings/webhook/wechatwork" .}}
+						{{template "repo/settings/webhook/packagist" .}}
+					</div>
+
+					{{template "repo/settings/webhook/history" .}}
 				</div>
-			</h4>
-			<div class="ui attached segment">
-				{{template "repo/settings/webhook/gitea" .}}
-				{{template "repo/settings/webhook/gogs" .}}
-				{{template "repo/settings/webhook/slack" .}}
-				{{template "repo/settings/webhook/discord" .}}
-				{{template "repo/settings/webhook/dingtalk" .}}
-				{{template "repo/settings/webhook/telegram" .}}
-				{{template "repo/settings/webhook/msteams" .}}
-				{{template "repo/settings/webhook/feishu" .}}
-				{{template "repo/settings/webhook/matrix" .}}
-				{{template "repo/settings/webhook/wechatwork" .}}
-				{{template "repo/settings/webhook/packagist" .}}
 			</div>
-
-			{{template "repo/settings/webhook/history" .}}
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/hooks.tmpl b/templates/user/settings/hooks.tmpl
index 02bfa8a4e670..7fca43f81239 100644
--- a/templates/user/settings/hooks.tmpl
+++ b/templates/user/settings/hooks.tmpl
@@ -1,8 +1,12 @@
 {{template "base/head" .}}
 <div class="page-content user settings webhooks">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "repo/settings/webhook/list" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "repo/settings/webhook/list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 9a4be2b2c2c0..7c7069b5638b 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,11 +1,15 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "user/settings/keys_ssh" .}}
-		{{template "user/settings/keys_principal" .}}
-		{{template "user/settings/keys_gpg" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "user/settings/keys_ssh" .}}
+				{{template "user/settings/keys_principal" .}}
+				{{template "user/settings/keys_gpg" .}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index 4afe2173c2bd..27ec73c34fb2 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -1,5 +1,6 @@
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
-	<div class="new-menu-inner">
+<div class="four wide column">
+	<div class="ui fluid vertical menu">
+		<div class="header item">{{.locale.Tr "org.settings"}}</div>
 		<a class="{{if .PageIsSettingsProfile}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
 			{{.locale.Tr "settings.profile"}}
 		</a>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index cd513db2490a..2aec93c8d112 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,42 +1,46 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings organization">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.orgs"}}
-			{{if .SignedUser.CanCreateOrganization}}
-			<div class="ui right">
-				<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
-			</div>
-			{{end}}
-		</h4>
-		<div class="ui attached segment orgs">
-			{{if .Orgs}}
-				<div class="ui middle aligned divided list">
-					{{range .Orgs}}
-					<div class="item">
-						<div class="right floated content">
-							<form>
-								{{$.CsrfTokenHtml}}
-								<button class="ui red button delete-button" data-modal-id="leave-organization"
-												data-url="{{.OrganisationLink}}/members/action/leave" data-datauid="{{$.SignedUser.ID}}"
-												data-name="{{$.SignedUser.DisplayName}}"
-												data-data-organization-name="{{.DisplayName}}">{{$.locale.Tr "org.members.leave"}}
-								</button>
-							</form>
-						</div>
-						{{avatar $.Context . 28 "mini"}}
-						<div class="content">
-								<a href="{{.HomeLink}}">{{.Name}}</a>
-						</div>
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.orgs"}}
+					{{if .SignedUser.CanCreateOrganization}}
+					<div class="ui right">
+						<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
 					</div>
 					{{end}}
+				</h4>
+				<div class="ui attached segment orgs">
+					{{if .Orgs}}
+						<div class="ui middle aligned divided list">
+							{{range .Orgs}}
+							<div class="item">
+								<div class="right floated content">
+									<form>
+										{{$.CsrfTokenHtml}}
+										<button class="ui red button delete-button" data-modal-id="leave-organization"
+														data-url="{{.OrganisationLink}}/members/action/leave" data-datauid="{{$.SignedUser.ID}}"
+														data-name="{{$.SignedUser.DisplayName}}"
+														data-data-organization-name="{{.DisplayName}}">{{$.locale.Tr "org.members.leave"}}
+										</button>
+									</form>
+								</div>
+								{{avatar $.Context . 28 "mini"}}
+								<div class="content">
+										<a href="{{.HomeLink}}">{{.Name}}</a>
+								</div>
+							</div>
+							{{end}}
+						</div>
+						{{template "base/paginate" .}}
+					{{else}}
+						{{.locale.Tr "settings.orgs_none"}}
+					{{end}}
 				</div>
-				{{template "base/paginate" .}}
-			{{else}}
-				{{.locale.Tr "settings.orgs_none"}}
-			{{end}}
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index 1faddab5dedc..9d4765094f75 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -1,25 +1,29 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "package/shared/cleanup_rules/list" .}}
-		{{template "package/shared/cargo" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "package/shared/cleanup_rules/list" .}}
+				{{template "package/shared/cargo" .}}
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "packages.owner.settings.chef.title"}}
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui form">
-				<div class="field">
-					<label>{{$.locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
-				</div>
-				<form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post">
-					{{.CsrfTokenHtml}}
-					<button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button>
-				</form>
-				<div class="field">
-					<label>{{.locale.Tr "packages.chef.documentation" | Safe}}</label>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "packages.owner.settings.chef.title"}}
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui form">
+						<div class="field">
+							<label>{{$.locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
+						</div>
+						<form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post">
+							{{.CsrfTokenHtml}}
+							<button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button>
+						</form>
+						<div class="field">
+							<label>{{.locale.Tr "packages.chef.documentation" | Safe}}</label>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/templates/user/settings/packages_cleanup_rules_edit.tmpl b/templates/user/settings/packages_cleanup_rules_edit.tmpl
index 114c825a4839..467f30693d68 100644
--- a/templates/user/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_edit.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "package/shared/cleanup_rules/edit" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "package/shared/cleanup_rules/edit" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_preview.tmpl b/templates/user/settings/packages_cleanup_rules_preview.tmpl
index d37e5148b380..1ce66279ae8f 100644
--- a/templates/user/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_preview.tmpl
@@ -1,8 +1,12 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings packages admin">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "package/shared/cleanup_rules/preview" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "package/shared/cleanup_rules/preview" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 7ef9a955a7df..3442a48fede4 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,136 +1,140 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings profile">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.public_profile"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "settings.profile_desc"}}</p>
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="required field {{if .Err_Name}}error{{end}}">
-					<label for="username">{{.locale.Tr "username"}}
-						<span class="text red gt-hidden" id="name-change-prompt"> {{.locale.Tr "settings.change_username_prompt"}}</span>
-						<span class="text red gt-hidden" id="name-change-redirect-prompt"> {{.locale.Tr "settings.change_username_redirect_prompt"}}</span>
-					</label>
-					<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if or (not .SignedUser.IsLocal) .IsReverseProxy}}disabled{{end}}>
-					{{if or (not .SignedUser.IsLocal) .IsReverseProxy}}
-					<p class="help text blue">{{$.locale.Tr "settings.password_username_disabled"}}</p>
-					{{end}}
-				</div>
-				<div class="field {{if .Err_FullName}}error{{end}}">
-					<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
-					<input id="full_name" name="full_name" value="{{.SignedUser.FullName}}">
-				</div>
-				<div class="field {{if .Err_Email}}error{{end}}">
-					<label for="email">{{.locale.Tr "email"}}</label>
-					<p>{{.SignedUser.Email}}</p>
-				</div>
-				<div class="inline field">
-					<div class="ui checkbox" id="keep-email-private">
-						<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.Tr "settings.keep_email_private"}}</strong></label>
-						<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
-					</div>
-				</div>
-				<div class="field {{if .Err_Description}}error{{end}}">
-					<label for="description">{{$.locale.Tr "user.user_bio"}}</label>
-					<textarea id="description" name="description" rows="2" placeholder="{{.locale.Tr "settings.biography_placeholder"}}">{{.SignedUser.Description}}</textarea>
-				</div>
-				<div class="field {{if .Err_Website}}error{{end}}">
-					<label for="website">{{.locale.Tr "settings.website"}}</label>
-					<input id="website" name="website" type="url" value="{{.SignedUser.Website}}">
-				</div>
-				<div class="field">
-					<label for="location">{{.locale.Tr "settings.location"}}</label>
-					<input id="location" name="location"  value="{{.SignedUser.Location}}">
-				</div>
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.public_profile"}}
+				</h4>
+				<div class="ui attached segment">
+					<p>{{.locale.Tr "settings.profile_desc"}}</p>
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="required field {{if .Err_Name}}error{{end}}">
+							<label for="username">{{.locale.Tr "username"}}
+								<span class="text red gt-hidden" id="name-change-prompt"> {{.locale.Tr "settings.change_username_prompt"}}</span>
+								<span class="text red gt-hidden" id="name-change-redirect-prompt"> {{.locale.Tr "settings.change_username_redirect_prompt"}}</span>
+							</label>
+							<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if or (not .SignedUser.IsLocal) .IsReverseProxy}}disabled{{end}}>
+							{{if or (not .SignedUser.IsLocal) .IsReverseProxy}}
+							<p class="help text blue">{{$.locale.Tr "settings.password_username_disabled"}}</p>
+							{{end}}
+						</div>
+						<div class="field {{if .Err_FullName}}error{{end}}">
+							<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
+							<input id="full_name" name="full_name" value="{{.SignedUser.FullName}}">
+						</div>
+						<div class="field {{if .Err_Email}}error{{end}}">
+							<label for="email">{{.locale.Tr "email"}}</label>
+							<p>{{.SignedUser.Email}}</p>
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox" id="keep-email-private">
+								<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.Tr "settings.keep_email_private"}}</strong></label>
+								<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
+							</div>
+						</div>
+						<div class="field {{if .Err_Description}}error{{end}}">
+							<label for="description">{{$.locale.Tr "user.user_bio"}}</label>
+							<textarea id="description" name="description" rows="2" placeholder="{{.locale.Tr "settings.biography_placeholder"}}">{{.SignedUser.Description}}</textarea>
+						</div>
+						<div class="field {{if .Err_Website}}error{{end}}">
+							<label for="website">{{.locale.Tr "settings.website"}}</label>
+							<input id="website" name="website" type="url" value="{{.SignedUser.Website}}">
+						</div>
+						<div class="field">
+							<label for="location">{{.locale.Tr "settings.location"}}</label>
+							<input id="location" name="location"  value="{{.SignedUser.Location}}">
+						</div>
 
-				<div class="ui divider"></div>
-				<!-- private block -->
+						<div class="ui divider"></div>
+						<!-- private block -->
 
-				<div class="field">
-					<label for="security-private"><strong>{{.locale.Tr "settings.privacy"}}</strong></label>
-				</div>
+						<div class="field">
+							<label for="security-private"><strong>{{.locale.Tr "settings.privacy"}}</strong></label>
+						</div>
 
-				<div class="inline field {{if .Err_Visibility}}error{{end}}">
-					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-					<div class="ui selection type dropdown">
-						{{if .SignedUser.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
-						{{if .SignedUser.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
-						{{if .SignedUser.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
-						<div class="text">
-							{{if .SignedUser.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-							{{if .SignedUser.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-							{{if .SignedUser.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-						</div>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							{{range $mode := .AllowedUserVisibilityModes}}
-								{{if $mode.IsPublic}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-								{{else if $mode.IsLimited}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-								{{else if $mode.IsPrivate}}
-									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-								{{end}}
-							{{end}}
+						<div class="inline field {{if .Err_Visibility}}error{{end}}">
+							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+							<div class="ui selection type dropdown">
+								{{if .SignedUser.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
+								{{if .SignedUser.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
+								{{if .SignedUser.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
+								<div class="text">
+									{{if .SignedUser.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+									{{if .SignedUser.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+									{{if .SignedUser.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+								</div>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="menu">
+									{{range $mode := .AllowedUserVisibilityModes}}
+										{{if $mode.IsPublic}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+										{{else if $mode.IsLimited}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+										{{else if $mode.IsPrivate}}
+											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+										{{end}}
+									{{end}}
+								</div>
+							</div>
 						</div>
-					</div>
-				</div>
 
-				<div class="field">
-					<div class="ui checkbox" id="keep-activity-private">
-						<label data-tooltip-content="{{.locale.Tr "settings.keep_activity_private_popup"}}"><strong>{{.locale.Tr "settings.keep_activity_private"}}</strong></label>
-						<input name="keep_activity_private" type="checkbox" {{if .SignedUser.KeepActivityPrivate}}checked{{end}}>
-					</div>
-				</div>
+						<div class="field">
+							<div class="ui checkbox" id="keep-activity-private">
+								<label data-tooltip-content="{{.locale.Tr "settings.keep_activity_private_popup"}}"><strong>{{.locale.Tr "settings.keep_activity_private"}}</strong></label>
+								<input name="keep_activity_private" type="checkbox" {{if .SignedUser.KeepActivityPrivate}}checked{{end}}>
+							</div>
+						</div>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_profile"}}</button>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_profile"}}</button>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.avatar"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-				{{.CsrfTokenHtml}}
-				{{if not (DisableGravatar $.Context)}}
-				<div class="inline field">
-					<div class="ui radio checkbox">
-						<input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}>
-						<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
-					</div>
-				</div>
-				<div class="field {{if .Err_Gravatar}}error{{end}}">
-					<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
-					<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}">
-				</div>
-				{{end}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.avatar"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+						{{.CsrfTokenHtml}}
+						{{if not (DisableGravatar $.Context)}}
+						<div class="inline field">
+							<div class="ui radio checkbox">
+								<input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}>
+								<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
+							</div>
+						</div>
+						<div class="field {{if .Err_Gravatar}}error{{end}}">
+							<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
+							<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}">
+						</div>
+						{{end}}
 
-				<div class="inline field">
-					<div class="ui radio checkbox">
-						<input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}>
-						<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
-					</div>
-				</div>
+						<div class="inline field">
+							<div class="ui radio checkbox">
+								<input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}>
+								<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
+							</div>
+						</div>
 
-				<div class="inline field">
-					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
-				</div>
+						<div class="inline field">
+							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+							<input name="avatar" type="file" >
+						</div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
+						</div>
+					</form>
 				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 95ea8d7d0d94..38b1eb09bf7d 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,6 +1,5 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
@@ -60,73 +59,73 @@
 																{{$.locale.Tr "modal.yes"}}
 															</button>
 														</div>
-													</form>
-												</div>
-											{{end}}
-											{{if $.allowDelete}}
-												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
-													<div class="header">
-														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
-													</div>
-													<div class="content">
-														<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
-													</div>
-													<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
-														{{$.CsrfTokenHtml}}
-														<input type="hidden" name="id" value="{{$dir}}">
-														<input type="hidden" name="action" value="delete">
-														{{template "base/delete_modal_actions" $}}
-													</form>
+													{{end}}
+													{{if $.allowDelete}}
+														<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+														<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+															{{svg "octicon-x" 16 "close inside"}}
+															<div class="header">
+																<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+															</div>
+															<div class="content">
+																<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
+															</div>
+															<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
+																{{$.CsrfTokenHtml}}
+																<input type="hidden" name="id" value="{{$dir}}">
+																<input type="hidden" name="action" value="delete">
+																{{template "base/delete_modal_actions" $}}
+															</form>
+														</div>
+													{{end}}
 												</div>
 											{{end}}
 										</div>
-									{{end}}
-								</div>
+									</div>
+								{{end}}
+							</div>
+							{{template "base/paginate" .}}
+						{{else}}
+							<div class="item">
+								{{.locale.Tr "settings.repos_none"}}
 							</div>
 						{{end}}
-					</div>
-					{{template "base/paginate" .}}
-				{{else}}
-					<div class="item">
-						{{.locale.Tr "settings.repos_none"}}
-					</div>
-				{{end}}
-			{{else}}
-				{{if .Repos}}
-					<div class="ui middle aligned divided list">
-						{{range .Repos}}
+					{{else}}
+						{{if .Repos}}
+							<div class="ui middle aligned divided list">
+								{{range .Repos}}
+									<div class="item">
+										<div class="content">
+											{{if .IsPrivate}}
+												{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
+											{{else if .IsFork}}
+												{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
+											{{else if .IsMirror}}
+												{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
+											{{else if .IsTemplate}}
+												{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
+											{{else}}
+												{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
+											{{end}}
+											<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
+											<span>{{FileSize .Size}}</span>
+											{{if .IsFork}}
+												{{$.locale.Tr "repo.forked_from"}}
+												<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
+											{{end}}
+										</div>
+									</div>
+								{{end}}
+							</div>
+							{{template "base/paginate" .}}
+						{{else}}
 							<div class="item">
-								<div class="content">
-									{{if .IsPrivate}}
-										{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
-									{{else if .IsFork}}
-										{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
-									{{else if .IsMirror}}
-										{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
-									{{else if .IsTemplate}}
-										{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
-									{{else}}
-										{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
-									{{end}}
-									<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
-									<span>{{FileSize .Size}}</span>
-									{{if .IsFork}}
-										{{$.locale.Tr "repo.forked_from"}}
-										<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
-									{{end}}
-								</div>
+								{{.locale.Tr "settings.repos_none"}}
 							</div>
 						{{end}}
-					</div>
-					{{template "base/paginate" .}}
-				{{else}}
-					<div class="item">
-						{{.locale.Tr "settings.repos_none"}}
-					</div>
-				{{end}}
-			{{end}}
+					{{end}}
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/secrets.tmpl
index 1a6875acefc1..6e48a7de3882 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/secrets.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
 <div class="page-content user settings secrets">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "shared/secrets/add_list" .}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "shared/secrets/add_list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index d412a4f4e844..6f9b1f16a9f7 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,14 +1,18 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings security">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "user/settings/security/twofa" .}}
-		{{template "user/settings/security/webauthn" .}}
-		{{template "user/settings/security/accountlinks" .}}
-		{{if .EnableOpenIDSignIn}}
-		{{template "user/settings/security/openid" .}}
-		{{end}}
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "user/settings/security/twofa" .}}
+				{{template "user/settings/security/webauthn" .}}
+				{{template "user/settings/security/accountlinks" .}}
+				{{if .EnableOpenIDSignIn}}
+				{{template "user/settings/security/openid" .}}
+				{{end}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index b7e1f4b7cc28..d6b6ae43b29b 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,27 +1,31 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings twofa">
-	{{template "user/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.twofa_enroll"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "settings.scan_this_image"}}</p>
-			<img src="{{.QrUri}}" alt="{{.TwofaSecret}}">
-			<p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}
-			<p>{{.locale.Tr "settings.then_enter_passcode"}}
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="inline required field {{if .Err_Passcode}}error{{end}}">
-					<label for="passcode">{{.locale.Tr "passcode"}}</label>
-					<input id="passcode" name="passcode" autofocus required>
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.twofa_enroll"}}
+				</h4>
+				<div class="ui attached segment">
+					<p>{{.locale.Tr "settings.scan_this_image"}}</p>
+					<img src="{{.QrUri}}" alt="{{.TwofaSecret}}">
+					<p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}
+					<p>{{.locale.Tr "settings.then_enter_passcode"}}
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="inline required field {{if .Err_Passcode}}error{{end}}">
+							<label for="passcode">{{.locale.Tr "passcode"}}</label>
+							<input id="passcode" name="passcode" autofocus required>
+						</div>
+						<div class="inline field">
+							<label></label>
+							<button class="ui green button">{{.locale.Tr "auth.verify"}}</button>
+						</div>
+					</form>
 				</div>
-				<div class="inline field">
-					<label></label>
-					<button class="ui green button">{{.locale.Tr "auth.verify"}}</button>
-				</div>
-			</form>
+			</div>
 		</div>
 	</div>
 </div>

From d38dc1df9ca4b6bba62980e381875a3f74228ec7 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 20 Apr 2023 21:17:01 +0800
Subject: [PATCH 03/21] change for repo

---
 templates/repo/settings/branches.tmpl         |  172 +-
 templates/repo/settings/collaboration.tmpl    |  190 +--
 templates/repo/settings/deploy_keys.tmpl      |  130 +-
 templates/repo/settings/githook_edit.tmpl     |   52 +-
 templates/repo/settings/githooks.tmpl         |   40 +-
 templates/repo/settings/lfs.tmpl              |  110 +-
 templates/repo/settings/lfs_file.tmpl         |  110 +-
 templates/repo/settings/lfs_file_find.tmpl    |   94 +-
 templates/repo/settings/lfs_locks.tmpl        |  110 +-
 templates/repo/settings/lfs_pointers.tmpl     |  126 +-
 templates/repo/settings/navbar.tmpl           |    5 +-
 templates/repo/settings/options.tmpl          | 1420 +++++++++--------
 templates/repo/settings/protected_branch.tmpl |  458 +++---
 templates/repo/settings/runner_edit.tmpl      |    8 +-
 templates/repo/settings/runners.tmpl          |    8 +-
 templates/repo/settings/secrets.tmpl          |   10 +-
 templates/repo/settings/tags.tmpl             |  226 +--
 templates/repo/settings/webhook/base.tmpl     |    8 +-
 templates/repo/settings/webhook/new.tmpl      |   90 +-
 19 files changed, 1723 insertions(+), 1644 deletions(-)

diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 6e51fc7bb24b..3646ad714a3e 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,98 +1,102 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{if .Repository.IsArchived}}
-			<div class="ui warning message">
-				{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
-			</div>
-		{{else}}
-			<h4 class="ui top attached header">
-				{{.locale.Tr "repo.default_branch"}}
-			</h4>
-			<div class="ui attached segment">
-				<p>
-					{{.locale.Tr "repo.settings.default_branch_desc"}}
-				</p>
-				<form class="ui form" action="{{.Link}}" method="post">
-					{{.CsrfTokenHtml}}
-					<input type="hidden" name="action" value="default_branch">
-					{{if not .Repository.IsEmpty}}
-					<div class="required inline field">
-						<div class="ui dropdown selection" tabindex="0">
-							<select name="branch">
-								<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
-								{{range .Branches}}
-									<option value="{{.}}">{{.}}</option>
-								{{end}}
-							</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="default text">{{.Repository.DefaultBranch}}</div>
-							<div class="menu">
-								{{range .Branches}}
-									<div class="item" data-value="{{.}}">{{.}}</div>
-								{{end}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{if .Repository.IsArchived}}
+					<div class="ui warning message">
+						{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
+					</div>
+				{{else}}
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.default_branch"}}
+					</h4>
+					<div class="ui attached segment">
+						<p>
+							{{.locale.Tr "repo.settings.default_branch_desc"}}
+						</p>
+						<form class="ui form" action="{{.Link}}" method="post">
+							{{.CsrfTokenHtml}}
+							<input type="hidden" name="action" value="default_branch">
+							{{if not .Repository.IsEmpty}}
+							<div class="required inline field">
+								<div class="ui dropdown selection" tabindex="0">
+									<select name="branch">
+										<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
+										{{range .Branches}}
+											<option value="{{.}}">{{.}}</option>
+										{{end}}
+									</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="default text">{{.Repository.DefaultBranch}}</div>
+									<div class="menu">
+										{{range .Branches}}
+											<div class="item" data-value="{{.}}">{{.}}</div>
+										{{end}}
+									</div>
+								</div>
+								<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
 							</div>
-						</div>
-						<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
+							{{end}}
+						</form>
 					</div>
-					{{end}}
-				</form>
-			</div>
 
-			<h4 class="ui top attached header">
-				{{.locale.Tr "repo.settings.protected_branch"}}
-				<div class="ui right">
-					<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
-				</div>
-			</h4>
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.settings.protected_branch"}}
+						<div class="ui right">
+							<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
+						</div>
+					</h4>
 
-			<div class="ui attached table segment">
-				<div class="ui grid padded">
-					<div class="sixteen wide column">
-						<table class="ui single line table padded">
-							<tbody>
-								{{range .ProtectedBranches}}
-									<tr>
-										<td><div class="ui basic primary label">{{.RuleName}}</div></td>
-										<td class="right aligned">
-										<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
-										<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
-										{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
-										</td>
-									</tr>
-								{{else}}
-									<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
-								{{end}}
-							</tbody>
-						</table>
+					<div class="ui attached table segment">
+						<div class="ui grid padded">
+							<div class="sixteen wide column">
+								<table class="ui single line table padded">
+									<tbody>
+										{{range .ProtectedBranches}}
+											<tr>
+												<td><div class="ui basic primary label">{{.RuleName}}</div></td>
+												<td class="right aligned">
+												<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
+												<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
+												{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
+												</td>
+											</tr>
+										{{else}}
+											<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
+										{{end}}
+									</tbody>
+								</table>
+							</div>
+						</div>
 					</div>
-				</div>
-			</div>
 
-			{{if $.Repository.CanCreateBranch}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.rename_branch"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="required field">
-							<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
-							<input id="from" name="from" required>
-						</div>
-						<div class="required field {{if .Err_BranchName}}error{{end}}">
-							<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
-							<input id="to" name="to" required>
+					{{if $.Repository.CanCreateBranch}}
+						<h4 class="ui top attached header">
+							{{.locale.Tr "repo.settings.rename_branch"}}
+						</h4>
+						<div class="ui attached segment">
+							<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
+								{{.CsrfTokenHtml}}
+								<div class="required field">
+									<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
+									<input id="from" name="from" required>
+								</div>
+								<div class="required field {{if .Err_BranchName}}error{{end}}">
+									<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
+									<input id="to" name="to" required>
+								</div>
+								<div class="field">
+									<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+								</div>
+							</form>
 						</div>
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-						</div>
-					</form>
-				</div>
-			{{end}}
-		{{end}}
+					{{end}}
+				{{end}}
+			</div>
+		</div>
 	</div>
 </div>
 
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 654bbba5d05c..4c6a4b85302d 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,114 +1,118 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.collaboration"}}
-		</h4>
-		{{if .Collaborators}}
-		<div class="ui attached segment collaborator list">
-			{{range .Collaborators}}
-				<div class="item ui grid">
-					<div class="ui five wide column">
-						<a href="{{.HomeLink}}">
-							{{avatar $.Context .}}
-							{{.DisplayName}}
-						</a>
-					</div>
-					<div class="ui eight wide column">
-						{{svg "octicon-shield-lock"}}
-						<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
-							<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							<div class="menu">
-								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
-								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
-								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.collaboration"}}
+				</h4>
+				{{if .Collaborators}}
+				<div class="ui attached segment collaborator list">
+					{{range .Collaborators}}
+						<div class="item ui grid">
+							<div class="ui five wide column">
+								<a href="{{.HomeLink}}">
+									{{avatar $.Context .}}
+									{{.DisplayName}}
+								</a>
+							</div>
+							<div class="ui eight wide column">
+								{{svg "octicon-shield-lock"}}
+								<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
+									<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="menu">
+										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
+										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
+										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
+									</div>
+								</div>
+							</div>
+							<div class="ui two wide column">
+								<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+									{{$.locale.Tr "repo.settings.delete_collaborator"}}
+								</button>
 							</div>
 						</div>
-					</div>
-					<div class="ui two wide column">
-						<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-							{{$.locale.Tr "repo.settings.delete_collaborator"}}
-						</button>
-					</div>
+					{{end}}
 				</div>
-			{{end}}
-		</div>
-		{{end}}
-		<div class="ui bottom attached segment">
-			<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				<div class="inline field ui left">
-					<div id="search-user-box" class="ui search">
-						<div class="ui input">
-							<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
+				{{end}}
+				<div class="ui bottom attached segment">
+					<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="inline field ui left">
+							<div id="search-user-box" class="ui search">
+								<div class="ui input">
+									<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
+								</div>
+							</div>
 						</div>
-					</div>
+						<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
+					</form>
 				</div>
-				<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
-			</form>
-		</div>
 
-		{{if .RepoOwnerIsOrganization}}
-		<h4 class="ui top attached header">
-			{{$.locale.Tr "repo.settings.teams"}}
-		</h4>
-		{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
-		{{if .Teams}}
-		<div class="ui attached segment collaborator list">
-			{{range $t, $team := .Teams}}
-				<div class="item ui grid">
-					<div class="ui five wide column">
-						<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
-							{{.Name}}
-						</a>
-					</div>
-					<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
-						{{svg "octicon-shield-lock"}}
-						<div class="ui inline dropdown">
-							<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
-						</div>
-						{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
-							{{$first := true}}
-							<div class="description">
-							Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
+				{{if .RepoOwnerIsOrganization}}
+				<h4 class="ui top attached header">
+					{{$.locale.Tr "repo.settings.teams"}}
+				</h4>
+				{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
+				{{if .Teams}}
+				<div class="ui attached segment collaborator list">
+					{{range $t, $team := .Teams}}
+						<div class="item ui grid">
+							<div class="ui five wide column">
+								<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
+									{{.Name}}
+								</a>
 							</div>
-						{{end}}
-					</div>
-					{{if $allowedToChangeTeams}}
-						<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
-							<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
-									{{$.locale.Tr "repo.settings.delete_collaborator"}}
-							</button>
+							<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
+								{{svg "octicon-shield-lock"}}
+								<div class="ui inline dropdown">
+									<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
+								</div>
+								{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
+									{{$first := true}}
+									<div class="description">
+									Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
+									</div>
+								{{end}}
+							</div>
+							{{if $allowedToChangeTeams}}
+								<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
+									<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
+											{{$.locale.Tr "repo.settings.delete_collaborator"}}
+									</button>
+								</div>
+							{{end}}
 						</div>
 					{{end}}
 				</div>
-			{{end}}
-		</div>
-		{{end}}
-		<div class="ui bottom attached segment">
-			{{if $allowedToChangeTeams}}
-				<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
-					{{.CsrfTokenHtml}}
-					<div class="inline field ui left">
-						<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
-							<div class="ui input">
-								<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
+				{{end}}
+				<div class="ui bottom attached segment">
+					{{if $allowedToChangeTeams}}
+						<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
+							{{.CsrfTokenHtml}}
+							<div class="inline field ui left">
+								<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
+									<div class="ui input">
+										<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
+									</div>
+								</div>
 							</div>
+							<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
+						</form>
+					{{else}}
+						<div class="item">
+							{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
 						</div>
-					</div>
-					<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
-				</form>
-			{{else}}
-				<div class="item">
-					{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
+					{{end}}
 				</div>
-			{{end}}
+				{{end}}
+			</div>
 		</div>
-		{{end}}
 	</div>
 </div>
 
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 33f3937201db..9365df28195c 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,78 +1,82 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.deploy_keys"}}
-			<div class="ui right">
-			{{if not .DisableSSH}}
-				<button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
-			{{else}}
-				<button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
-			{{end}}
-			</div>
-		</h4>
-		<div class="ui attached segment">
-			<div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
-				<form class="ui form" action="{{.Link}}" method="post">
-					{{.CsrfTokenHtml}}
-					<div class="field">
-						{{.locale.Tr "repo.settings.deploy_key_desc"}}
-					</div>
-					<div class="field {{if .Err_Title}}error{{end}}">
-						<label for="title">{{.locale.Tr "repo.settings.title"}}</label>
-						<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
-					</div>
-					<div class="field {{if .Err_Content}}error{{end}}">
-						<label for="content">{{.locale.Tr "repo.settings.deploy_key_content"}}</label>
-						<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
-					</div>
-					<div class="field">
-						<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
-							<input id="ssh-key-is-writable" name="is_writable" type="checkbox" value="1">
-							<label for="is_writable">
-								{{.locale.Tr "repo.settings.is_writable"}}
-							</label>
-							<small style="padding-left: 26px;">{{$.locale.Tr "repo.settings.is_writable_info" | Str2html}}</small>
-						</div>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.deploy_keys"}}
+					<div class="ui right">
+					{{if not .DisableSSH}}
+						<button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
+					{{else}}
+						<button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
+					{{end}}
 					</div>
-					<button class="ui green button">
-						{{.locale.Tr "repo.settings.add_deploy_key"}}
-					</button>
-					<button class="ui hide-panel button" data-panel="#add-deploy-key-panel">
-						{{.locale.Tr "cancel"}}
-					</button>
-				</form>
-			</div>
-			{{if .Deploykeys}}
-				<div class="ui key list">
-					{{range .Deploykeys}}
-						<div class="item">
-							<div class="right floated content">
-								<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-									{{$.locale.Tr "settings.delete_key"}}
-								</button>
+				</h4>
+				<div class="ui attached segment">
+					<div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
+						<form class="ui form" action="{{.Link}}" method="post">
+							{{.CsrfTokenHtml}}
+							<div class="field">
+								{{.locale.Tr "repo.settings.deploy_key_desc"}}
 							</div>
-							<div class="left floated content">
-								<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</i>
+							<div class="field {{if .Err_Title}}error{{end}}">
+								<label for="title">{{.locale.Tr "repo.settings.title"}}</label>
+								<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
 							</div>
-							<div class="content">
-								<strong>{{.Name}}</strong>
-								<div class="print meta">
-									{{.Fingerprint}}
-								</div>
-								<div class="activity meta">
-									<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
+							<div class="field {{if .Err_Content}}error{{end}}">
+								<label for="content">{{.locale.Tr "repo.settings.deploy_key_content"}}</label>
+								<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
+							</div>
+							<div class="field">
+								<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
+									<input id="ssh-key-is-writable" name="is_writable" type="checkbox" value="1">
+									<label for="is_writable">
+										{{.locale.Tr "repo.settings.is_writable"}}
+									</label>
+									<small style="padding-left: 26px;">{{$.locale.Tr "repo.settings.is_writable_info" | Str2html}}</small>
 								</div>
 							</div>
+							<button class="ui green button">
+								{{.locale.Tr "repo.settings.add_deploy_key"}}
+							</button>
+							<button class="ui hide-panel button" data-panel="#add-deploy-key-panel">
+								{{.locale.Tr "cancel"}}
+							</button>
+						</form>
+					</div>
+					{{if .Deploykeys}}
+						<div class="ui key list">
+							{{range .Deploykeys}}
+								<div class="item">
+									<div class="right floated content">
+										<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+											{{$.locale.Tr "settings.delete_key"}}
+										</button>
+									</div>
+									<div class="left floated content">
+										<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</i>
+									</div>
+									<div class="content">
+										<strong>{{.Name}}</strong>
+										<div class="print meta">
+											{{.Fingerprint}}
+										</div>
+										<div class="activity meta">
+											<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
+										</div>
+									</div>
+								</div>
+							{{end}}
 						</div>
+					{{else}}
+						{{.locale.Tr "repo.settings.no_deploy_keys"}}
 					{{end}}
 				</div>
-			{{else}}
-				{{.locale.Tr "repo.settings.no_deploy_keys"}}
-			{{end}}
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index d4df95b29a48..be550136bf91 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,31 +1,35 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings edit githook">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.githooks"}}
-		</h4>
-		<div class="ui attached segment">
-			<p>{{.locale.Tr "repo.settings.githook_edit_desc"}}</p>
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-				{{with .Hook}}
-					<div class="inline field">
-						<label>{{$.locale.Tr "repo.settings.githook_name"}}</label>
-						<span class="hook-filename">{{.Name}}</span>
-					</div>
-					<div class="field">
-						<label for="content">{{$.locale.Tr "repo.settings.githook_content"}}</label>
-						<textarea id="content" name="content" class="gt-hidden">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
-						<div class="editor-loading is-loading"></div>
-					</div>
-					<div class="inline field">
-						<button class="ui green button">{{$.locale.Tr "repo.settings.update_githook"}}</button>
-					</div>
-				{{end}}
-			</form>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.githooks"}}
+				</h4>
+				<div class="ui attached segment">
+					<p>{{.locale.Tr "repo.settings.githook_edit_desc"}}</p>
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{.CsrfTokenHtml}}
+						{{with .Hook}}
+							<div class="inline field">
+								<label>{{$.locale.Tr "repo.settings.githook_name"}}</label>
+								<span class="hook-filename">{{.Name}}</span>
+							</div>
+							<div class="field">
+								<label for="content">{{$.locale.Tr "repo.settings.githook_content"}}</label>
+								<textarea id="content" name="content" class="gt-hidden">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
+								<div class="editor-loading is-loading"></div>
+							</div>
+							<div class="inline field">
+								<button class="ui green button">{{$.locale.Tr "repo.settings.update_githook"}}</button>
+							</div>
+						{{end}}
+					</form>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index a72d5ba29039..838fc3ad14ce 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,26 +1,30 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings githooks">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.githooks"}}
-		</h4>
-		<div class="ui attached segment">
-			<div class="ui list">
-				<div class="item">
-					{{.locale.Tr "repo.settings.githooks_desc" | Str2html}}
-				</div>
-				{{range .Hooks}}
-					<div class="item truncated-item-container">
-						<span class="text {{if .IsActive}}green{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span>
-						<span class="text truncate gt-f1 gt-mr-3">{{.Name}}</span>
-						<a class="muted ui right gt-p-3" href="{{$.RepoLink}}/settings/hooks/git/{{.Name|PathEscape}}">
-							{{svg "octicon-pencil"}}
-						</a>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.githooks"}}
+				</h4>
+				<div class="ui attached segment">
+					<div class="ui list">
+						<div class="item">
+							{{.locale.Tr "repo.settings.githooks_desc" | Str2html}}
+						</div>
+						{{range .Hooks}}
+							<div class="item truncated-item-container">
+								<span class="text {{if .IsActive}}green{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span>
+								<span class="text truncate gt-f1 gt-mr-3">{{.Name}}</span>
+								<a class="muted ui right gt-p-3" href="{{$.RepoLink}}/settings/hooks/git/{{.Name|PathEscape}}">
+									{{svg "octicon-pencil"}}
+								</a>
+							</div>
+						{{end}}
 					</div>
-				{{end}}
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 8be28ad9edba..1ce4bf787d79 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,63 +1,67 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
-			<div class="ui right">
-				<a class="ui tiny button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
-				<a class="ui primary tiny button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
-			</div>
-		</h4>
-		<table id="lfs-files-table" class="ui attached segment single line table">
-			<tbody>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
+					<div class="ui right">
+						<a class="ui tiny button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
+						<a class="ui primary tiny button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
+					</div>
+				</h4>
+				<table id="lfs-files-table" class="ui attached segment single line table">
+					<tbody>
+						{{range .LFSFiles}}
+							<tr>
+								<td>
+									<span class="text sha label">
+										<a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui detail icon button brown truncate">
+											{{ShortSha .Oid}}
+										</a>
+									</span>
+								</td>
+								<td>{{FileSize .Size}}</td>
+								<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
+								<td class="right aligned">
+									<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+									<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
+										<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
+									</button>
+								</td>
+							</tr>
+						{{else}}
+							<tr>
+								<td colspan="4">{{.locale.Tr "repo.settings.lfs_no_lfs_files"}}</td>
+							</tr>
+						{{end}}
+					</tbody>
+				</table>
+				{{template "base/paginate" .}}
 				{{range .LFSFiles}}
-					<tr>
-						<td>
-							<span class="text sha label">
-								<a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui detail icon button brown truncate">
-									{{ShortSha .Oid}}
-								</a>
-							</span>
-						</td>
-						<td>{{FileSize .Size}}</td>
-						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
-						<td class="right aligned">
-							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
-								<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
-							</button>
-						</td>
-					</tr>
-				{{else}}
-					<tr>
-						<td colspan="4">{{.locale.Tr "repo.settings.lfs_no_lfs_files"}}</td>
-					</tr>
-				{{end}}
-			</tbody>
-		</table>
-		{{template "base/paginate" .}}
-		{{range .LFSFiles}}
-			<div class="ui basic modal" id="delete-{{.Oid}}">
-				<div class="ui icon header">
-					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
-				</div>
-				<div class="content center">
-					<p>
-						{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
-					</p>
-					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
-						{{$.CsrfTokenHtml}}
-						<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
-							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
-							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
+					<div class="ui basic modal" id="delete-{{.Oid}}">
+						<div class="ui icon header">
+							{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 						</div>
-					</form>
-				</div>
+						<div class="content center">
+							<p>
+								{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
+							</p>
+							<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
+								{{$.CsrfTokenHtml}}
+								<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
+									<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
+									<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
+								</div>
+							</form>
+						</div>
+					</div>
+				{{end}}
 			</div>
-		{{end}}
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 2ad3458501c3..1e8795161426 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,59 +1,65 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
-		<div class="tab-size-8 non-diff-file-content">
-			<h4 class="ui top attached header">
-				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
-				<div class="ui right">
-					{{if .EscapeStatus.Escaped}}
-						<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
-						<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
-					{{end}}
-					<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-				</div>
-			</h4>
-			<div class="ui attached table unstackable segment">
-				{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
-				<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
-					{{if .IsMarkup}}
-						{{if .FileContent}}{{.FileContent | Safe}}{{end}}
-					{{else if .IsPlainText}}
-						<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
-					{{else if not .IsTextFile}}
-						<div class="view-raw ui center">
-							{{if .IsImageFile}}
-								<img src="{{$.RawFileLink}}">
-							{{else if .IsVideoFile}}
-								<video controls src="{{$.RawFileLink}}">
-									<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
-								</video>
-							{{else if .IsAudioFile}}
-								<audio controls src="{{$.RawFileLink}}">
-									<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
-								</audio>
-							{{else if .IsPDFFile}}
-								<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
-							{{else}}
-								<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
-							{{end}}
-						</div>
-					{{else if .FileSize}}
-						<table>
-							<tbody>
-								<tr>
-								{{if .IsFileTooLarge}}
-									<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
-								{{else}}
-									<td class="lines-num">{{.LineNums}}</td>
-									<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				<div class="ui container repository file list">
+					{{template "base/alert" .}}
+					<div class="tab-size-8 non-diff-file-content">
+						<h4 class="ui top attached header">
+							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
+							<div class="ui right">
+								{{if .EscapeStatus.Escaped}}
+									<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
+									<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
 								{{end}}
-								</tr>
-							</tbody>
-						</table>
-					{{end}}
+								<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+							</div>
+						</h4>
+						<div class="ui attached table unstackable segment">
+							{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
+							<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
+								{{if .IsMarkup}}
+									{{if .FileContent}}{{.FileContent | Safe}}{{end}}
+								{{else if .IsPlainText}}
+									<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
+								{{else if not .IsTextFile}}
+									<div class="view-raw ui center">
+										{{if .IsImageFile}}
+											<img src="{{$.RawFileLink}}">
+										{{else if .IsVideoFile}}
+											<video controls src="{{$.RawFileLink}}">
+												<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
+											</video>
+										{{else if .IsAudioFile}}
+											<audio controls src="{{$.RawFileLink}}">
+												<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
+											</audio>
+										{{else if .IsPDFFile}}
+											<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
+										{{else}}
+											<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
+										{{end}}
+									</div>
+								{{else if .FileSize}}
+									<table>
+										<tbody>
+											<tr>
+											{{if .IsFileTooLarge}}
+												<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
+											{{else}}
+												<td class="lines-num">{{.LineNums}}</td>
+												<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
+											{{end}}
+											</tr>
+										</tbody>
+									</table>
+								{{end}}
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 81cb6498374a..172968522dbe 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,51 +1,57 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
-		<div class="tab-size-8 non-diff-file-content">
-			<h4 class="ui top attached header">
-				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
-			</h4>
-			<table id="lfs-files-find-table" class="ui attached segment single line table">
-				<tbody>
-					{{range .Results}}
-						<tr>
-							<td>
-								{{svg "octicon-file"}}
-								<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
-							</td>
-							<td class="message">
-								<span class="truncate">
-									<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
-										{{.Summary | RenderEmoji $.Context}}
-									</a>
-								</span>
-							</td>
-							<td>
-								<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
-							</td>
-							<td>
-								{{if .ParentHashes}}
-									{{$.locale.Tr "repo.diff.parent"}}
-									{{range .ParentHashes}}
-										<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
-									{{end}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				<div class="ui container repository file list">
+					{{template "base/alert" .}}
+					<div class="tab-size-8 non-diff-file-content">
+						<h4 class="ui top attached header">
+							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
+						</h4>
+						<table id="lfs-files-find-table" class="ui attached segment single line table">
+							<tbody>
+								{{range .Results}}
+									<tr>
+										<td>
+											{{svg "octicon-file"}}
+											<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
+										</td>
+										<td class="message">
+											<span class="truncate">
+												<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
+													{{.Summary | RenderEmoji $.Context}}
+												</a>
+											</span>
+										</td>
+										<td>
+											<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
+										</td>
+										<td>
+											{{if .ParentHashes}}
+												{{$.locale.Tr "repo.diff.parent"}}
+												{{range .ParentHashes}}
+													<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
+												{{end}}
+											{{end}}
+											<div class="mobile-only"></div>
+											{{$.locale.Tr "repo.diff.commit"}}
+											<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
+										</td>
+										<td>{{TimeSince .When $.locale}}</td>
+									</tr>
+								{{else}}
+									<tr>
+										<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
+									</tr>
 								{{end}}
-								<div class="mobile-only"></div>
-								{{$.locale.Tr "repo.diff.commit"}}
-								<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
-							</td>
-							<td>{{TimeSince .When $.locale}}</td>
-						</tr>
-					{{else}}
-						<tr>
-							<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index cfe4f6add540..ebecafcce379 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,60 +1,66 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container repository file list">
-		{{template "base/alert" .}}
-		<div class="tab-size-8 non-diff-file-content">
-			<h4 class="ui top attached header">
-				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
-			</h4>
-			<div class="ui attached segment">
-				<form class="ui form ignore-dirty" method="POST">
-					{{$.CsrfTokenHtml}}
-					<div class="ui fluid action input">
-						<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
-						<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
-					</div>
-				</form>
-			</div>
-			<table id="lfs-files-locks-table" class="ui attached segment single line table">
-				<tbody>
-					{{range $index, $lock := .LFSLocks}}
-						<tr>
-							<td>
-								{{if index $.Linkable $index}}
-									{{svg "octicon-file"}}
-								<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				<div class="ui container repository file list">
+					{{template "base/alert" .}}
+					<div class="tab-size-8 non-diff-file-content">
+						<h4 class="ui top attached header">
+							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
+						</h4>
+						<div class="ui attached segment">
+							<form class="ui form ignore-dirty" method="POST">
+								{{$.CsrfTokenHtml}}
+								<div class="ui fluid action input">
+									<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
+									<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
+								</div>
+							</form>
+						</div>
+						<table id="lfs-files-locks-table" class="ui attached segment single line table">
+							<tbody>
+								{{range $index, $lock := .LFSLocks}}
+									<tr>
+										<td>
+											{{if index $.Linkable $index}}
+												{{svg "octicon-file"}}
+											<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
+											{{else}}
+												{{svg "octicon-diff"}}
+											<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
+											{{end}}
+											{{if not (index $.Lockables $index)}}
+												<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
+											{{end}}
+										</td>
+										<td>
+											<a href="{{$.Owner.HomeLink}}">
+												{{avatar $.Context $.Owner}}
+												{{$.Owner.DisplayName}}
+											</a>
+										</td>
+										<td>{{TimeSince .Created $.locale}}</td>
+										<td class="right aligned">
+											<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
+												{{$.CsrfTokenHtml}}
+												<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
+											</form>
+										</td>
+									</tr>
 								{{else}}
-									{{svg "octicon-diff"}}
-								<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
-								{{end}}
-								{{if not (index $.Lockables $index)}}
-									<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
+									<tr>
+										<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
+									</tr>
 								{{end}}
-							</td>
-							<td>
-								<a href="{{$.Owner.HomeLink}}">
-									{{avatar $.Context $.Owner}}
-									{{$.Owner.DisplayName}}
-								</a>
-							</td>
-							<td>{{TimeSince .Created $.locale}}</td>
-							<td class="right aligned">
-								<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
-									{{$.CsrfTokenHtml}}
-									<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
-								</form>
-							</td>
-						</tr>
-					{{else}}
-						<tr>
-							<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
-						</tr>
-					{{end}}
-				</tbody>
-			</table>
-			{{template "base/paginate" .}}
+							</tbody>
+						</table>
+						{{template "base/paginate" .}}
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index c95e07b482ad..992dc5f938d2 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,70 +1,74 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
-			{{if gt .NumAssociatable 0}}
-				<div class="ui right">
-					<form class="ui form" method="post" action="{{$.Link}}/associate">
-						{{.CsrfTokenHtml}}
-						{{range .Pointers}}
-							{{if .Associatable}}
-								<input type="hidden" name="oid" value="{{.Oid}} {{.Size}}">
-							{{end}}
-						{{end}}
-						<button class="ui green button">{{$.locale.Tr "repo.settings.lfs_pointers.associateAccessible" $.NumAssociatable}}</button>
-					</form>
-				</div>
-			{{end}}
-		</h4>
-		<div class="ui attached segment">
-			<table id="lfs-files-table" class="ui fixed single line table">
-				<thead>
-					<tr>
-						<th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th>
-						<th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th>
-						<th class="three wide"></th>
-						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th>
-						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th>
-						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th>
-					</tr>
-				</thead>
-				<tbody>
-					{{range .Pointers}}
-						<tr>
-							<td>
-								<span class="text sha label" title="{{.SHA}}">
-									<a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" class="ui detail icon button truncate">
-										{{ShortSha .SHA}}
-									</a>
-								</span>
-							</td>
-							<td>
-								<span class="text sha label" title="{{.Oid}}">
-									{{if and .Exists .InRepo}}
-										<a href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank" class="ui text detail icon button brown truncate">
-											{{ShortSha .Oid}}
-										</a>
-									{{else}}
-										<button class="ui detail icon button brown disabled truncate">
-											{{ShortSha .Oid}}
-										</button>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
+					{{if gt .NumAssociatable 0}}
+						<div class="ui right">
+							<form class="ui form" method="post" action="{{$.Link}}/associate">
+								{{.CsrfTokenHtml}}
+								{{range .Pointers}}
+									{{if .Associatable}}
+										<input type="hidden" name="oid" value="{{.Oid}} {{.Size}}">
 									{{end}}
-								</span>
-							</td>
-							<td>
-								<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							</td>
-							<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-							<td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-						</tr>
+								{{end}}
+								<button class="ui green button">{{$.locale.Tr "repo.settings.lfs_pointers.associateAccessible" $.NumAssociatable}}</button>
+							</form>
+						</div>
 					{{end}}
-				</tbody>
-			</table>
+				</h4>
+				<div class="ui attached segment">
+					<table id="lfs-files-table" class="ui fixed single line table">
+						<thead>
+							<tr>
+								<th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th>
+								<th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th>
+								<th class="three wide"></th>
+								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th>
+								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th>
+								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th>
+							</tr>
+						</thead>
+						<tbody>
+							{{range .Pointers}}
+								<tr>
+									<td>
+										<span class="text sha label" title="{{.SHA}}">
+											<a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" class="ui detail icon button truncate">
+												{{ShortSha .SHA}}
+											</a>
+										</span>
+									</td>
+									<td>
+										<span class="text sha label" title="{{.Oid}}">
+											{{if and .Exists .InRepo}}
+												<a href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank" class="ui text detail icon button brown truncate">
+													{{ShortSha .Oid}}
+												</a>
+											{{else}}
+												<button class="ui detail icon button brown disabled truncate">
+													{{ShortSha .Oid}}
+												</button>
+											{{end}}
+										</span>
+									</td>
+									<td>
+										<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+									</td>
+									<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+									<td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+								</tr>
+							{{end}}
+						</tbody>
+					</table>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index bdfbb6bf109c..081d0c474ec5 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -1,5 +1,6 @@
-<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar shadow-body">
-	<div class="new-menu-inner">
+<div class="four wide column">
+	<div class="ui fluid vertical menu">
+		<div class="header item">{{.locale.Tr "org.settings"}}</div>
 		<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings">
 			{{.locale.Tr "repo.settings.options"}}
 		</a>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 81c1e4759e8d..962679bd62e3 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,802 +1,806 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings options">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.basic_settings"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-				{{template "base/disable_form_autofill"}}
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="update">
-				<div class="required field {{if .Err_RepoName}}error{{end}}">
-					<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
-					<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
-				</div>
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.repo_size"}}</label>
-					<span>{{FileSize .Repository.Size}}</span>
-				</div>
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.template"}}</label>
-					<div class="ui checkbox">
-						<input name="template" type="checkbox" {{if .Repository.IsTemplate}}checked{{end}}>
-						<label>{{.locale.Tr "repo.template_helper"}}</label>
-					</div>
-				</div>
-				{{if not .Repository.IsFork}}
-					<div class="inline field">
-						<label>{{.locale.Tr "repo.visibility"}}</label>
-						<div class="ui checkbox">
-							{{if .IsAdmin}}
-							<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}>
-							{{else}}
-							<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>
-							{{end}}
-							<label>{{.locale.Tr "repo.visibility_helper" | Safe}} {{if .Repository.NumForks}}<span class="text red">{{.locale.Tr "repo.visibility_fork_helper"}}</span>{{end}}</label>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.basic_settings"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{.Link}}" method="post">
+						{{template "base/disable_form_autofill"}}
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="action" value="update">
+						<div class="required field {{if .Err_RepoName}}error{{end}}">
+							<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
+							<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
+						</div>
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.repo_size"}}</label>
+							<span>{{FileSize .Repository.Size}}</span>
+						</div>
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.template"}}</label>
+							<div class="ui checkbox">
+								<input name="template" type="checkbox" {{if .Repository.IsTemplate}}checked{{end}}>
+								<label>{{.locale.Tr "repo.template_helper"}}</label>
+							</div>
+						</div>
+						{{if not .Repository.IsFork}}
+							<div class="inline field">
+								<label>{{.locale.Tr "repo.visibility"}}</label>
+								<div class="ui checkbox">
+									{{if .IsAdmin}}
+									<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}>
+									{{else}}
+									<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>
+									{{end}}
+									<label>{{.locale.Tr "repo.visibility_helper" | Safe}} {{if .Repository.NumForks}}<span class="text red">{{.locale.Tr "repo.visibility_fork_helper"}}</span>{{end}}</label>
+								</div>
+							</div>
+						{{end}}
+						<div class="field {{if .Err_Description}}error{{end}}">
+							<label for="description">{{$.locale.Tr "repo.repo_desc"}}</label>
+							<textarea id="description" name="description" rows="2" maxlength="2048">{{.Repository.Description}}</textarea>
+						</div>
+						<div class="field {{if .Err_Website}}error{{end}}">
+							<label for="website">{{.locale.Tr "repo.settings.site"}}</label>
+							<input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}">
 						</div>
-					</div>
-				{{end}}
-				<div class="field {{if .Err_Description}}error{{end}}">
-					<label for="description">{{$.locale.Tr "repo.repo_desc"}}</label>
-					<textarea id="description" name="description" rows="2" maxlength="2048">{{.Repository.Description}}</textarea>
-				</div>
-				<div class="field {{if .Err_Website}}error{{end}}">
-					<label for="website">{{.locale.Tr "repo.settings.site"}}</label>
-					<input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}">
-				</div>
-
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-				</div>
-			</form>
-
-			<div class="ui divider"></div>
 
-			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-				{{.CsrfTokenHtml}}
-				<div class="inline field">
-					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
-				</div>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+						</div>
+					</form>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
-				</div>
-			</form>
+					<div class="ui divider"></div>
 
-		</div>
+					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+						{{.CsrfTokenHtml}}
+						<div class="inline field">
+							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+							<input name="avatar" type="file" >
+						</div>
 
-		{{if .MirrorsEnabled}}
-			<h4 class="ui top attached header">
-				{{.locale.Tr "repo.settings.mirror_settings"}}
-			</h4>
-			<div class="ui attached segment">
-				{{$.locale.Tr "repo.settings.mirror_settings.docs" | Safe}}
-				<table class="ui table">
-					{{if or .Repository.IsMirror .PushMirrors}}
-					<thead>
-						<tr>
-							<th style="width:40%">{{$.locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
-							<th>{{$.locale.Tr "repo.settings.mirror_settings.direction"}}</th>
-							<th>{{$.locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
-							<th></th>
-						</tr>
-					</thead>
-					{{end}}
-					{{if .Repository.IsMirror}}
-					<tbody>
-						<tr>
-							<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
-							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
-							<td>{{template "shared/datetime/full" (dict "Datetime" .Mirror.UpdatedUnix.FormatLong "Fallback" .Mirror.UpdatedUnix.AsTime)}}</td>
-							<td class="right aligned">
-								<form method="post" style="display: inline-block">
-									{{.CsrfTokenHtml}}
-									<input type="hidden" name="action" value="mirror-sync">
-									<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
-								</form>
-							</td>
-						</tr>
-						<tr>
-							<td colspan="4">
-								<form class="ui form" method="post">
-									{{template "base/disable_form_autofill"}}
-									{{.CsrfTokenHtml}}
-									<input type="hidden" name="action" value="mirror">
-									<div class="inline field {{if .Err_EnablePrune}}error{{end}}">
-										<label>{{.locale.Tr "repo.mirror_prune"}}</label>
-										<div class="ui checkbox">
-									<input id="enable_prune" name="enable_prune" type="checkbox" {{if .MirrorEnablePrune}}checked{{end}}>
-									<label>{{.locale.Tr "repo.mirror_prune_desc"}}</label>
-										</div>
-									</div>
-									<div class="inline field {{if .Err_Interval}}error{{end}}">
-										<label for="interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-										<input id="interval" name="interval" value="{{.MirrorInterval}}">
-									</div>
-									{{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false}}
-									<div class="field {{if .Err_MirrorAddress}}error{{end}}">
-										<label for="mirror_address">{{.locale.Tr "repo.mirror_address"}}</label>
-										<input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required>
-										<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
-									</div>
-									<details class="ui optional field" {{if or .Err_Auth $address.Username}}open{{end}}>
-										<summary class="gt-p-2">
-											{{.locale.Tr "repo.need_auth"}}
-										</summary>
-										<div class="gt-p-2">
-											<div class="inline field {{if .Err_Auth}}error{{end}}">
-												<label for="mirror_username">{{.locale.Tr "username"}}</label>
-												<input id="mirror_username" name="mirror_username" value="{{$address.Username}}" {{if not .mirror_username}}data-need-clear="true"{{end}}>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
+						</div>
+					</form>
+
+				</div>
+
+				{{if .MirrorsEnabled}}
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.settings.mirror_settings"}}
+					</h4>
+					<div class="ui attached segment">
+						{{$.locale.Tr "repo.settings.mirror_settings.docs" | Safe}}
+						<table class="ui table">
+							{{if or .Repository.IsMirror .PushMirrors}}
+							<thead>
+								<tr>
+									<th style="width:40%">{{$.locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
+									<th>{{$.locale.Tr "repo.settings.mirror_settings.direction"}}</th>
+									<th>{{$.locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
+									<th></th>
+								</tr>
+							</thead>
+							{{end}}
+							{{if .Repository.IsMirror}}
+							<tbody>
+								<tr>
+									<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
+									<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
+									<td>{{template "shared/datetime/full" (dict "Datetime" .Mirror.UpdatedUnix.FormatLong "Fallback" .Mirror.UpdatedUnix.AsTime)}}</td>
+									<td class="right aligned">
+										<form method="post" style="display: inline-block">
+											{{.CsrfTokenHtml}}
+											<input type="hidden" name="action" value="mirror-sync">
+											<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
+										</form>
+									</td>
+								</tr>
+								<tr>
+									<td colspan="4">
+										<form class="ui form" method="post">
+											{{template "base/disable_form_autofill"}}
+											{{.CsrfTokenHtml}}
+											<input type="hidden" name="action" value="mirror">
+											<div class="inline field {{if .Err_EnablePrune}}error{{end}}">
+												<label>{{.locale.Tr "repo.mirror_prune"}}</label>
+												<div class="ui checkbox">
+											<input id="enable_prune" name="enable_prune" type="checkbox" {{if .MirrorEnablePrune}}checked{{end}}>
+											<label>{{.locale.Tr "repo.mirror_prune_desc"}}</label>
+												</div>
 											</div>
-											<div class="inline field {{if .Err_Auth}}error{{end}}">
-												<label for="mirror_password">{{.locale.Tr "password"}}</label>
-												<input id="mirror_password" name="mirror_password" type="password" placeholder="{{if $address.Password}}{{.locale.Tr "repo.mirror_password_placeholder"}}{{else}}{{.locale.Tr "repo.mirror_password_blank_placeholder"}}{{end}}" value="" {{if not .mirror_password}}data-need-clear="true"{{end}} autocomplete="off">
+											<div class="inline field {{if .Err_Interval}}error{{end}}">
+												<label for="interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+												<input id="interval" name="interval" value="{{.MirrorInterval}}">
 											</div>
-											<p class="help">{{.locale.Tr "repo.mirror_password_help"}}</p>
-										</div>
-									</details>
-
-									{{if .LFSStartServer}}
-									<div class="inline field">
-										<label>{{.locale.Tr "repo.mirror_lfs"}}</label>
-										<div class="ui checkbox">
-											<input id="mirror_lfs" name="mirror_lfs" type="checkbox" {{if .Mirror.LFS}}checked{{end}}>
-											<label>{{.locale.Tr "repo.mirror_lfs_desc"}}</label>
-										</div>
-									</div>
-									<div class="field {{if .Err_LFSEndpoint}}error{{end}}">
-										<label for="mirror_lfs_endpoint">{{.locale.Tr "repo.mirror_lfs_endpoint"}}</label>
-										<input id="mirror_lfs_endpoint" name="mirror_lfs_endpoint" value="{{.Mirror.LFSEndpoint}}" placeholder="{{.locale.Tr "repo.migrate_options_lfs_endpoint.placeholder"}}">
-										<p class="help">{{.locale.Tr "repo.mirror_lfs_endpoint_desc" "https://github.com/git-lfs/git-lfs/blob/main/docs/api/server-discovery.md#server-discovery" | Str2html}}</p>
-									</div>
-									{{end}}
-									<div class="field">
-										<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-									</div>
-								</form>
-							</td>
-						</tr>
-					</tbody>
-					<thead><tr><th colspan="4"></th></tr></thead>
-					{{end}}
-					<tbody>
-						{{range .PushMirrors}}
-						<tr>
-							{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
-							<td>{{$address.Address}}</td>
-							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-							<td>{{if .LastUpdateUnix}}{{template "shared/datetime/full" (dict "Datetime" .LastUpdateUnix.FormatLong "Fallback" .LastUpdateUnix.AsTime)}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
-							<td class="right aligned">
-								<form method="post" style="display: inline-block">
-									{{$.CsrfTokenHtml}}
-									<input type="hidden" name="action" value="push-mirror-remove">
-									<input type="hidden" name="push_mirror_id" value="{{.ID}}">
-									<button class="ui basic red tiny button inline text-thin">{{$.locale.Tr "remove"}}</button>
-								</form>
-								<form method="post" style="display: inline-block">
-									{{$.CsrfTokenHtml}}
-									<input type="hidden" name="action" value="push-mirror-sync">
-									<input type="hidden" name="push_mirror_id" value="{{.ID}}">
-									<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
-								</form>
-							</td>
-						</tr>
-						{{else}}
-						<tr>
-							<td>{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.none"}}</td>
-						</tr>
-						{{end}}
-						{{if (not .DisableNewPushMirrors)}}
-							<tr>
-								<td colspan="4">
-									<form class="ui form" method="post">
-										{{template "base/disable_form_autofill"}}
-										{{.CsrfTokenHtml}}
-										<input type="hidden" name="action" value="push-mirror-add">
-										<div class="field {{if .Err_PushMirrorAddress}}error{{end}}">
-											<label for="push_mirror_address">{{.locale.Tr "repo.settings.mirror_settings.push_mirror.remote_url"}}</label>
-											<input id="push_mirror_address" name="push_mirror_address" value="{{.push_mirror_address}}" required>
-											<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
-										</div>
-										<details class="ui optional field" {{if or .Err_PushMirrorAuth .push_mirror_username}}open{{end}}>
-											<summary class="gt-p-2">
-												{{.locale.Tr "repo.need_auth"}}
-											</summary>
-											<div class="gt-p-2">
-												<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
-													<label for="push_mirror_username">{{.locale.Tr "username"}}</label>
-													<input id="push_mirror_username" name="push_mirror_username" value="{{.push_mirror_username}}">
+											{{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false}}
+											<div class="field {{if .Err_MirrorAddress}}error{{end}}">
+												<label for="mirror_address">{{.locale.Tr "repo.mirror_address"}}</label>
+												<input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required>
+												<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
+											</div>
+											<details class="ui optional field" {{if or .Err_Auth $address.Username}}open{{end}}>
+												<summary class="gt-p-2">
+													{{.locale.Tr "repo.need_auth"}}
+												</summary>
+												<div class="gt-p-2">
+													<div class="inline field {{if .Err_Auth}}error{{end}}">
+														<label for="mirror_username">{{.locale.Tr "username"}}</label>
+														<input id="mirror_username" name="mirror_username" value="{{$address.Username}}" {{if not .mirror_username}}data-need-clear="true"{{end}}>
+													</div>
+													<div class="inline field {{if .Err_Auth}}error{{end}}">
+														<label for="mirror_password">{{.locale.Tr "password"}}</label>
+														<input id="mirror_password" name="mirror_password" type="password" placeholder="{{if $address.Password}}{{.locale.Tr "repo.mirror_password_placeholder"}}{{else}}{{.locale.Tr "repo.mirror_password_blank_placeholder"}}{{end}}" value="" {{if not .mirror_password}}data-need-clear="true"{{end}} autocomplete="off">
+													</div>
+													<p class="help">{{.locale.Tr "repo.mirror_password_help"}}</p>
 												</div>
-												<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
-													<label for="push_mirror_password">{{.locale.Tr "password"}}</label>
-													<input id="push_mirror_password" name="push_mirror_password" type="password" value="{{.push_mirror_password}}" autocomplete="off">
+											</details>
+
+											{{if .LFSStartServer}}
+											<div class="inline field">
+												<label>{{.locale.Tr "repo.mirror_lfs"}}</label>
+												<div class="ui checkbox">
+													<input id="mirror_lfs" name="mirror_lfs" type="checkbox" {{if .Mirror.LFS}}checked{{end}}>
+													<label>{{.locale.Tr "repo.mirror_lfs_desc"}}</label>
 												</div>
 											</div>
-										</details>
-										<div class="field">
-											<div class="ui checkbox">
-												<input id="push_mirror_sync_on_commit" name="push_mirror_sync_on_commit" type="checkbox" {{if .push_mirror_sync_on_commit}}checked{{end}}>
-												<label for="push_mirror_sync_on_commit">{{.locale.Tr "repo.mirror_sync_on_commit"}}</label>
+											<div class="field {{if .Err_LFSEndpoint}}error{{end}}">
+												<label for="mirror_lfs_endpoint">{{.locale.Tr "repo.mirror_lfs_endpoint"}}</label>
+												<input id="mirror_lfs_endpoint" name="mirror_lfs_endpoint" value="{{.Mirror.LFSEndpoint}}" placeholder="{{.locale.Tr "repo.migrate_options_lfs_endpoint.placeholder"}}">
+												<p class="help">{{.locale.Tr "repo.mirror_lfs_endpoint_desc" "https://github.com/git-lfs/git-lfs/blob/main/docs/api/server-discovery.md#server-discovery" | Str2html}}</p>
 											</div>
-										</div>
-										<div class="inline field {{if .Err_PushMirrorInterval}}error{{end}}">
-											<label for="push_mirror_interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-											<input id="push_mirror_interval" name="push_mirror_interval" value="{{if .push_mirror_interval}}{{.push_mirror_interval}}{{else}}{{.DefaultMirrorInterval}}{{end}}">
-										</div>
-										<div class="field">
-											<button class="ui green button">{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.add"}}</button>
-										</div>
-									</form>
-								</td>
-							</tr>
-						{{end}}
-					</tbody>
-				</table>
-			</div>
-		{{end}}
-
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.advanced_settings"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" method="post">
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="advanced">
-
-				{{$isCodeEnabled := .Repository.UnitEnabled $.Context $.UnitTypeCode}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.code"}}</label>
-					{{if .UnitTypeCode.UnitGlobalDisabled}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_code" type="checkbox"{{if $isCodeEnabled}} checked{{end}}>
-						<label>{{.locale.Tr "repo.code.desc"}}</label>
+											{{end}}
+											<div class="field">
+												<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+											</div>
+										</form>
+									</td>
+								</tr>
+							</tbody>
+							<thead><tr><th colspan="4"></th></tr></thead>
+							{{end}}
+							<tbody>
+								{{range .PushMirrors}}
+								<tr>
+									{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
+									<td>{{$address.Address}}</td>
+									<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
+									<td>{{if .LastUpdateUnix}}{{template "shared/datetime/full" (dict "Datetime" .LastUpdateUnix.FormatLong "Fallback" .LastUpdateUnix.AsTime)}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
+									<td class="right aligned">
+										<form method="post" style="display: inline-block">
+											{{$.CsrfTokenHtml}}
+											<input type="hidden" name="action" value="push-mirror-remove">
+											<input type="hidden" name="push_mirror_id" value="{{.ID}}">
+											<button class="ui basic red tiny button inline text-thin">{{$.locale.Tr "remove"}}</button>
+										</form>
+										<form method="post" style="display: inline-block">
+											{{$.CsrfTokenHtml}}
+											<input type="hidden" name="action" value="push-mirror-sync">
+											<input type="hidden" name="push_mirror_id" value="{{.ID}}">
+											<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
+										</form>
+									</td>
+								</tr>
+								{{else}}
+								<tr>
+									<td>{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.none"}}</td>
+								</tr>
+								{{end}}
+								{{if (not .DisableNewPushMirrors)}}
+									<tr>
+										<td colspan="4">
+											<form class="ui form" method="post">
+												{{template "base/disable_form_autofill"}}
+												{{.CsrfTokenHtml}}
+												<input type="hidden" name="action" value="push-mirror-add">
+												<div class="field {{if .Err_PushMirrorAddress}}error{{end}}">
+													<label for="push_mirror_address">{{.locale.Tr "repo.settings.mirror_settings.push_mirror.remote_url"}}</label>
+													<input id="push_mirror_address" name="push_mirror_address" value="{{.push_mirror_address}}" required>
+													<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
+												</div>
+												<details class="ui optional field" {{if or .Err_PushMirrorAuth .push_mirror_username}}open{{end}}>
+													<summary class="gt-p-2">
+														{{.locale.Tr "repo.need_auth"}}
+													</summary>
+													<div class="gt-p-2">
+														<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
+															<label for="push_mirror_username">{{.locale.Tr "username"}}</label>
+															<input id="push_mirror_username" name="push_mirror_username" value="{{.push_mirror_username}}">
+														</div>
+														<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
+															<label for="push_mirror_password">{{.locale.Tr "password"}}</label>
+															<input id="push_mirror_password" name="push_mirror_password" type="password" value="{{.push_mirror_password}}" autocomplete="off">
+														</div>
+													</div>
+												</details>
+												<div class="field">
+													<div class="ui checkbox">
+														<input id="push_mirror_sync_on_commit" name="push_mirror_sync_on_commit" type="checkbox" {{if .push_mirror_sync_on_commit}}checked{{end}}>
+														<label for="push_mirror_sync_on_commit">{{.locale.Tr "repo.mirror_sync_on_commit"}}</label>
+													</div>
+												</div>
+												<div class="inline field {{if .Err_PushMirrorInterval}}error{{end}}">
+													<label for="push_mirror_interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+													<input id="push_mirror_interval" name="push_mirror_interval" value="{{if .push_mirror_interval}}{{.push_mirror_interval}}{{else}}{{.DefaultMirrorInterval}}{{end}}">
+												</div>
+												<div class="field">
+													<button class="ui green button">{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.add"}}</button>
+												</div>
+											</form>
+										</td>
+									</tr>
+								{{end}}
+							</tbody>
+						</table>
 					</div>
-				</div>
+				{{end}}
 
-				{{$isWikiEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeWiki) (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.wiki"}}</label>
-					{{if and (.UnitTypeWiki.UnitGlobalDisabled) (.UnitTypeExternalWiki.UnitGlobalDisabled)}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_wiki" type="checkbox" data-target="#wiki_box" {{if $isWikiEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.wiki_desc"}}</label>
-					</div>
-				</div>
-				<div class="field {{if not $isWikiEnabled}}disabled{{end}}" id="wiki_box">
-					<div class="field">
-						{{if .UnitTypeWiki.UnitGlobalDisabled}}
-						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
-						<div class="ui radio checkbox">
-						{{end}}
-							<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="false" data-target="#external_wiki_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.use_internal_wiki"}}</label>
-						</div>
-					</div>
-					<div class="field">
-						{{if .UnitTypeExternalWiki.UnitGlobalDisabled}}
-						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
-						<div class="ui radio checkbox">
-						{{end}}
-							<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="true" data-target="#external_wiki_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalWiki}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.use_external_wiki"}}</label>
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.advanced_settings"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" method="post">
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="action" value="advanced">
+
+						{{$isCodeEnabled := .Repository.UnitEnabled $.Context $.UnitTypeCode}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.code"}}</label>
+							{{if .UnitTypeCode.UnitGlobalDisabled}}
+							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+							{{else}}
+							<div class="ui checkbox">
+							{{end}}
+								<input class="enable-system" name="enable_code" type="checkbox"{{if $isCodeEnabled}} checked{{end}}>
+								<label>{{.locale.Tr "repo.code.desc"}}</label>
+							</div>
 						</div>
-					</div>
-					<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}disabled{{end}}" id="external_wiki_box">
-						<label for="external_wiki_url">{{.locale.Tr "repo.settings.external_wiki_url"}}</label>
-						<input id="external_wiki_url" name="external_wiki_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}">
-						<p class="help">{{.locale.Tr "repo.settings.external_wiki_url_desc"}}</p>
-					</div>
-				</div>
-
-				<div class="ui divider"></div>
 
-				{{$isIssuesEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeIssues) (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.issues"}}</label>
-					{{if and (.UnitTypeIssues.UnitGlobalDisabled) (.UnitTypeExternalTracker.UnitGlobalDisabled)}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_issues" type="checkbox" data-target="#issue_box" {{if $isIssuesEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.issues_desc"}}</label>
-					</div>
-				</div>
-				<div class="field {{if not $isIssuesEnabled}}disabled{{end}}" id="issue_box">
-					<div class="field">
-						{{if .UnitTypeIssues.UnitGlobalDisabled}}
-						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
-						<div class="ui radio checkbox">
-						{{end}}
-							<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="false" data-context="#internal_issue_box" data-target="#external_issue_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.use_internal_issue_tracker"}}</label>
+						{{$isWikiEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeWiki) (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.wiki"}}</label>
+							{{if and (.UnitTypeWiki.UnitGlobalDisabled) (.UnitTypeExternalWiki.UnitGlobalDisabled)}}
+							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+							{{else}}
+							<div class="ui checkbox">
+							{{end}}
+								<input class="enable-system" name="enable_wiki" type="checkbox" data-target="#wiki_box" {{if $isWikiEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.wiki_desc"}}</label>
+							</div>
 						</div>
-					</div>
-					<div class="field {{if (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="internal_issue_box">
-						{{if .Repository.CanEnableTimetracker}}
+						<div class="field {{if not $isWikiEnabled}}disabled{{end}}" id="wiki_box">
 							<div class="field">
-								<div class="ui checkbox">
-									<input name="enable_timetracker" class="enable-system" data-target="#only_contributors" type="checkbox" {{if .Repository.IsTimetrackerEnabled $.Context}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.enable_timetracker"}}</label>
+								{{if .UnitTypeWiki.UnitGlobalDisabled}}
+								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
+								<div class="ui radio checkbox">
+								{{end}}
+									<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="false" data-target="#external_wiki_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.use_internal_wiki"}}</label>
 								</div>
 							</div>
-							<div class="field {{if not (.Repository.IsTimetrackerEnabled $.Context)}}disabled{{end}}" id="only_contributors">
-								<div class="ui checkbox">
-									<input name="allow_only_contributors_to_track_time" type="checkbox" {{if .Repository.AllowOnlyContributorsToTrackTime $.Context}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.allow_only_contributors_to_track_time"}}</label>
+							<div class="field">
+								{{if .UnitTypeExternalWiki.UnitGlobalDisabled}}
+								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
+								<div class="ui radio checkbox">
+								{{end}}
+									<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="true" data-target="#external_wiki_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalWiki}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.use_external_wiki"}}</label>
 								</div>
 							</div>
-						{{end}}
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.IsDependenciesEnabled $.Context)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.issues.dependency.setting"}}</label>
+							<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}disabled{{end}}" id="external_wiki_box">
+								<label for="external_wiki_url">{{.locale.Tr "repo.settings.external_wiki_url"}}</label>
+								<input id="external_wiki_url" name="external_wiki_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}">
+								<p class="help">{{.locale.Tr "repo.settings.external_wiki_url_desc"}}</p>
 							</div>
 						</div>
-						<div class="ui checkbox">
-							<input name="enable_close_issues_via_commit_in_any_branch" type="checkbox" {{if .Repository.CloseIssuesViaCommitInAnyBranch}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.admin_enable_close_issues_via_commit_in_any_branch"}}</label>
-						</div>
-					</div>
-					<div class="field">
-						{{if .UnitTypeExternalTracker.UnitGlobalDisabled}}
-						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
-						<div class="ui radio checkbox">
-						{{end}}
-							<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="true" data-context="#internal_issue_box" data-target="#external_issue_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalTracker}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.use_external_issue_tracker"}}</label>
-						</div>
-					</div>
-					<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="external_issue_box">
-						<div class="field">
-							<label for="external_tracker_url">{{.locale.Tr "repo.settings.external_tracker_url"}}</label>
-							<input id="external_tracker_url" name="external_tracker_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerURL}}">
-							<p class="help">{{.locale.Tr "repo.settings.external_tracker_url_desc"}}</p>
-						</div>
-						<div class="field">
-							<label for="tracker_url_format">{{.locale.Tr "repo.settings.tracker_url_format"}}</label>
-							<input id="tracker_url_format" name="tracker_url_format" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerFormat}}" placeholder="e.g. https://github.com/{user}/{repo}/issues/{index}">
-							<p class="help">{{.locale.Tr "repo.settings.tracker_url_format_desc" | Str2html}}</p>
+
+						<div class="ui divider"></div>
+
+						{{$isIssuesEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeIssues) (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.issues"}}</label>
+							{{if and (.UnitTypeIssues.UnitGlobalDisabled) (.UnitTypeExternalTracker.UnitGlobalDisabled)}}
+							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+							{{else}}
+							<div class="ui checkbox">
+							{{end}}
+								<input class="enable-system" name="enable_issues" type="checkbox" data-target="#issue_box" {{if $isIssuesEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.issues_desc"}}</label>
+							</div>
 						</div>
-						<div class="inline fields">
-							<label for="issue_style">{{.locale.Tr "repo.settings.tracker_issue_style"}}</label>
+						<div class="field {{if not $isIssuesEnabled}}disabled{{end}}" id="issue_box">
 							<div class="field">
+								{{if .UnitTypeIssues.UnitGlobalDisabled}}
+								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
 								<div class="ui radio checkbox">
-								{{$externalTracker := (.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker)}}
-								{{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}}
-									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="numeric" {{if eq $externalTrackerStyle "numeric"}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.tracker_issue_style.numeric"}} <span class="ui light grey text">#1234</span></label>
+								{{end}}
+									<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="false" data-context="#internal_issue_box" data-target="#external_issue_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.use_internal_issue_tracker"}}</label>
 								</div>
 							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="alphanumeric" {{if eq $externalTrackerStyle "alphanumeric"}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.tracker_issue_style.alphanumeric"}} <span class="ui light grey text">ABC-123 , DEFG-234</span></label>
+							<div class="field {{if (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="internal_issue_box">
+								{{if .Repository.CanEnableTimetracker}}
+									<div class="field">
+										<div class="ui checkbox">
+											<input name="enable_timetracker" class="enable-system" data-target="#only_contributors" type="checkbox" {{if .Repository.IsTimetrackerEnabled $.Context}}checked{{end}}>
+											<label>{{.locale.Tr "repo.settings.enable_timetracker"}}</label>
+										</div>
+									</div>
+									<div class="field {{if not (.Repository.IsTimetrackerEnabled $.Context)}}disabled{{end}}" id="only_contributors">
+										<div class="ui checkbox">
+											<input name="allow_only_contributors_to_track_time" type="checkbox" {{if .Repository.AllowOnlyContributorsToTrackTime $.Context}}checked{{end}}>
+											<label>{{.locale.Tr "repo.settings.allow_only_contributors_to_track_time"}}</label>
+										</div>
+									</div>
+								{{end}}
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.IsDependenciesEnabled $.Context)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.issues.dependency.setting"}}</label>
+									</div>
+								</div>
+								<div class="ui checkbox">
+									<input name="enable_close_issues_via_commit_in_any_branch" type="checkbox" {{if .Repository.CloseIssuesViaCommitInAnyBranch}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.admin_enable_close_issues_via_commit_in_any_branch"}}</label>
 								</div>
 							</div>
 							<div class="field">
+								{{if .UnitTypeExternalTracker.UnitGlobalDisabled}}
+								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
 								<div class="ui radio checkbox">
-									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="regexp" {{if eq $externalTrackerStyle "regexp"}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.tracker_issue_style.regexp"}} <span class="ui light grey text">(ISSUE-\d+) , ISSUE-(\d+)</span></label>
+								{{end}}
+									<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="true" data-context="#internal_issue_box" data-target="#external_issue_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalTracker}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.use_external_issue_tracker"}}</label>
+								</div>
+							</div>
+							<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="external_issue_box">
+								<div class="field">
+									<label for="external_tracker_url">{{.locale.Tr "repo.settings.external_tracker_url"}}</label>
+									<input id="external_tracker_url" name="external_tracker_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerURL}}">
+									<p class="help">{{.locale.Tr "repo.settings.external_tracker_url_desc"}}</p>
+								</div>
+								<div class="field">
+									<label for="tracker_url_format">{{.locale.Tr "repo.settings.tracker_url_format"}}</label>
+									<input id="tracker_url_format" name="tracker_url_format" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerFormat}}" placeholder="e.g. https://github.com/{user}/{repo}/issues/{index}">
+									<p class="help">{{.locale.Tr "repo.settings.tracker_url_format_desc" | Str2html}}</p>
+								</div>
+								<div class="inline fields">
+									<label for="issue_style">{{.locale.Tr "repo.settings.tracker_issue_style"}}</label>
+									<div class="field">
+										<div class="ui radio checkbox">
+										{{$externalTracker := (.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker)}}
+										{{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}}
+											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="numeric" {{if eq $externalTrackerStyle "numeric"}}checked{{end}}>
+											<label>{{.locale.Tr "repo.settings.tracker_issue_style.numeric"}} <span class="ui light grey text">#1234</span></label>
+										</div>
+									</div>
+									<div class="field">
+										<div class="ui radio checkbox">
+											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="alphanumeric" {{if eq $externalTrackerStyle "alphanumeric"}}checked{{end}}>
+											<label>{{.locale.Tr "repo.settings.tracker_issue_style.alphanumeric"}} <span class="ui light grey text">ABC-123 , DEFG-234</span></label>
+										</div>
+									</div>
+									<div class="field">
+										<div class="ui radio checkbox">
+											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="regexp" {{if eq $externalTrackerStyle "regexp"}}checked{{end}}>
+											<label>{{.locale.Tr "repo.settings.tracker_issue_style.regexp"}} <span class="ui light grey text">(ISSUE-\d+) , ISSUE-(\d+)</span></label>
+										</div>
+									</div>
+								</div>
+								<div class="field {{if ne $externalTrackerStyle "regexp"}}disabled{{end}}" id="tracker-issue-style-regex-box">
+									<label for="external_tracker_regexp_pattern">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern"}}</label>
+									<input id="external_tracker_regexp_pattern" name="external_tracker_regexp_pattern" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerRegexpPattern}}">
+									<p class="help">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern_desc" | Str2html}}</p>
 								</div>
 							</div>
 						</div>
-						<div class="field {{if ne $externalTrackerStyle "regexp"}}disabled{{end}}" id="tracker-issue-style-regex-box">
-							<label for="external_tracker_regexp_pattern">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern"}}</label>
-							<input id="external_tracker_regexp_pattern" name="external_tracker_regexp_pattern" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerRegexpPattern}}">
-							<p class="help">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern_desc" | Str2html}}</p>
-						</div>
-					</div>
-				</div>
-
-				<div class="ui divider"></div>
 
-				{{$isProjectsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeProjects}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.project_board"}}</label>
-					{{if .UnitTypeProjects.UnitGlobalDisabled}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_projects" type="checkbox" {{if $isProjectsEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.projects_desc"}}</label>
-					</div>
-				</div>
+						<div class="ui divider"></div>
 
-				{{$isReleasesEnabled := .Repository.UnitEnabled $.Context $.UnitTypeReleases}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.releases"}}</label>
-					{{if .UnitTypeReleases.UnitGlobalDisabled}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_releases" type="checkbox" {{if $isReleasesEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.releases_desc"}}</label>
-					</div>
-				</div>
-
-				{{$isPackagesEnabled := .Repository.UnitEnabled $.Context $.UnitTypePackages}}
-				<div class="inline field">
-					<label>{{.locale.Tr "repo.packages"}}</label>
-					{{if .UnitTypePackages.UnitGlobalDisabled}}
-					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-					{{else}}
-					<div class="ui checkbox">
-					{{end}}
-						<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.packages_desc"}}</label>
-					</div>
-				</div>
-
-				{{if .EnableActions}}
-					{{$isActionsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeActions}}
-					<div class="inline field">
-						<label>{{.locale.Tr "actions.actions"}}</label>
-						{{if .UnitTypeActions.UnitGlobalDisabled}}
+						{{$isProjectsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeProjects}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.project_board"}}</label>
+							{{if .UnitTypeProjects.UnitGlobalDisabled}}
 							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
+							{{else}}
 							<div class="ui checkbox">
-						{{end}}
-							<input class="enable-system" name="enable_actions" type="checkbox" {{if $isActionsEnabled}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.actions_desc"}}</label>
+							{{end}}
+								<input class="enable-system" name="enable_projects" type="checkbox" {{if $isProjectsEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.projects_desc"}}</label>
+							</div>
 						</div>
-					</div>
-				{{end}}
 
-				{{if not .IsMirror}}
-					<div class="ui divider"></div>
-					{{$pullRequestEnabled := .Repository.UnitEnabled $.Context $.UnitTypePullRequests}}
-					{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
-					<div class="inline field">
-						<label>{{.locale.Tr "repo.pulls"}}</label>
-						{{if .UnitTypePullRequests.UnitGlobalDisabled}}
-						<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-						{{else}}
-						<div class="ui checkbox">
-						{{end}}
-							<input class="enable-system" name="enable_pulls" type="checkbox" data-target="#pull_box" {{if $pullRequestEnabled}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.pulls_desc"}}</label>
-						</div>
-					</div>
-					<div class="field{{if not $pullRequestEnabled}} disabled{{end}}" id="pull_box">
-						<div class="field">
-							<p>
-								{{.locale.Tr "repo.settings.merge_style_desc"}}
-							</p>
-						</div>
-						<div class="field">
+						{{$isReleasesEnabled := .Repository.UnitEnabled $.Context $.UnitTypeReleases}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.releases"}}</label>
+							{{if .UnitTypeReleases.UnitGlobalDisabled}}
+							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+							{{else}}
 							<div class="ui checkbox">
-								<input name="pulls_allow_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowMerge)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.pulls.merge_pull_request"}}</label>
+							{{end}}
+								<input class="enable-system" name="enable_releases" type="checkbox" {{if $isReleasesEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.releases_desc"}}</label>
 							</div>
 						</div>
-						<div class="field">
+
+						{{$isPackagesEnabled := .Repository.UnitEnabled $.Context $.UnitTypePackages}}
+						<div class="inline field">
+							<label>{{.locale.Tr "repo.packages"}}</label>
+							{{if .UnitTypePackages.UnitGlobalDisabled}}
+							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+							{{else}}
 							<div class="ui checkbox">
-								<input name="pulls_allow_rebase" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebase)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</label>
+							{{end}}
+								<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.packages_desc"}}</label>
 							</div>
 						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</label>
+
+						{{if .EnableActions}}
+							{{$isActionsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeActions}}
+							<div class="inline field">
+								<label>{{.locale.Tr "actions.actions"}}</label>
+								{{if .UnitTypeActions.UnitGlobalDisabled}}
+									<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
+									<div class="ui checkbox">
+								{{end}}
+									<input class="enable-system" name="enable_actions" type="checkbox" {{if $isActionsEnabled}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.actions_desc"}}</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</label>
+						{{end}}
+
+						{{if not .IsMirror}}
+							<div class="ui divider"></div>
+							{{$pullRequestEnabled := .Repository.UnitEnabled $.Context $.UnitTypePullRequests}}
+							{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
+							<div class="inline field">
+								<label>{{.locale.Tr "repo.pulls"}}</label>
+								{{if .UnitTypePullRequests.UnitGlobalDisabled}}
+								<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+								{{else}}
+								<div class="ui checkbox">
+								{{end}}
+									<input class="enable-system" name="enable_pulls" type="checkbox" data-target="#pull_box" {{if $pullRequestEnabled}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.pulls_desc"}}</label>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="pulls_allow_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowManualMerge)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.pulls.merge_manually"}}</label>
+							<div class="field{{if not $pullRequestEnabled}} disabled{{end}}" id="pull_box">
+								<div class="field">
+									<p>
+										{{.locale.Tr "repo.settings.merge_style_desc"}}
+									</p>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowMerge)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.pulls.merge_pull_request"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_rebase" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebase)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowManualMerge)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.pulls.merge_manually"}}</label>
+									</div>
+								</div>
+
+								<div class="field">
+									<p>
+										{{.locale.Tr "repo.settings.default_merge_style_desc"}}
+									</p>
+									<div class="ui dropdown selection" tabindex="0">
+										<select name="pulls_default_merge_style">
+											<option value="merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.merge_pull_request"}}</option>
+											<option value="rebase" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</option>
+											<option value="rebase-merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</option>
+											<option value="squash" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}selected{{end}}>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</option>
+										</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+										<div class="default text">
+											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}
+												{{.locale.Tr "repo.pulls.merge_pull_request"}}
+											{{end}}
+											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}
+												{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}
+											{{end}}
+											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}
+												{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
+											{{end}}
+											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}
+												{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}
+											{{end}}
+										</div>
+										<div class="menu">
+											<div class="item" data-value="merge">{{.locale.Tr "repo.pulls.merge_pull_request"}}</div>
+											<div class="item" data-value="rebase">{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
+											<div class="item" data-value="rebase-merge">{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
+											<div class="item" data-value="squash">{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</div>
+										</div>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="default_allow_maintainer_edit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultAllowMaintainerEdit)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.settings.pulls.default_allow_edits_from_maintainers"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_allow_rebase_update" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseUpdate)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.settings.pulls.allow_rebase_update"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="enable_autodetect_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AutodetectManualMerge)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.settings.pulls.enable_autodetect_manual_merge"}}</label>
+									</div>
+								</div>
+								<div class="field">
+									<div class="ui checkbox">
+										<input name="pulls_ignore_whitespace" type="checkbox" {{if and $pullRequestEnabled ($prUnit.PullRequestsConfig.IgnoreWhitespaceConflicts)}}checked{{end}}>
+										<label>{{.locale.Tr "repo.settings.pulls.ignore_whitespace"}}</label>
+									</div>
+								</div>
 							</div>
+						{{end}}
+
+						<div class="ui divider"></div>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
 						</div>
+					</form>
+				</div>
 
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.signing_settings"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" method="post">
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="action" value="signing">
 						<div class="field">
-							<p>
-								{{.locale.Tr "repo.settings.default_merge_style_desc"}}
-							</p>
-							<div class="ui dropdown selection" tabindex="0">
-								<select name="pulls_default_merge_style">
-									<option value="merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.merge_pull_request"}}</option>
-									<option value="rebase" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</option>
-									<option value="rebase-merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</option>
-									<option value="squash" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}selected{{end}}>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</option>
-								</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="default text">
-									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}
-										{{.locale.Tr "repo.pulls.merge_pull_request"}}
-									{{end}}
-									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}
-										{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}
-									{{end}}
-									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}
-										{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
-									{{end}}
-									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}
-										{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}
-									{{end}}
+							<label>{{.locale.Tr "repo.settings.trust_model"}}</label><br>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input type="radio" id="trust_model_default" name="trust_model" {{if eq .Repository.TrustModel.String "default"}}checked="checked"{{end}} value="default">
+									<label for="trust_model_default">{{.locale.Tr "repo.settings.trust_model.default"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.trust_model.default.desc"}}</p>
 								</div>
-								<div class="menu">
-									<div class="item" data-value="merge">{{.locale.Tr "repo.pulls.merge_pull_request"}}</div>
-									<div class="item" data-value="rebase">{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
-									<div class="item" data-value="rebase-merge">{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
-									<div class="item" data-value="squash">{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</div>
+							</div>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input type="radio" id="trust_model_collaborator" name="trust_model" {{if eq .Repository.TrustModel.String "collaborator"}}checked="checked"{{end}} value="collaborator">
+									<label for="trust_model_collaborator">{{.locale.Tr "repo.settings.trust_model.collaborator.long"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.trust_model.collaborator.desc"}}</p>
 								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="default_allow_maintainer_edit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultAllowMaintainerEdit)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.pulls.default_allow_edits_from_maintainers"}}</label>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input type="radio" name="trust_model" id="trust_model_committer" {{if eq .Repository.TrustModel.String "committer"}}checked="checked"{{end}} value="committer">
+									<label for="trust_model_committer">{{.locale.Tr "repo.settings.trust_model.committer.long"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.trust_model.committer.desc"}}</p>
+								</div>
 							</div>
-						</div>
-						<div class="field">
-							<div class="ui checkbox">
-								<input name="pulls_allow_rebase_update" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseUpdate)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.pulls.allow_rebase_update"}}</label>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input type="radio" name="trust_model" id="trust_model_collaboratorcommitter" {{if eq .Repository.TrustModel.String "collaboratorcommitter"}}checked="checked"{{end}} value="collaboratorcommitter">
+									<label for="trust_model_collaboratorcommitter">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.long"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.desc"}}</p>
+								</div>
 							</div>
 						</div>
+
+						<div class="ui divider"></div>
 						<div class="field">
-							<div class="ui checkbox">
-								<input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label>
-							</div>
+							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
 						</div>
+					</form>
+				</div>
+
+				{{if .IsAdmin}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.admin_settings"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" method="post">
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="action" value="admin">
 						<div class="field">
 							<div class="ui checkbox">
-								<input name="enable_autodetect_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AutodetectManualMerge)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.pulls.enable_autodetect_manual_merge"}}</label>
+								<input name="enable_health_check" type="checkbox" {{if .Repository.IsFsckEnabled}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.admin_enable_health_check"}}</label>
 							</div>
 						</div>
+
 						<div class="field">
-							<div class="ui checkbox">
-								<input name="pulls_ignore_whitespace" type="checkbox" {{if and $pullRequestEnabled ($prUnit.PullRequestsConfig.IgnoreWhitespaceConflicts)}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.pulls.ignore_whitespace"}}</label>
-							</div>
+							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
 						</div>
-					</div>
-				{{end}}
+					</form>
 
-				<div class="ui divider"></div>
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+					<div class="ui divider"></div>
+					<form class="ui form" method="post">
+						{{.CsrfTokenHtml}}
+						<input type="hidden" name="action" value="admin_index">
+						{{if .CodeIndexerEnabled}}
+							<h4 class="ui header">{{.locale.Tr "repo.settings.admin_code_indexer"}}</h4>
+							<div class="inline fields">
+								<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
+								<span class="field">
+									{{if .CodeIndexerStatus}}
+										<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
+											<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
+										</a>
+									{{else}}
+											<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
+									{{end}}
+								</span>
+								<div class="field">
+									<button class="ui green button" name="request_reindex_type" value="code">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
+								</div>
+							</div>
+						{{end}}
+						<h4 class="ui header">{{.locale.Tr "repo.settings.admin_stats_indexer"}}</h4>
+						<div class="inline fields">
+							<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
+							<span class="field">
+								{{if .StatsIndexerStatus}}
+									<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
+										<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
+									</a>
+								{{else}}
+									<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
+								{{end}}
+							</span>
+							<div class="field">
+								<button class="ui green button" name="request_reindex_type" value="stats">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
+							</div>
+						</div>
+					</form>
 				</div>
-			</form>
-		</div>
+				{{end}}
 
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.signing_settings"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" method="post">
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="signing">
-				<div class="field">
-					<label>{{.locale.Tr "repo.settings.trust_model"}}</label><br>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input type="radio" id="trust_model_default" name="trust_model" {{if eq .Repository.TrustModel.String "default"}}checked="checked"{{end}} value="default">
-							<label for="trust_model_default">{{.locale.Tr "repo.settings.trust_model.default"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.trust_model.default.desc"}}</p>
+				{{if .Permission.IsOwner}}
+				<h4 class="ui top attached error header">
+					{{.locale.Tr "repo.settings.danger_zone"}}
+				</h4>
+				<div class="ui attached error table danger segment">
+					{{if .Repository.IsMirror}}
+						<div class="item">
+							<div class="ui right">
+								<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
+							</div>
+							<div>
+								<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
+								<p>{{.locale.Tr "repo.settings.convert_desc"}}</p>
+							</div>
 						</div>
-					</div>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input type="radio" id="trust_model_collaborator" name="trust_model" {{if eq .Repository.TrustModel.String "collaborator"}}checked="checked"{{end}} value="collaborator">
-							<label for="trust_model_collaborator">{{.locale.Tr "repo.settings.trust_model.collaborator.long"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.trust_model.collaborator.desc"}}</p>
+						<div class="ui divider"></div>
+					{{end}}
+					{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
+						<div class="item">
+							<div class="ui right">
+								<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
+							</div>
+							<div>
+								<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
+								<p>{{.locale.Tr "repo.settings.convert_fork_desc"}}</p>
+							</div>
 						</div>
-					</div>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input type="radio" name="trust_model" id="trust_model_committer" {{if eq .Repository.TrustModel.String "committer"}}checked="checked"{{end}} value="committer">
-							<label for="trust_model_committer">{{.locale.Tr "repo.settings.trust_model.committer.long"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.trust_model.committer.desc"}}</p>
+						<div class="ui divider"></div>
+					{{end}}
+					<div class="item">
+						<div class="ui right">
+							{{if .RepoTransfer}}
+								<form class="ui form" action="{{.Link}}" method="post">
+									{{.CsrfTokenHtml}}
+									<input type="hidden" name="action" value="cancel_transfer">
+									<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
+								</form>
+							{{else}}
+								<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
+							{{end}}
 						</div>
-					</div>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input type="radio" name="trust_model" id="trust_model_collaboratorcommitter" {{if eq .Repository.TrustModel.String "collaboratorcommitter"}}checked="checked"{{end}} value="collaboratorcommitter">
-							<label for="trust_model_collaboratorcommitter">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.long"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.desc"}}</p>
+						<div>
+							<h5>{{.locale.Tr "repo.settings.transfer"}}</h5>
+							{{if .RepoTransfer}}
+								<p>{{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}</p>
+							{{else}}
+								<p>{{.locale.Tr "repo.settings.transfer_desc"}}</p>
+							{{end}}
 						</div>
 					</div>
-				</div>
-
-				<div class="ui divider"></div>
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-				</div>
-			</form>
-		</div>
-
-		{{if .IsAdmin}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "repo.settings.admin_settings"}}
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" method="post">
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="admin">
-				<div class="field">
-					<div class="ui checkbox">
-						<input name="enable_health_check" type="checkbox" {{if .Repository.IsFsckEnabled}}checked{{end}}>
-						<label>{{.locale.Tr "repo.settings.admin_enable_health_check"}}</label>
-					</div>
-				</div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-				</div>
-			</form>
+					{{if .Permission.CanRead $.UnitTypeWiki}}
+						<div class="ui divider"></div>
 
-			<div class="ui divider"></div>
-			<form class="ui form" method="post">
-				{{.CsrfTokenHtml}}
-				<input type="hidden" name="action" value="admin_index">
-				{{if .CodeIndexerEnabled}}
-					<h4 class="ui header">{{.locale.Tr "repo.settings.admin_code_indexer"}}</h4>
-					<div class="inline fields">
-						<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
-						<span class="field">
-							{{if .CodeIndexerStatus}}
-								<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
-									<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
-								</a>
-							{{else}}
-									<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
-							{{end}}
-						</span>
-						<div class="field">
-							<button class="ui green button" name="request_reindex_type" value="code">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
+						<div class="item">
+							<div class="ui right">
+								<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
+							</div>
+							<div>
+								<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
+								<p>{{.locale.Tr "repo.settings.wiki_delete_desc"}}</p>
+							</div>
 						</div>
-					</div>
-				{{end}}
-				<h4 class="ui header">{{.locale.Tr "repo.settings.admin_stats_indexer"}}</h4>
-				<div class="inline fields">
-					<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
-					<span class="field">
-						{{if .StatsIndexerStatus}}
-							<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
-								<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
-							</a>
-						{{else}}
-							<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
-						{{end}}
-					</span>
-					<div class="field">
-						<button class="ui green button" name="request_reindex_type" value="stats">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
-					</div>
-				</div>
-			</form>
-		</div>
-		{{end}}
-
-		{{if .Permission.IsOwner}}
-		<h4 class="ui top attached error header">
-			{{.locale.Tr "repo.settings.danger_zone"}}
-		</h4>
-		<div class="ui attached error table danger segment">
-			{{if .Repository.IsMirror}}
-				<div class="item">
-					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
-					</div>
-					<div>
-						<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
-						<p>{{.locale.Tr "repo.settings.convert_desc"}}</p>
-					</div>
-				</div>
-				<div class="ui divider"></div>
-			{{end}}
-			{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
-				<div class="item">
-					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
-					</div>
-					<div>
-						<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
-						<p>{{.locale.Tr "repo.settings.convert_fork_desc"}}</p>
-					</div>
-				</div>
-				<div class="ui divider"></div>
-			{{end}}
-			<div class="item">
-				<div class="ui right">
-					{{if .RepoTransfer}}
-						<form class="ui form" action="{{.Link}}" method="post">
-							{{.CsrfTokenHtml}}
-							<input type="hidden" name="action" value="cancel_transfer">
-							<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
-						</form>
-					{{else}}
-						<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
 					{{end}}
-				</div>
-				<div>
-					<h5>{{.locale.Tr "repo.settings.transfer"}}</h5>
-					{{if .RepoTransfer}}
-						<p>{{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}</p>
-					{{else}}
-						<p>{{.locale.Tr "repo.settings.transfer_desc"}}</p>
-					{{end}}
-				</div>
-			</div>
 
-			{{if .Permission.CanRead $.UnitTypeWiki}}
-				<div class="ui divider"></div>
+					<div class="ui divider"></div>
 
-				<div class="item">
-					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
-					</div>
-					<div>
-						<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
-						<p>{{.locale.Tr "repo.settings.wiki_delete_desc"}}</p>
+					<div class="item">
+						<div class="ui right">
+							<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+						</div>
+						<div>
+							<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
+							<p>{{.locale.Tr "repo.settings.delete_desc"}}</p>
+						</div>
 					</div>
-				</div>
-			{{end}}
 
-			<div class="ui divider"></div>
+					{{if not .Repository.IsMirror}}
+						<div class="ui divider"></div>
 
-			<div class="item">
-				<div class="ui right">
-					<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
-				</div>
-				<div>
-					<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
-					<p>{{.locale.Tr "repo.settings.delete_desc"}}</p>
+						<div class="item">
+							<div class="ui right">
+								<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
+									{{if .Repository.IsArchived}}
+										{{.locale.Tr "repo.settings.unarchive.button"}}
+									{{else}}
+										{{.locale.Tr "repo.settings.archive.button"}}
+									{{end}}
+								</button>
+							</div>
+							<div>
+								{{if .Repository.IsArchived}}
+									<h5>{{.locale.Tr "repo.settings.unarchive.header"}}</h5>
+									<p>{{.locale.Tr "repo.settings.unarchive.text"}}</p>
+								{{else}}
+									<h5>{{.locale.Tr "repo.settings.archive.header"}}</h5>
+									<p>{{.locale.Tr "repo.settings.archive.text"}}</p>
+								{{end}}
+							</div>
+						</div>
+					{{end}}
 				</div>
+				{{end}}
 			</div>
-
-			{{if not .Repository.IsMirror}}
-				<div class="ui divider"></div>
-
-				<div class="item">
-					<div class="ui right">
-						<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
-							{{if .Repository.IsArchived}}
-								{{.locale.Tr "repo.settings.unarchive.button"}}
-							{{else}}
-								{{.locale.Tr "repo.settings.archive.button"}}
-							{{end}}
-						</button>
-					</div>
-					<div>
-						{{if .Repository.IsArchived}}
-							<h5>{{.locale.Tr "repo.settings.unarchive.header"}}</h5>
-							<p>{{.locale.Tr "repo.settings.unarchive.text"}}</p>
-						{{else}}
-							<h5>{{.locale.Tr "repo.settings.archive.header"}}</h5>
-							<p>{{.locale.Tr "repo.settings.archive.text"}}</p>
-						{{end}}
-					</div>
-				</div>
-			{{end}}
 		</div>
-		{{end}}
 	</div>
 </div>
 
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index d63fed46bcc5..7657d4bddea3 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,264 +1,268 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings branches">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<form class="ui form" action="{{.Link}}" method="post">
-			<h4 class="ui top attached header">
-				{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
-			</h4>
-			<div class="ui attached segment branch-protection">
-				<div class="field">
-					<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_branch_name_pattern"}}</label>
-					<input name="rule_name" type="text" value="{{.Rule.RuleName}}">
-					<input name="rule_id" type="hidden" value="{{.Rule.ID}}">
-				</div>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<form class="ui form" action="{{.Link}}" method="post">
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
+					</h4>
+					<div class="ui attached segment branch-protection">
+						<div class="field">
+							<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_branch_name_pattern"}}</label>
+							<input name="rule_name" type="text" value="{{.Rule.RuleName}}">
+							<input name="rule_id" type="hidden" value="{{.Rule.ID}}">
+						</div>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				{{.CsrfTokenHtml}}
-				<div id="protection_box" class="fields">
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input name="enable_push" type="radio" value="none" class="disable-whitelist" data-target="#whitelist_box" {{if not .Rule.CanPush}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_disable_push"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_disable_push_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input name="enable_push" type="radio" value="all" class="disable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (not .Rule.EnableWhitelist)}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_enable_push"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_enable_push_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui radio checkbox">
-							<input name="enable_push" type="radio" value="whitelist" class="enable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (.Rule.EnableWhitelist)}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_whitelist_committers"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_whitelist_committers_desc"}}</p>
-						</div>
-					</div>
-					<div id="whitelist_box" class="fields {{if not .Rule.EnableWhitelist}}disabled{{end}}">
-						<div class="whitelist field">
-							<label>{{.locale.Tr "repo.settings.protect_whitelist_users"}}</label>
-							<div class="ui multiple search selection dropdown">
-								<input type="hidden" name="whitelist_users" value="{{.whitelist_users}}">
-								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-								<div class="menu">
-									{{range .Users}}
-										<div class="item" data-value="{{.ID}}">
-											{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+						{{.CsrfTokenHtml}}
+						<div id="protection_box" class="fields">
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input name="enable_push" type="radio" value="none" class="disable-whitelist" data-target="#whitelist_box" {{if not .Rule.CanPush}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_disable_push"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_disable_push_desc"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input name="enable_push" type="radio" value="all" class="disable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (not .Rule.EnableWhitelist)}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_enable_push"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_enable_push_desc"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input name="enable_push" type="radio" value="whitelist" class="enable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (.Rule.EnableWhitelist)}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_whitelist_committers"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_whitelist_committers_desc"}}</p>
+								</div>
+							</div>
+							<div id="whitelist_box" class="fields {{if not .Rule.EnableWhitelist}}disabled{{end}}">
+								<div class="whitelist field">
+									<label>{{.locale.Tr "repo.settings.protect_whitelist_users"}}</label>
+									<div class="ui multiple search selection dropdown">
+										<input type="hidden" name="whitelist_users" value="{{.whitelist_users}}">
+										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+										<div class="menu">
+											{{range .Users}}
+												<div class="item" data-value="{{.ID}}">
+													{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+												</div>
+											{{end}}
+										</div>
+									</div>
+								</div>
+								{{if .Owner.IsOrganization}}
+									<br>
+									<div class="whitelist field">
+										<label>{{.locale.Tr "repo.settings.protect_whitelist_teams"}}</label>
+										<div class="ui multiple search selection dropdown">
+											<input type="hidden" name="whitelist_teams" value="{{.whitelist_teams}}">
+											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+											<div class="menu">
+												{{range .Teams}}
+													<div class="item" data-value="{{.ID}}">
+														{{svg "octicon-people"}}
+														{{.Name}}
+													</div>
+												{{end}}
+											</div>
 										</div>
-									{{end}}
+									</div>
+								{{end}}
+								<br>
+								<div class="whitelist field">
+									<div class="ui checkbox">
+										<input type="checkbox" name="whitelist_deploy_keys" {{if .Rule.WhitelistDeployKeys}}checked{{end}}>
+										<label for="whitelist_deploy_keys">{{.locale.Tr "repo.settings.protect_whitelist_deploy_keys"}}</label>
+									</div>
 								</div>
 							</div>
-						</div>
-						{{if .Owner.IsOrganization}}
-							<br>
-							<div class="whitelist field">
-								<label>{{.locale.Tr "repo.settings.protect_whitelist_teams"}}</label>
-								<div class="ui multiple search selection dropdown">
-									<input type="hidden" name="whitelist_teams" value="{{.whitelist_teams}}">
-									<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-									<div class="menu">
+
+							<div class="ui divider"></div>
+
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-whitelist" name="enable_merge_whitelist" type="checkbox" data-target="#merge_whitelist_box" {{if .Rule.EnableMergeWhitelist}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_committers"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_merge_whitelist_committers_desc"}}</p>
+								</div>
+							</div>
+							<div id="merge_whitelist_box" class="fields {{if not .Rule.EnableMergeWhitelist}}disabled{{end}}">
+								<div class="whitelist field">
+									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_users"}}</label>
+									<div class="ui multiple search selection dropdown">
+										<input type="hidden" name="merge_whitelist_users" value="{{.merge_whitelist_users}}">
+										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+										<div class="menu">
+										{{range .Users}}
+											<div class="item" data-value="{{.ID}}">
+												{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+											</div>
+										{{end}}
+										</div>
+									</div>
+								</div>
+							{{if .Owner.IsOrganization}}
+								<br>
+								<div class="whitelist field">
+									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_teams"}}</label>
+									<div class="ui multiple search selection dropdown">
+										<input type="hidden" name="merge_whitelist_teams" value="{{.merge_whitelist_teams}}">
+										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+										<div class="menu">
 										{{range .Teams}}
 											<div class="item" data-value="{{.ID}}">
 												{{svg "octicon-people"}}
-												{{.Name}}
+											{{.Name}}
 											</div>
 										{{end}}
+										</div>
 									</div>
 								</div>
+							{{end}}
 							</div>
-						{{end}}
-						<br>
-						<div class="whitelist field">
-							<div class="ui checkbox">
-								<input type="checkbox" name="whitelist_deploy_keys" {{if .Rule.WhitelistDeployKeys}}checked{{end}}>
-								<label for="whitelist_deploy_keys">{{.locale.Tr "repo.settings.protect_whitelist_deploy_keys"}}</label>
+
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-statuscheck" name="enable_status_check" type="checkbox" data-target="#statuscheck_contexts_box" {{if eq (len .branch_status_check_contexts) 0}}disabled{{end}} {{if .Rule.EnableStatusCheck}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_check_status_contexts"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_check_status_contexts_desc"}}</p>
+								</div>
 							</div>
-						</div>
-					</div>
 
-					<div class="ui divider"></div>
+							<div id="statuscheck_contexts_box" class="fields {{if not .Rule.EnableStatusCheck}}disabled{{end}}">
+								<div class="field">
+									<table class="ui celled table six column">
+										<thead>
+											<tr><th>
+												{{.locale.Tr "repo.settings.protect_check_status_contexts_list"}}
+											</th>
+											</tr>
+										</thead>
+										<tbody>
+										{{range $.branch_status_check_contexts}}
+											<tr><td>
+												<span class="ui checkbox">
+													<input class="enable-whitelist" name="status_check_contexts" value="{{.}}" type="checkbox" {{if $.is_context_required}}{{if call $.is_context_required .}}checked{{end}}{{end}}>
+												</span>
+												{{.}}
+												{{if $.is_context_required}}{{if call $.is_context_required .}}<div class="ui label right">Required</div>{{end}}{{end}}
+											</td></tr>
+										{{end}}
+										</tbody>
+									</table>
+								</div>
+							</div>
 
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-whitelist" name="enable_merge_whitelist" type="checkbox" data-target="#merge_whitelist_box" {{if .Rule.EnableMergeWhitelist}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_committers"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_merge_whitelist_committers_desc"}}</p>
-						</div>
-					</div>
-					<div id="merge_whitelist_box" class="fields {{if not .Rule.EnableMergeWhitelist}}disabled{{end}}">
-						<div class="whitelist field">
-							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_users"}}</label>
-							<div class="ui multiple search selection dropdown">
-								<input type="hidden" name="merge_whitelist_users" value="{{.merge_whitelist_users}}">
-								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-								<div class="menu">
-								{{range .Users}}
-									<div class="item" data-value="{{.ID}}">
-										{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
-									</div>
-								{{end}}
+							<div class="field">
+								<label for="required-approvals">{{.locale.Tr "repo.settings.protect_required_approvals"}}</label>
+								<input name="required_approvals" id="required-approvals" type="number" value="{{.Rule.RequiredApprovals}}">
+								<p class="help">{{.locale.Tr "repo.settings.protect_required_approvals_desc"}}</p>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input class="enable-whitelist" name="enable_approvals_whitelist" type="checkbox" data-target="#approvals_whitelist_box" {{if .Rule.EnableApprovalsWhitelist}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled_desc"}}</p>
 								</div>
 							</div>
-						</div>
-					{{if .Owner.IsOrganization}}
-						<br>
-						<div class="whitelist field">
-							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_teams"}}</label>
-							<div class="ui multiple search selection dropdown">
-								<input type="hidden" name="merge_whitelist_teams" value="{{.merge_whitelist_teams}}">
-								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-								<div class="menu">
-								{{range .Teams}}
-									<div class="item" data-value="{{.ID}}">
-										{{svg "octicon-people"}}
-									{{.Name}}
+							<div id="approvals_whitelist_box" class="fields {{if not .Rule.EnableApprovalsWhitelist}}disabled{{end}}">
+								<div class="whitelist field">
+									<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_users"}}</label>
+									<div class="ui multiple search selection dropdown">
+										<input type="hidden" name="approvals_whitelist_users" value="{{.approvals_whitelist_users}}">
+										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+										<div class="menu">
+										{{range .Users}}
+											<div class="item" data-value="{{.ID}}">
+												{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+											</div>
+										{{end}}
+										</div>
 									</div>
-								{{end}}
 								</div>
-							</div>
-						</div>
-					{{end}}
-					</div>
-
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-statuscheck" name="enable_status_check" type="checkbox" data-target="#statuscheck_contexts_box" {{if eq (len .branch_status_check_contexts) 0}}disabled{{end}} {{if .Rule.EnableStatusCheck}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_check_status_contexts"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_check_status_contexts_desc"}}</p>
-						</div>
-					</div>
-
-					<div id="statuscheck_contexts_box" class="fields {{if not .Rule.EnableStatusCheck}}disabled{{end}}">
-						<div class="field">
-							<table class="ui celled table six column">
-								<thead>
-									<tr><th>
-										{{.locale.Tr "repo.settings.protect_check_status_contexts_list"}}
-									</th>
-									</tr>
-								</thead>
-								<tbody>
-								{{range $.branch_status_check_contexts}}
-									<tr><td>
-										<span class="ui checkbox">
-											<input class="enable-whitelist" name="status_check_contexts" value="{{.}}" type="checkbox" {{if $.is_context_required}}{{if call $.is_context_required .}}checked{{end}}{{end}}>
-										</span>
-										{{.}}
-										{{if $.is_context_required}}{{if call $.is_context_required .}}<div class="ui label right">Required</div>{{end}}{{end}}
-									</td></tr>
-								{{end}}
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div class="field">
-						<label for="required-approvals">{{.locale.Tr "repo.settings.protect_required_approvals"}}</label>
-						<input name="required_approvals" id="required-approvals" type="number" value="{{.Rule.RequiredApprovals}}">
-						<p class="help">{{.locale.Tr "repo.settings.protect_required_approvals_desc"}}</p>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input class="enable-whitelist" name="enable_approvals_whitelist" type="checkbox" data-target="#approvals_whitelist_box" {{if .Rule.EnableApprovalsWhitelist}}checked{{end}}>
-							<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled_desc"}}</p>
-						</div>
-					</div>
-					<div id="approvals_whitelist_box" class="fields {{if not .Rule.EnableApprovalsWhitelist}}disabled{{end}}">
-						<div class="whitelist field">
-							<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_users"}}</label>
-							<div class="ui multiple search selection dropdown">
-								<input type="hidden" name="approvals_whitelist_users" value="{{.approvals_whitelist_users}}">
-								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-								<div class="menu">
-								{{range .Users}}
-									<div class="item" data-value="{{.ID}}">
-										{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+								{{if .Owner.IsOrganization}}
+									<br>
+									<div class="whitelist field">
+										<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label>
+										<div class="ui multiple search selection dropdown">
+											<input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}">
+											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+											<div class="menu">
+											{{range .Teams}}
+												<div class="item" data-value="{{.ID}}">
+													{{svg "octicon-people"}}
+												{{.Name}}
+												</div>
+											{{end}}
+											</div>
+										</div>
 									</div>
 								{{end}}
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input name="block_on_rejected_reviews" type="checkbox" {{if .Rule.BlockOnRejectedReviews}}checked{{end}}>
+									<label for="block_on_rejected_reviews">{{.locale.Tr "repo.settings.block_rejected_reviews"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.block_rejected_reviews_desc"}}</p>
 								</div>
 							</div>
-						</div>
-						{{if .Owner.IsOrganization}}
-							<br>
-							<div class="whitelist field">
-								<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label>
-								<div class="ui multiple search selection dropdown">
-									<input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}">
-									<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-									<div class="menu">
-									{{range .Teams}}
-										<div class="item" data-value="{{.ID}}">
-											{{svg "octicon-people"}}
-										{{.Name}}
-										</div>
-									{{end}}
-									</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input name="block_on_official_review_requests" type="checkbox" {{if .Rule.BlockOnOfficialReviewRequests}}checked{{end}}>
+									<label for="block_on_official_review_requests">{{.locale.Tr "repo.settings.block_on_official_review_requests"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.block_on_official_review_requests_desc"}}</p>
 								</div>
 							</div>
-						{{end}}
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input name="block_on_rejected_reviews" type="checkbox" {{if .Rule.BlockOnRejectedReviews}}checked{{end}}>
-							<label for="block_on_rejected_reviews">{{.locale.Tr "repo.settings.block_rejected_reviews"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.block_rejected_reviews_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input name="block_on_official_review_requests" type="checkbox" {{if .Rule.BlockOnOfficialReviewRequests}}checked{{end}}>
-							<label for="block_on_official_review_requests">{{.locale.Tr "repo.settings.block_on_official_review_requests"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.block_on_official_review_requests_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input name="dismiss_stale_approvals" type="checkbox" {{if .Rule.DismissStaleApprovals}}checked{{end}}>
-							<label for="dismiss_stale_approvals">{{.locale.Tr "repo.settings.dismiss_stale_approvals"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.dismiss_stale_approvals_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input name="require_signed_commits" type="checkbox" {{if .Rule.RequireSignedCommits}}checked{{end}}>
-							<label for="require_signed_commits">{{.locale.Tr "repo.settings.require_signed_commits"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.require_signed_commits_desc"}}</p>
-						</div>
-					</div>
-					<div class="field">
-						<div class="ui checkbox">
-							<input name="block_on_outdated_branch" type="checkbox" {{if .Rule.BlockOnOutdatedBranch}}checked{{end}}>
-							<label for="block_on_outdated_branch">{{.locale.Tr "repo.settings.block_outdated_branch"}}</label>
-							<p class="help">{{.locale.Tr "repo.settings.block_outdated_branch_desc"}}</p>
+							<div class="field">
+								<div class="ui checkbox">
+									<input name="dismiss_stale_approvals" type="checkbox" {{if .Rule.DismissStaleApprovals}}checked{{end}}>
+									<label for="dismiss_stale_approvals">{{.locale.Tr "repo.settings.dismiss_stale_approvals"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.dismiss_stale_approvals_desc"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input name="require_signed_commits" type="checkbox" {{if .Rule.RequireSignedCommits}}checked{{end}}>
+									<label for="require_signed_commits">{{.locale.Tr "repo.settings.require_signed_commits"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.require_signed_commits_desc"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<div class="ui checkbox">
+									<input name="block_on_outdated_branch" type="checkbox" {{if .Rule.BlockOnOutdatedBranch}}checked{{end}}>
+									<label for="block_on_outdated_branch">{{.locale.Tr "repo.settings.block_outdated_branch"}}</label>
+									<p class="help">{{.locale.Tr "repo.settings.block_outdated_branch_desc"}}</p>
+								</div>
+							</div>
+							<div class="field">
+								<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_protected_file_patterns"}}</label>
+								<input name="protected_file_patterns" id="protected_file_patterns" type="text" value="{{.Rule.ProtectedFilePatterns}}">
+								<p class="help">{{.locale.Tr "repo.settings.protect_protected_file_patterns_desc" | Safe}}</p>
+							</div>
+							<div class="field">
+								<label for="unprotected_file_patterns">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns"}}</label>
+								<input name="unprotected_file_patterns" id="unprotected_file_patterns" type="text" value="{{.Rule.UnprotectedFilePatterns}}">
+								<p class="help">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns_desc" | Safe}}</p>
+							</div>
 						</div>
-					</div>
-					<div class="field">
-						<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_protected_file_patterns"}}</label>
-						<input name="protected_file_patterns" id="protected_file_patterns" type="text" value="{{.Rule.ProtectedFilePatterns}}">
-						<p class="help">{{.locale.Tr "repo.settings.protect_protected_file_patterns_desc" | Safe}}</p>
-					</div>
-					<div class="field">
-						<label for="unprotected_file_patterns">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns"}}</label>
-						<input name="unprotected_file_patterns" id="unprotected_file_patterns" type="text" value="{{.Rule.UnprotectedFilePatterns}}">
-						<p class="help">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns_desc" | Safe}}</p>
-					</div>
-				</div>
 
-				<div class="ui divider"></div>
+						<div class="ui divider"></div>
 
-				<div class="field">
-					<button class="ui green button">{{$.locale.Tr "repo.settings.protected_branch.save_rule"}}</button>
-					<button class="ui gray button">{{$.locale.Tr "cancel"}}</button>
-				</div>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "repo.settings.protected_branch.save_rule"}}</button>
+							<button class="ui gray button">{{$.locale.Tr "cancel"}}</button>
+						</div>
+					</div>
+				</form>
 			</div>
-		</form>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 10d410f096fc..38a103f3d92d 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
 <div class="page-content repository settings runners">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "shared/actions/runner_edit" .}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "shared/actions/runner_edit" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index d3a0b64fc5ee..d649eb6082d7 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
 <div class="page-content repository settings runners">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "shared/actions/runner_list" .}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "shared/actions/runner_list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index 71c5c5115795..b439d117aefc 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,10 +1,14 @@
 {{template "base/head" .}}
 <div class="page-content repository settings">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{template "shared/secrets/add_list" .}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{template "shared/secrets/add_list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 6387a20de6e6..f2791561902e 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,131 +1,135 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		{{if .Repository.IsArchived}}
-			<div class="ui warning message">
-				{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
-			</div>
-		{{else}}
-			<h4 class="ui top attached header">
-				{{.locale.Tr "repo.settings.tags.protection"}}
-			</h4>
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				{{if .Repository.IsArchived}}
+					<div class="ui warning message">
+						{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
+					</div>
+				{{else}}
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.settings.tags.protection"}}
+					</h4>
 
-			<div class="ui attached segment">
-				<div class="ui grid">
-					<div class="eight wide column">
-						<div class="ui segment">
-							<form class="ui form" action="{{.Link}}" method="post">
-								{{.CsrfTokenHtml}}
-								<div class="field">
-									<label>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</label>
-									<div id="search-tag-box" class="ui search">
-										<div class="ui input">
-											<input class="prompt" name="name_pattern" autocomplete="off" value="{{.name_pattern}}" placeholder="v*" autofocus required>
+					<div class="ui attached segment">
+						<div class="ui grid">
+							<div class="eight wide column">
+								<div class="ui segment">
+									<form class="ui form" action="{{.Link}}" method="post">
+										{{.CsrfTokenHtml}}
+										<div class="field">
+											<label>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</label>
+											<div id="search-tag-box" class="ui search">
+												<div class="ui input">
+													<input class="prompt" name="name_pattern" autocomplete="off" value="{{.name_pattern}}" placeholder="v*" autofocus required>
+												</div>
+												<div class="help">{{.locale.Tr "repo.settings.tags.protection.pattern.description" | Safe}}</div>
+											</div>
 										</div>
-										<div class="help">{{.locale.Tr "repo.settings.tags.protection.pattern.description" | Safe}}</div>
-									</div>
-								</div>
-								<div class="whitelist field">
-									<label>{{.locale.Tr "repo.settings.tags.protection.allowed.users"}}</label>
-									<div class="ui multiple search selection dropdown">
-										<input type="hidden" name="allowlist_users" value="{{.allowlist_users}}">
-										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-										<div class="menu">
-											{{range .Users}}
-												<div class="item" data-value="{{.ID}}">
-													{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+										<div class="whitelist field">
+											<label>{{.locale.Tr "repo.settings.tags.protection.allowed.users"}}</label>
+											<div class="ui multiple search selection dropdown">
+												<input type="hidden" name="allowlist_users" value="{{.allowlist_users}}">
+												<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+												<div class="menu">
+													{{range .Users}}
+														<div class="item" data-value="{{.ID}}">
+															{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+														</div>
+													{{end}}
 												</div>
-											{{end}}
+											</div>
 										</div>
-									</div>
-								</div>
-								{{if .Owner.IsOrganization}}
-									<div class="whitelist field">
-										<label>{{.locale.Tr "repo.settings.tags.protection.allowed.teams"}}</label>
-										<div class="ui multiple search selection dropdown">
-											<input type="hidden" name="allowlist_teams" value="{{.allowlist_teams}}">
-											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-											<div class="menu">
-												{{range .Teams}}
-													<div class="item" data-value="{{.ID}}">
-														{{svg "octicon-people"}}
-														{{.Name}}
+										{{if .Owner.IsOrganization}}
+											<div class="whitelist field">
+												<label>{{.locale.Tr "repo.settings.tags.protection.allowed.teams"}}</label>
+												<div class="ui multiple search selection dropdown">
+													<input type="hidden" name="allowlist_teams" value="{{.allowlist_teams}}">
+													<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+													<div class="menu">
+														{{range .Teams}}
+															<div class="item" data-value="{{.ID}}">
+																{{svg "octicon-people"}}
+																{{.Name}}
+															</div>
+														{{end}}
 													</div>
-												{{end}}
+												</div>
 											</div>
+										{{end}}
+										<div class="field">
+											{{if .PageIsEditProtectedTag}}
+											<button class="ui green button">
+												{{$.locale.Tr "save"}}
+											</button>
+											<a class="ui primary button" href="{{$.RepoLink}}/settings/tags">
+												{{$.locale.Tr "cancel"}}
+											</a>
+											{{else}}
+											<button class="ui green button">
+												{{$.locale.Tr "repo.settings.tags.protection.create"}}
+											</button>
+											{{end}}
 										</div>
-									</div>
-								{{end}}
-								<div class="field">
-									{{if .PageIsEditProtectedTag}}
-									<button class="ui green button">
-										{{$.locale.Tr "save"}}
-									</button>
-									<a class="ui primary button" href="{{$.RepoLink}}/settings/tags">
-										{{$.locale.Tr "cancel"}}
-									</a>
-									{{else}}
-									<button class="ui green button">
-										{{$.locale.Tr "repo.settings.tags.protection.create"}}
-									</button>
-									{{end}}
+									</form>
 								</div>
-							</form>
-						</div>
-					</div>
+							</div>
 
-					<div class="sixteen wide column">
-						<table class="ui single line table">
-							<thead>
-								<th>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</th>
-								<th>{{.locale.Tr "repo.settings.tags.protection.allowed"}}</th>
-								<th></th>
-							</thead>
-							<tbody>
-								{{range .ProtectedTags}}
-									<tr>
-										<td><pre>{{.NamePattern}}</pre></td>
-										<td>
-											{{if or .AllowlistUserIDs (and $.Owner.IsOrganization .AllowlistTeamIDs)}}
-												{{$userIDs := .AllowlistUserIDs}}
-												{{range $.Users}}
-													{{if SliceUtils.Contains $userIDs .ID}}
-														<a class="ui basic label" href="{{.HomeLink}}">{{avatar $.Context . 26}} {{.GetDisplayName}}</a>
-													{{end}}
-												{{end}}
-												{{if $.Owner.IsOrganization}}
-													{{$teamIDs := .AllowlistTeamIDs}}
-													{{range $.Teams}}
-														{{if SliceUtils.Contains $teamIDs .ID}}
-															<a class="ui basic label" href="{{$.Owner.OrganisationLink}}/teams/{{PathEscape .LowerName}}">{{.Name}}</a>
+							<div class="sixteen wide column">
+								<table class="ui single line table">
+									<thead>
+										<th>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</th>
+										<th>{{.locale.Tr "repo.settings.tags.protection.allowed"}}</th>
+										<th></th>
+									</thead>
+									<tbody>
+										{{range .ProtectedTags}}
+											<tr>
+												<td><pre>{{.NamePattern}}</pre></td>
+												<td>
+													{{if or .AllowlistUserIDs (and $.Owner.IsOrganization .AllowlistTeamIDs)}}
+														{{$userIDs := .AllowlistUserIDs}}
+														{{range $.Users}}
+															{{if contain $userIDs .ID}}
+																<a class="ui basic label" href="{{.HomeLink}}">{{avatar $.Context . 26}} {{.GetDisplayName}}</a>
+															{{end}}
+														{{end}}
+														{{if $.Owner.IsOrganization}}
+															{{$teamIDs := .AllowlistTeamIDs}}
+															{{range $.Teams}}
+																{{if contain $teamIDs .ID}}
+																	<a class="ui basic label" href="{{$.Owner.OrganisationLink}}/teams/{{PathEscape .LowerName}}">{{.Name}}</a>
+																{{end}}
+															{{end}}
 														{{end}}
+													{{else}}
+														{{$.locale.Tr "repo.settings.tags.protection.allowed.noone"}}
 													{{end}}
-												{{end}}
-											{{else}}
-												{{$.locale.Tr "repo.settings.tags.protection.allowed.noone"}}
-											{{end}}
-										</td>
-										<td class="right aligned">
-											<a class="ui tiny primary button" href="{{$.RepoLink}}/settings/tags/{{.ID}}">{{$.locale.Tr "edit"}}</a>
-											<form class="gt-dib" action="{{$.RepoLink}}/settings/tags/delete" method="post">
-												{{$.CsrfTokenHtml}}
-												<input type="hidden" name="id" value="{{.ID}}">
-												<button class="ui tiny red button">{{$.locale.Tr "remove"}}</button>
-											</form>
-										</td>
-									</tr>
-								{{else}}
-									<tr class="center aligned"><td colspan="3">{{.locale.Tr "repo.settings.tags.protection.none"}}</td></tr>
-								{{end}}
-							</tbody>
-						</table>
+												</td>
+												<td class="right aligned">
+													<a class="ui tiny primary button" href="{{$.RepoLink}}/settings/tags/{{.ID}}">{{$.locale.Tr "edit"}}</a>
+													<form class="gt-dib" action="{{$.RepoLink}}/settings/tags/delete" method="post">
+														{{$.CsrfTokenHtml}}
+														<input type="hidden" name="id" value="{{.ID}}">
+														<button class="ui tiny red button">{{$.locale.Tr "remove"}}</button>
+													</form>
+												</td>
+											</tr>
+										{{else}}
+											<tr class="center aligned"><td colspan="3">{{.locale.Tr "repo.settings.tags.protection.none"}}</td></tr>
+										{{end}}
+									</tbody>
+								</table>
+							</div>
+						</div>
 					</div>
-				</div>
+				{{end}}
 			</div>
-		{{end}}
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index 442434007ddb..b4f6873896b4 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,9 +1,13 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings webhooks">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "repo/settings/webhook/list" .}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "repo/settings/webhook/list" .}}
+			</div>
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 5102390db9b7..dfa315bcad2b 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,52 +1,56 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings new webhook">
 	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-			<div class="ui right">
-				{{if eq .HookType "gitea"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-				{{else if eq .HookType "gogs"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-				{{else if eq .HookType "slack"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-				{{else if eq .HookType "discord"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-				{{else if eq .HookType "dingtalk"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-				{{else if eq .HookType "telegram"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-				{{else if eq .HookType "msteams"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-				{{else if eq .HookType "feishu"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-				{{else if eq .HookType "matrix"}}
-					{{svg "gitea-matrix" 26}}
-				{{else if eq .HookType "wechatwork"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-				{{else if eq .HookType "packagist"}}
-					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-				{{end}}
+		<div class="ui grid">
+			{{template "repo/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
+					<div class="ui right">
+						{{if eq .HookType "gitea"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+						{{else if eq .HookType "gogs"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+						{{else if eq .HookType "slack"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+						{{else if eq .HookType "discord"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+						{{else if eq .HookType "dingtalk"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+						{{else if eq .HookType "telegram"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+						{{else if eq .HookType "msteams"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+						{{else if eq .HookType "feishu"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+						{{else if eq .HookType "matrix"}}
+							{{svg "gitea-matrix" 26}}
+						{{else if eq .HookType "wechatwork"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+						{{else if eq .HookType "packagist"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+						{{end}}
+					</div>
+				</h4>
+				<div class="ui attached segment">
+					{{template "repo/settings/webhook/gitea" .}}
+					{{template "repo/settings/webhook/gogs" .}}
+					{{template "repo/settings/webhook/slack" .}}
+					{{template "repo/settings/webhook/discord" .}}
+					{{template "repo/settings/webhook/dingtalk" .}}
+					{{template "repo/settings/webhook/telegram" .}}
+					{{template "repo/settings/webhook/msteams" .}}
+					{{template "repo/settings/webhook/feishu" .}}
+					{{template "repo/settings/webhook/matrix" .}}
+					{{template "repo/settings/webhook/wechatwork" .}}
+					{{template "repo/settings/webhook/packagist" .}}
+				</div>
+
+				{{template "repo/settings/webhook/history" .}}
 			</div>
-		</h4>
-		<div class="ui attached segment">
-			{{template "repo/settings/webhook/gitea" .}}
-			{{template "repo/settings/webhook/gogs" .}}
-			{{template "repo/settings/webhook/slack" .}}
-			{{template "repo/settings/webhook/discord" .}}
-			{{template "repo/settings/webhook/dingtalk" .}}
-			{{template "repo/settings/webhook/telegram" .}}
-			{{template "repo/settings/webhook/msteams" .}}
-			{{template "repo/settings/webhook/feishu" .}}
-			{{template "repo/settings/webhook/matrix" .}}
-			{{template "repo/settings/webhook/wechatwork" .}}
-			{{template "repo/settings/webhook/packagist" .}}
 		</div>
-
-		{{template "repo/settings/webhook/history" .}}
 	</div>
 </div>
 {{template "base/footer" .}}

From 8baa0a846d4e7c1698569d66c9ba308c32a3db86 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Apr 2023 10:02:25 +0800
Subject: [PATCH 04/21] resolve conflicts

---
 templates/user/settings/repos.tmpl | 219 +++++++++++++++--------------
 1 file changed, 112 insertions(+), 107 deletions(-)

diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 38b1eb09bf7d..b1fea3d18d3e 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,129 +1,134 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
 	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.repos"}}
-		</h4>
-		<div class="ui attached segment">
-			{{if or .allowAdopt .allowDelete}}
-				{{if .Dirs}}
-					<div class="ui middle aligned divided list">
-						{{range $dirI, $dir := .Dirs}}
-							{{$repo := index $.ReposMap $dir}}
-							<div class="item">
-								<div class="content">
-									{{if $repo}}
-										{{if $repo.IsPrivate}}
-											<span class="text gold icon">{{svg "octicon-lock"}}</span>
-										{{else if $repo.IsFork}}
-											<span class="icon">{{svg "octicon-repo-forked"}}</span>
-										{{else if $repo.IsMirror}}
-											<span class="icon">{{svg "octicon-mirror"}}</span>
-										{{else if $repo.IsTemplate}}
-											<span class="icon">{{svg "octicon-repo-template"}}</span>
-										{{else}}
-											<span class="icon">{{svg "octicon-repo"}}</span>
-										{{end}}
-										<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
-										<span>{{FileSize $repo.Size}}</span>
-										{{if $repo.IsFork}}
-											{{$.locale.Tr "repo.forked_from"}}
-											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
-										{{end}}
-									{{else}}
-										<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
-										<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
-										<div class="right floated content">
-											{{if $.allowAdopt}}
-												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
-													<div class="header">
-														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
-													</div>
-													<div class="content">
-														<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
-													</div>
-													<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
-														{{$.CsrfTokenHtml}}
-														<input type="hidden" name="id" value="{{$dir}}">
-														<input type="hidden" name="action" value="adopt">
-														<div class="actions">
-															<button class="ui red basic inverted cancel button">
-																{{svg "octicon-x"}}
-																{{$.locale.Tr "modal.no"}}
-															</button>
-															<button class="ui green basic inverted ok button">
-																{{svg "octicon-check"}}
-																{{$.locale.Tr "modal.yes"}}
-															</button>
-														</div>
-													{{end}}
-													{{if $.allowDelete}}
-														<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-														<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+		<div class="ui grid">
+			{{template "user/settings/navbar" .}}
+			<div class="twelve wide column content">
+				{{template "base/alert" .}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "settings.repos"}}
+				</h4>
+				<div class="ui attached segment">
+					{{if or .allowAdopt .allowDelete}}
+						{{if .Dirs}}
+							<div class="ui middle aligned divided list">
+								{{range $dirI, $dir := .Dirs}}
+									{{$repo := index $.ReposMap $dir}}
+									<div class="item">
+										<div class="content">
+											{{if $repo}}
+												{{if $repo.IsPrivate}}
+													<span class="text gold icon">{{svg "octicon-lock"}}</span>
+												{{else if $repo.IsFork}}
+													<span class="icon">{{svg "octicon-repo-forked"}}</span>
+												{{else if $repo.IsMirror}}
+													<span class="icon">{{svg "octicon-mirror"}}</span>
+												{{else if $repo.IsTemplate}}
+													<span class="icon">{{svg "octicon-repo-template"}}</span>
+												{{else}}
+													<span class="icon">{{svg "octicon-repo"}}</span>
+												{{end}}
+												<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
+												<span>{{FileSize $repo.Size}}</span>
+												{{if $repo.IsFork}}
+													{{$.locale.Tr "repo.forked_from"}}
+													<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
+												{{end}}
+											{{else}}
+												<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
+												<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
+												<div class="right floated content">
+													{{if $.allowAdopt}}
+														<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
+														<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
 															{{svg "octicon-x" 16 "close inside"}}
 															<div class="header">
-																<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+																<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
 															</div>
 															<div class="content">
-																<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
+																<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
 															</div>
 															<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
 																{{$.CsrfTokenHtml}}
 																<input type="hidden" name="id" value="{{$dir}}">
-																<input type="hidden" name="action" value="delete">
-																{{template "base/delete_modal_actions" $}}
-															</form>
+																<input type="hidden" name="action" value="adopt">
+																<div class="actions">
+																	<button class="ui red basic inverted cancel button">
+																		{{svg "octicon-x"}}
+																		{{$.locale.Tr "modal.no"}}
+																	</button>
+																	<button class="ui green basic inverted ok button">
+																		{{svg "octicon-check"}}
+																		{{$.locale.Tr "modal.yes"}}
+																	</button>
+																</div>
+															{{end}}
+															{{if $.allowDelete}}
+																<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+																<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+																	{{svg "octicon-x" 16 "close inside"}}
+																	<div class="header">
+																		<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+																	</div>
+																	<div class="content">
+																		<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
+																	</div>
+																	<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
+																		{{$.CsrfTokenHtml}}
+																		<input type="hidden" name="id" value="{{$dir}}">
+																		<input type="hidden" name="action" value="delete">
+																		{{template "base/delete_modal_actions" $}}
+																	</form>
+																</div>
+															{{end}}
 														</div>
 													{{end}}
 												</div>
-											{{end}}
-										</div>
+											</div>
+										{{end}}
+									</div>
+									{{template "base/paginate" .}}
+								{{else}}
+									<div class="item">
+										{{.locale.Tr "settings.repos_none"}}
 									</div>
 								{{end}}
-							</div>
-							{{template "base/paginate" .}}
-						{{else}}
-							<div class="item">
-								{{.locale.Tr "settings.repos_none"}}
-							</div>
-						{{end}}
-					{{else}}
-						{{if .Repos}}
-							<div class="ui middle aligned divided list">
-								{{range .Repos}}
+							{{else}}
+								{{if .Repos}}
+									<div class="ui middle aligned divided list">
+										{{range .Repos}}
+											<div class="item">
+												<div class="content">
+													{{if .IsPrivate}}
+														{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
+													{{else if .IsFork}}
+														{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
+													{{else if .IsMirror}}
+														{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
+													{{else if .IsTemplate}}
+														{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
+													{{else}}
+														{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
+													{{end}}
+													<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
+													<span>{{FileSize .Size}}</span>
+													{{if .IsFork}}
+														{{$.locale.Tr "repo.forked_from"}}
+														<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
+													{{end}}
+												</div>
+											</div>
+										{{end}}
+									</div>
+									{{template "base/paginate" .}}
+								{{else}}
 									<div class="item">
-										<div class="content">
-											{{if .IsPrivate}}
-												{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
-											{{else if .IsFork}}
-												{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
-											{{else if .IsMirror}}
-												{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
-											{{else if .IsTemplate}}
-												{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
-											{{else}}
-												{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
-											{{end}}
-											<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
-											<span>{{FileSize .Size}}</span>
-											{{if .IsFork}}
-												{{$.locale.Tr "repo.forked_from"}}
-												<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
-											{{end}}
-										</div>
+										{{.locale.Tr "settings.repos_none"}}
 									</div>
 								{{end}}
-							</div>
-							{{template "base/paginate" .}}
-						{{else}}
-							<div class="item">
-								{{.locale.Tr "settings.repos_none"}}
-							</div>
-						{{end}}
-					{{end}}
+							{{end}}
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>

From 8be8ed5707fd0236f395673b5753c33a15935c13 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 09:12:48 +0800
Subject: [PATCH 05/21] try one

---
 templates/admin/dashboard.tmpl     | 293 ++++++++++++++---------------
 templates/admin/layout_footer.tmpl |   8 +
 templates/admin/layout_head.tmpl   |  11 ++
 templates/admin/navbar.tmpl        |   2 +-
 templates/repo/settings/tags.tmpl  | 228 +++++++++++-----------
 web_src/css/admin.css              |   4 +
 6 files changed, 279 insertions(+), 267 deletions(-)
 create mode 100644 templates/admin/layout_footer.tmpl
 create mode 100644 templates/admin/layout_head.tmpl

diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 60cfd17f7406..375836cb6056 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,153 +1,146 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{if .NeedUpdate}}
-					<div class="ui negative message flash-error">
-						<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
-					</div>
-				{{end}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.dashboard.statistic"}}
-				</h4>
-				<div class="ui attached segment">
-					<p>
-						{{.locale.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}}
-					</p>
-				</div>
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.dashboard.operations"}}
-				</h4>
-				<form method="post" action="{{AppSubUrl}}/admin">
-					{{.CsrfTokenHtml}}
-					<div class="ui attached table segment">
-						<table class="ui very basic table">
-							<tbody>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.delete_repo_archives"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.delete_missing_repos"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.git_gc_repos"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
-									<tr>
-										<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
-										{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
-										<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-									</tr>
-									<tr>
-										<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
-										{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
-										<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-									</tr>
-								{{end}}
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.sync_external_users"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.repo_health_check"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-								<tr>
-									<td>{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td>
-									<td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</form>
-
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.dashboard.system_status"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
-						<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
-						<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
-						<dd>{{.SysStatus.NumGoroutine}}</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.dashboard.current_memory_usage"}}</dt>
-						<dd>{{.SysStatus.MemAllocated}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.total_memory_allocated"}}</dt>
-						<dd>{{.SysStatus.MemTotal}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.memory_obtained"}}</dt>
-						<dd>{{.SysStatus.MemSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.pointer_lookup_times"}}</dt>
-						<dd>{{.SysStatus.Lookups}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.memory_allocate_times"}}</dt>
-						<dd>{{.SysStatus.MemMallocs}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.memory_free_times"}}</dt>
-						<dd>{{.SysStatus.MemFrees}}</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.dashboard.current_heap_usage"}}</dt>
-						<dd>{{.SysStatus.HeapAlloc}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
-						<dd>{{.SysStatus.HeapSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.heap_memory_idle"}}</dt>
-						<dd>{{.SysStatus.HeapIdle}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.heap_memory_in_use"}}</dt>
-						<dd>{{.SysStatus.HeapInuse}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.heap_memory_released"}}</dt>
-						<dd>{{.SysStatus.HeapReleased}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.heap_objects"}}</dt>
-						<dd>{{.SysStatus.HeapObjects}}</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
-						<dd>{{.SysStatus.StackInuse}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
-						<dd>{{.SysStatus.StackSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.mspan_structures_usage"}}</dt>
-						<dd>{{.SysStatus.MSpanInuse}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.mspan_structures_obtained"}}</dt>
-						<dd>{{.SysStatus.MSpanSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.mcache_structures_usage"}}</dt>
-						<dd>{{.SysStatus.MCacheInuse}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.mcache_structures_obtained"}}</dt>
-						<dd>{{.SysStatus.MCacheSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}</dt>
-						<dd>{{.SysStatus.BuckHashSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.gc_metadata_obtained"}}</dt>
-						<dd>{{.SysStatus.GCSys}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
-						<dd>{{.SysStatus.OtherSys}}</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.dashboard.next_gc_recycle"}}</dt>
-						<dd>{{.SysStatus.NextGC}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.last_gc_time"}}</dt>
-						<dd>{{.SysStatus.LastGC}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.total_gc_pause"}}</dt>
-						<dd>{{.SysStatus.PauseTotalNs}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.last_gc_pause"}}</dt>
-						<dd>{{.SysStatus.PauseNs}}</dd>
-						<dt>{{.locale.Tr "admin.dashboard.gc_times"}}</dt>
-						<dd>{{.SysStatus.NumGC}}</dd>
-					</dl>
-				</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
+	<div class="admin-main-content">
+		{{template "base/alert" .}}
+		{{if .NeedUpdate}}
+			<div class="ui negative message flash-error">
+				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
+			</div>
+		{{end}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.dashboard.statistic"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>
+				{{.locale.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.AuthSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}}
+			</p>
+		</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.dashboard.operations"}}
+		</h4>
+		<form method="post" action="{{AppSubUrl}}/admin">
+			{{.CsrfTokenHtml}}
+			<div class="ui attached table segment">
+				<table class="ui very basic table">
+					<tbody>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="delete_inactive_accounts">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.delete_repo_archives"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="delete_repo_archives">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.delete_missing_repos"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="delete_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.git_gc_repos"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
+							<tr>
+								<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
+								{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
+								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+							</tr>
+							<tr>
+								<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
+								{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
+								<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+							</tr>
+						{{end}}
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.resync_all_hooks"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="resync_all_hooks">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="reinit_missing_repos">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.sync_external_users"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="sync_external_users">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.repo_health_check"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="repo_health_check">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+						<tr>
+							<td>{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}</td>
+							<td><button type="submit" class="ui green button" name="op" value="delete_generated_repository_avatars">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
+						</tr>
+					</tbody>
+				</table>
 			</div>
+		</form>
+
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.dashboard.system_status"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.dashboard.server_uptime"}}</dt>
+				<dd><relative-time format="duration" datetime="{{.SysStatus.StartTime}}">{{.SysStatus.StartTime}}</relative-time></dd>
+				<dt>{{.locale.Tr "admin.dashboard.current_goroutine"}}</dt>
+				<dd>{{.SysStatus.NumGoroutine}}</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.dashboard.current_memory_usage"}}</dt>
+				<dd>{{.SysStatus.MemAllocated}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.total_memory_allocated"}}</dt>
+				<dd>{{.SysStatus.MemTotal}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.memory_obtained"}}</dt>
+				<dd>{{.SysStatus.MemSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.pointer_lookup_times"}}</dt>
+				<dd>{{.SysStatus.Lookups}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.memory_allocate_times"}}</dt>
+				<dd>{{.SysStatus.MemMallocs}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.memory_free_times"}}</dt>
+				<dd>{{.SysStatus.MemFrees}}</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.dashboard.current_heap_usage"}}</dt>
+				<dd>{{.SysStatus.HeapAlloc}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.heap_memory_obtained"}}</dt>
+				<dd>{{.SysStatus.HeapSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.heap_memory_idle"}}</dt>
+				<dd>{{.SysStatus.HeapIdle}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.heap_memory_in_use"}}</dt>
+				<dd>{{.SysStatus.HeapInuse}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.heap_memory_released"}}</dt>
+				<dd>{{.SysStatus.HeapReleased}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.heap_objects"}}</dt>
+				<dd>{{.SysStatus.HeapObjects}}</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.dashboard.bootstrap_stack_usage"}}</dt>
+				<dd>{{.SysStatus.StackInuse}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.stack_memory_obtained"}}</dt>
+				<dd>{{.SysStatus.StackSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.mspan_structures_usage"}}</dt>
+				<dd>{{.SysStatus.MSpanInuse}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.mspan_structures_obtained"}}</dt>
+				<dd>{{.SysStatus.MSpanSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.mcache_structures_usage"}}</dt>
+				<dd>{{.SysStatus.MCacheInuse}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.mcache_structures_obtained"}}</dt>
+				<dd>{{.SysStatus.MCacheSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}</dt>
+				<dd>{{.SysStatus.BuckHashSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.gc_metadata_obtained"}}</dt>
+				<dd>{{.SysStatus.GCSys}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.other_system_allocation_obtained"}}</dt>
+				<dd>{{.SysStatus.OtherSys}}</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.dashboard.next_gc_recycle"}}</dt>
+				<dd>{{.SysStatus.NextGC}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.last_gc_time"}}</dt>
+				<dd>{{.SysStatus.LastGC}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.total_gc_pause"}}</dt>
+				<dd>{{.SysStatus.PauseTotalNs}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.last_gc_pause"}}</dt>
+				<dd>{{.SysStatus.PauseNs}}</dd>
+				<dt>{{.locale.Tr "admin.dashboard.gc_times"}}</dt>
+				<dd>{{.SysStatus.NumGC}}</dd>
+			</dl>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/layout_footer.tmpl b/templates/admin/layout_footer.tmpl
new file mode 100644
index 000000000000..0a83b3e97cf8
--- /dev/null
+++ b/templates/admin/layout_footer.tmpl
@@ -0,0 +1,8 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="admin-layout-right">
+		{{/* block: admin-main-content */}}
+{{end}}
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl
new file mode 100644
index 000000000000..0462d7fe3725
--- /dev/null
+++ b/templates/admin/layout_head.tmpl
@@ -0,0 +1,11 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}} ui container stackable grid">
+	{{template "admin/navbar" .ctxData}}
+	<div class="twelve wide column">
+		{{template "base/alert" .ctxData}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		{{/* block: admin-main-content */}}
+	</div>
+</div>
+{{end}}
\ No newline at end of file
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index 73102197b586..e8eb54e58da4 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -1,6 +1,6 @@
 <div class="four wide column">
 	<div class="ui fluid vertical menu">
-		<div class="header item">{{.locale.Tr "org.settings"}}</div>
+		<div class="header item">{{.locale.Tr "settings"}}</div>
 		<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
 			{{.locale.Tr "admin.dashboard"}}
 		</a>
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index f2791561902e..2e44ab9a2baf 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,135 +1,131 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
 	{{template "repo/header" .}}
+	{{template "repo/settings/navbar" .}}
 	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{if .Repository.IsArchived}}
-					<div class="ui warning message">
-						{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
-					</div>
-				{{else}}
-					<h4 class="ui top attached header">
-						{{.locale.Tr "repo.settings.tags.protection"}}
-					</h4>
+		{{template "base/alert" .}}
+		{{if .Repository.IsArchived}}
+			<div class="ui warning message">
+				{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
+			</div>
+		{{else}}
+			<h4 class="ui top attached header">
+				{{.locale.Tr "repo.settings.tags.protection"}}
+			</h4>
 
-					<div class="ui attached segment">
-						<div class="ui grid">
-							<div class="eight wide column">
-								<div class="ui segment">
-									<form class="ui form" action="{{.Link}}" method="post">
-										{{.CsrfTokenHtml}}
-										<div class="field">
-											<label>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</label>
-											<div id="search-tag-box" class="ui search">
-												<div class="ui input">
-													<input class="prompt" name="name_pattern" autocomplete="off" value="{{.name_pattern}}" placeholder="v*" autofocus required>
-												</div>
-												<div class="help">{{.locale.Tr "repo.settings.tags.protection.pattern.description" | Safe}}</div>
-											</div>
+			<div class="ui attached segment">
+				<div class="ui grid">
+					<div class="eight wide column">
+						<div class="ui segment">
+							<form class="ui form" action="{{.Link}}" method="post">
+								{{.CsrfTokenHtml}}
+								<div class="field">
+									<label>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</label>
+									<div id="search-tag-box" class="ui search">
+										<div class="ui input">
+											<input class="prompt" name="name_pattern" autocomplete="off" value="{{.name_pattern}}" placeholder="v*" autofocus required>
 										</div>
-										<div class="whitelist field">
-											<label>{{.locale.Tr "repo.settings.tags.protection.allowed.users"}}</label>
-											<div class="ui multiple search selection dropdown">
-												<input type="hidden" name="allowlist_users" value="{{.allowlist_users}}">
-												<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-												<div class="menu">
-													{{range .Users}}
-														<div class="item" data-value="{{.ID}}">
-															{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
-														</div>
-													{{end}}
+										<div class="help">{{.locale.Tr "repo.settings.tags.protection.pattern.description" | Safe}}</div>
+									</div>
+								</div>
+								<div class="whitelist field">
+									<label>{{.locale.Tr "repo.settings.tags.protection.allowed.users"}}</label>
+									<div class="ui multiple search selection dropdown">
+										<input type="hidden" name="allowlist_users" value="{{.allowlist_users}}">
+										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+										<div class="menu">
+											{{range .Users}}
+												<div class="item" data-value="{{.ID}}">
+													{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
 												</div>
-											</div>
+											{{end}}
 										</div>
-										{{if .Owner.IsOrganization}}
-											<div class="whitelist field">
-												<label>{{.locale.Tr "repo.settings.tags.protection.allowed.teams"}}</label>
-												<div class="ui multiple search selection dropdown">
-													<input type="hidden" name="allowlist_teams" value="{{.allowlist_teams}}">
-													<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-													<div class="menu">
-														{{range .Teams}}
-															<div class="item" data-value="{{.ID}}">
-																{{svg "octicon-people"}}
-																{{.Name}}
-															</div>
-														{{end}}
+									</div>
+								</div>
+								{{if .Owner.IsOrganization}}
+									<div class="whitelist field">
+										<label>{{.locale.Tr "repo.settings.tags.protection.allowed.teams"}}</label>
+										<div class="ui multiple search selection dropdown">
+											<input type="hidden" name="allowlist_teams" value="{{.allowlist_teams}}">
+											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+											<div class="menu">
+												{{range .Teams}}
+													<div class="item" data-value="{{.ID}}">
+														{{svg "octicon-people"}}
+														{{.Name}}
 													</div>
-												</div>
+												{{end}}
 											</div>
-										{{end}}
-										<div class="field">
-											{{if .PageIsEditProtectedTag}}
-											<button class="ui green button">
-												{{$.locale.Tr "save"}}
-											</button>
-											<a class="ui primary button" href="{{$.RepoLink}}/settings/tags">
-												{{$.locale.Tr "cancel"}}
-											</a>
-											{{else}}
-											<button class="ui green button">
-												{{$.locale.Tr "repo.settings.tags.protection.create"}}
-											</button>
-											{{end}}
 										</div>
-									</form>
+									</div>
+								{{end}}
+								<div class="field">
+									{{if .PageIsEditProtectedTag}}
+									<button class="ui green button">
+										{{$.locale.Tr "save"}}
+									</button>
+									<a class="ui primary button" href="{{$.RepoLink}}/settings/tags">
+										{{$.locale.Tr "cancel"}}
+									</a>
+									{{else}}
+									<button class="ui green button">
+										{{$.locale.Tr "repo.settings.tags.protection.create"}}
+									</button>
+									{{end}}
 								</div>
-							</div>
+							</form>
+						</div>
+					</div>
 
-							<div class="sixteen wide column">
-								<table class="ui single line table">
-									<thead>
-										<th>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</th>
-										<th>{{.locale.Tr "repo.settings.tags.protection.allowed"}}</th>
-										<th></th>
-									</thead>
-									<tbody>
-										{{range .ProtectedTags}}
-											<tr>
-												<td><pre>{{.NamePattern}}</pre></td>
-												<td>
-													{{if or .AllowlistUserIDs (and $.Owner.IsOrganization .AllowlistTeamIDs)}}
-														{{$userIDs := .AllowlistUserIDs}}
-														{{range $.Users}}
-															{{if contain $userIDs .ID}}
-																<a class="ui basic label" href="{{.HomeLink}}">{{avatar $.Context . 26}} {{.GetDisplayName}}</a>
-															{{end}}
-														{{end}}
-														{{if $.Owner.IsOrganization}}
-															{{$teamIDs := .AllowlistTeamIDs}}
-															{{range $.Teams}}
-																{{if contain $teamIDs .ID}}
-																	<a class="ui basic label" href="{{$.Owner.OrganisationLink}}/teams/{{PathEscape .LowerName}}">{{.Name}}</a>
-																{{end}}
-															{{end}}
+					<div class="sixteen wide column">
+						<table class="ui single line table">
+							<thead>
+								<th>{{.locale.Tr "repo.settings.tags.protection.pattern"}}</th>
+								<th>{{.locale.Tr "repo.settings.tags.protection.allowed"}}</th>
+								<th></th>
+							</thead>
+							<tbody>
+								{{range .ProtectedTags}}
+									<tr>
+										<td><pre>{{.NamePattern}}</pre></td>
+										<td>
+											{{if or .AllowlistUserIDs (and $.Owner.IsOrganization .AllowlistTeamIDs)}}
+												{{$userIDs := .AllowlistUserIDs}}
+												{{range $.Users}}
+													{{if SliceUtils.Contains $userIDs .ID}}
+														<a class="ui basic label" href="{{.HomeLink}}">{{avatar $.Context . 26}} {{.GetDisplayName}}</a>
+													{{end}}
+												{{end}}
+												{{if $.Owner.IsOrganization}}
+													{{$teamIDs := .AllowlistTeamIDs}}
+													{{range $.Teams}}
+														{{if SliceUtils.Contains $teamIDs .ID}}
+															<a class="ui basic label" href="{{$.Owner.OrganisationLink}}/teams/{{PathEscape .LowerName}}">{{.Name}}</a>
 														{{end}}
-													{{else}}
-														{{$.locale.Tr "repo.settings.tags.protection.allowed.noone"}}
 													{{end}}
-												</td>
-												<td class="right aligned">
-													<a class="ui tiny primary button" href="{{$.RepoLink}}/settings/tags/{{.ID}}">{{$.locale.Tr "edit"}}</a>
-													<form class="gt-dib" action="{{$.RepoLink}}/settings/tags/delete" method="post">
-														{{$.CsrfTokenHtml}}
-														<input type="hidden" name="id" value="{{.ID}}">
-														<button class="ui tiny red button">{{$.locale.Tr "remove"}}</button>
-													</form>
-												</td>
-											</tr>
-										{{else}}
-											<tr class="center aligned"><td colspan="3">{{.locale.Tr "repo.settings.tags.protection.none"}}</td></tr>
-										{{end}}
-									</tbody>
-								</table>
-							</div>
-						</div>
+												{{end}}
+											{{else}}
+												{{$.locale.Tr "repo.settings.tags.protection.allowed.noone"}}
+											{{end}}
+										</td>
+										<td class="right aligned">
+											<a class="ui tiny primary button" href="{{$.RepoLink}}/settings/tags/{{.ID}}">{{$.locale.Tr "edit"}}</a>
+											<form class="gt-dib" action="{{$.RepoLink}}/settings/tags/delete" method="post">
+												{{$.CsrfTokenHtml}}
+												<input type="hidden" name="id" value="{{.ID}}">
+												<button class="ui tiny red button">{{$.locale.Tr "remove"}}</button>
+											</form>
+										</td>
+									</tr>
+								{{else}}
+									<tr class="center aligned"><td colspan="3">{{.locale.Tr "repo.settings.tags.protection.none"}}</td></tr>
+								{{end}}
+							</tbody>
+						</table>
 					</div>
-				{{end}}
+				</div>
 			</div>
-		</div>
+		{{end}}
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/web_src/css/admin.css b/web_src/css/admin.css
index 00ed675e2d57..eb3146e6665b 100644
--- a/web_src/css/admin.css
+++ b/web_src/css/admin.css
@@ -1,3 +1,7 @@
+.page-content.admin.grid {
+  margin-top: 0;
+}
+
 .admin.hooks .list > .item:not(:first-child) {
   border-top: 1px solid var(--color-secondary);
   padding: 0.25rem 1rem;

From 216246275ba1f4295de78e8277296a950437cfcc Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 09:17:30 +0800
Subject: [PATCH 06/21] remove duplicate alert

---
 templates/admin/applications/list.tmpl | 24 +++++++-----------------
 templates/admin/dashboard.tmpl         |  1 -
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 4758b353a62f..02bae858eecd 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,18 +1,8 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				<div class="twelve wide column content">
-					{{template "base/alert" .}}
-					<h4 class="ui top attached header">
-							{{.locale.Tr "settings.applications"}}
-					</h4>
-					{{template "user/settings/applications_oauth2_list" .}}
-				</div>
-			</div>
-		</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.applications"}}
+		</h4>
+		{{template "user/settings/applications_oauth2_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 375836cb6056..3c0d46e13b49 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
 	<div class="admin-main-content">
-		{{template "base/alert" .}}
 		{{if .NeedUpdate}}
 			<div class="ui negative message flash-error">
 				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>

From bde361009f5e19cf6f48f1d3740116904f915995 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 09:21:13 +0800
Subject: [PATCH 07/21] admin list

---
 templates/admin/applications/list.tmpl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 02bae858eecd..074a2e081e6d 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,8 +1,10 @@
-{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-main-content">
-		<h4 class="ui top attached header">
-			{{.locale.Tr "settings.applications"}}
-		</h4>
-		{{template "user/settings/applications_oauth2_list" .}}
+		<div class="twelve wide column content">
+			<h4 class="ui top attached header">
+					{{.locale.Tr "settings.applications"}}
+			</h4>
+			{{template "user/settings/applications_oauth2_list" .}}
+		</div>
 	</div>
-{{template "admin/layout_footer" .}}
+{{template "admin/layout_footer" .}}
\ No newline at end of file

From 069fa825b8720562bde1ee4cd3a9f1791e8f6a49 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 09:30:10 +0800
Subject: [PATCH 08/21] try page with modal

---
 templates/admin/applications/list.tmpl        |   2 +-
 templates/admin/applications/oauth2_edit.tmpl |  15 +-
 templates/admin/auth/edit.tmpl                | 844 +++++++++---------
 3 files changed, 424 insertions(+), 437 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 074a2e081e6d..d3186ca60be4 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -7,4 +7,4 @@
 			{{template "user/settings/applications_oauth2_list" .}}
 		</div>
 	</div>
-{{template "admin/layout_footer" .}}
\ No newline at end of file
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index ab28c11778e4..a22769bc7e6c 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,12 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "user/settings/applications_oauth2_edit_form" .}}
-			</div>
-		</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+	<div class="admin-main-content">
+		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 9baa4292e917..97b812be5d5f 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,449 +1,443 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.auths.edit"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="id" value="{{.Source.ID}}">
-						<div class="inline field">
-							<label>{{$.locale.Tr "admin.auths.auth_type"}}</label>
-							<input type="hidden" id="auth_type" name="type" value="{{.Source.Type.Int}}">
-							<span>{{.Source.TypeName}}</span>
-						</div>
-						<div class="required inline field {{if .Err_Name}}error{{end}}">
-							<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
-							<input id="name" name="name" value="{{.Source.Name}}" autofocus required>
-						</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
+	<div class="admin-main-content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.auths.edit"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="id" value="{{.Source.ID}}">
+				<div class="inline field">
+					<label>{{$.locale.Tr "admin.auths.auth_type"}}</label>
+					<input type="hidden" id="auth_type" name="type" value="{{.Source.Type.Int}}">
+					<span>{{.Source.TypeName}}</span>
+				</div>
+				<div class="required inline field {{if .Err_Name}}error{{end}}">
+					<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
+					<input id="name" name="name" value="{{.Source.Name}}" autofocus required>
+				</div>
 
-						<!-- LDAP and DLDAP -->
-						{{if or .Source.IsLDAP .Source.IsDLDAP}}
-							{{$cfg:=.Source.Cfg}}
-							<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
-								<label>{{.locale.Tr "admin.auths.security_protocol"}}</label>
-								<div class="ui selection security-protocol dropdown">
-									<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol.Int}}">
-									<div class="text">{{$cfg.SecurityProtocolName}}</div>
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="menu">
-										{{range .SecurityProtocols}}
-											<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
-										{{end}}
-									</div>
-								</div>
-							</div>
-							<div class="required field">
-								<label for="host">{{.locale.Tr "admin.auths.host"}}</label>
-								<input id="host" name="host" value="{{$cfg.Host}}" placeholder="e.g. mydomain.com" required>
-							</div>
-							<div class="required field">
-								<label for="port">{{.locale.Tr "admin.auths.port"}}</label>
-								<input id="port" name="port" value="{{$cfg.Port}}"  placeholder="e.g. 636" required>
-							</div>
-							<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
-									<input name="skip_verify" type="checkbox" {{if .Source.SkipVerify}}checked{{end}}>
-								</div>
-							</div>
-							{{if .Source.IsLDAP}}
-								<div class="field">
-									<label for="bind_dn">{{.locale.Tr "admin.auths.bind_dn"}}</label>
-									<input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
-								</div>
-								<div class="field">
-									<label for="bind_password">{{.locale.Tr "admin.auths.bind_password"}}</label>
-									<input id="bind_password" name="bind_password" type="password" value="{{$cfg.BindPassword}}">
-								</div>
-							{{end}}
-							<div class="{{if .Source.IsLDAP}}required{{end}} field">
-									<label for="user_base">{{.locale.Tr "admin.auths.user_base"}}</label>
-									<input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" {{if .Source.IsLDAP}}required{{end}}>
-							</div>
-							{{if .Source.IsDLDAP}}
-								<div class="required field">
-									<label for="user_dn">{{.locale.Tr "admin.auths.user_dn"}}</label>
-									<input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com" required>
-								</div>
-							{{end}}
-							<div class="required field">
-								<label for="filter">{{.locale.Tr "admin.auths.filter"}}</label>
-								<input id="filter" name="filter" value="{{$cfg.Filter}}" placeholder="e.g. (&(objectClass=posixAccount)(uid=%s))" required>
-							</div>
-							<div class="field">
-								<label for="admin_filter">{{.locale.Tr "admin.auths.admin_filter"}}</label>
-								<input id="admin_filter" name="admin_filter" value="{{$cfg.AdminFilter}}">
-							</div>
-							<div class="field">
-								<label for="restricted_filter">{{.locale.Tr "admin.auths.restricted_filter"}}</label>
-								<input id="restricted_filter" name="restricted_filter" value="{{$cfg.RestrictedFilter}}">
-								<p class="help">{{.locale.Tr "admin.auths.restricted_filter_helper"}}</p>
-							</div>
-							<div class="field">
-								<label for="attribute_username">{{.locale.Tr "admin.auths.attribute_username"}}</label>
-								<input id="attribute_username" name="attribute_username" value="{{$cfg.AttributeUsername}}" placeholder="{{.locale.Tr "admin.auths.attribute_username_placeholder"}}">
-							</div>
-							<div class="field">
-								<label for="attribute_name">{{.locale.Tr "admin.auths.attribute_name"}}</label>
-								<input id="attribute_name" name="attribute_name" value="{{$cfg.AttributeName}}">
-							</div>
-							<div class="field">
-								<label for="attribute_surname">{{.locale.Tr "admin.auths.attribute_surname"}}</label>
-								<input id="attribute_surname" name="attribute_surname" value="{{$cfg.AttributeSurname}}">
-							</div>
-							<div class="required field">
-								<label for="attribute_mail">{{.locale.Tr "admin.auths.attribute_mail"}}</label>
-								<input id="attribute_mail" name="attribute_mail" value="{{$cfg.AttributeMail}}" placeholder="e.g. mail" required>
-							</div>
-							<div class="field">
-								<label for="attribute_ssh_public_key">{{.locale.Tr "admin.auths.attribute_ssh_public_key"}}</label>
-								<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
-							</div>
-							<div class="field">
-								<label for="attribute_avatar">{{.locale.Tr "admin.auths.attribute_avatar"}}</label>
-								<input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="e.g. jpegPhoto">
+				<!-- LDAP and DLDAP -->
+				{{if or .Source.IsLDAP .Source.IsDLDAP}}
+					{{$cfg:=.Source.Cfg}}
+					<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
+						<label>{{.locale.Tr "admin.auths.security_protocol"}}</label>
+						<div class="ui selection security-protocol dropdown">
+							<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol.Int}}">
+							<div class="text">{{$cfg.SecurityProtocolName}}</div>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu">
+								{{range .SecurityProtocols}}
+									<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
+								{{end}}
 							</div>
+						</div>
+					</div>
+					<div class="required field">
+						<label for="host">{{.locale.Tr "admin.auths.host"}}</label>
+						<input id="host" name="host" value="{{$cfg.Host}}" placeholder="e.g. mydomain.com" required>
+					</div>
+					<div class="required field">
+						<label for="port">{{.locale.Tr "admin.auths.port"}}</label>
+						<input id="port" name="port" value="{{$cfg.Port}}"  placeholder="e.g. 636" required>
+					</div>
+					<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
+							<input name="skip_verify" type="checkbox" {{if .Source.SkipVerify}}checked{{end}}>
+						</div>
+					</div>
+					{{if .Source.IsLDAP}}
+						<div class="field">
+							<label for="bind_dn">{{.locale.Tr "admin.auths.bind_dn"}}</label>
+							<input id="bind_dn" name="bind_dn" value="{{$cfg.BindDN}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
+						</div>
+						<div class="field">
+							<label for="bind_password">{{.locale.Tr "admin.auths.bind_password"}}</label>
+							<input id="bind_password" name="bind_password" type="password" value="{{$cfg.BindPassword}}">
+						</div>
+					{{end}}
+					<div class="{{if .Source.IsLDAP}}required{{end}} field">
+							<label for="user_base">{{.locale.Tr "admin.auths.user_base"}}</label>
+							<input id="user_base" name="user_base" value="{{$cfg.UserBase}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com" {{if .Source.IsLDAP}}required{{end}}>
+					</div>
+					{{if .Source.IsDLDAP}}
+						<div class="required field">
+							<label for="user_dn">{{.locale.Tr "admin.auths.user_dn"}}</label>
+							<input id="user_dn" name="user_dn" value="{{$cfg.UserDN}}" placeholder="e.g. uid=%s,ou=Users,dc=mydomain,dc=com" required>
+						</div>
+					{{end}}
+					<div class="required field">
+						<label for="filter">{{.locale.Tr "admin.auths.filter"}}</label>
+						<input id="filter" name="filter" value="{{$cfg.Filter}}" placeholder="e.g. (&(objectClass=posixAccount)(uid=%s))" required>
+					</div>
+					<div class="field">
+						<label for="admin_filter">{{.locale.Tr "admin.auths.admin_filter"}}</label>
+						<input id="admin_filter" name="admin_filter" value="{{$cfg.AdminFilter}}">
+					</div>
+					<div class="field">
+						<label for="restricted_filter">{{.locale.Tr "admin.auths.restricted_filter"}}</label>
+						<input id="restricted_filter" name="restricted_filter" value="{{$cfg.RestrictedFilter}}">
+						<p class="help">{{.locale.Tr "admin.auths.restricted_filter_helper"}}</p>
+					</div>
+					<div class="field">
+						<label for="attribute_username">{{.locale.Tr "admin.auths.attribute_username"}}</label>
+						<input id="attribute_username" name="attribute_username" value="{{$cfg.AttributeUsername}}" placeholder="{{.locale.Tr "admin.auths.attribute_username_placeholder"}}">
+					</div>
+					<div class="field">
+						<label for="attribute_name">{{.locale.Tr "admin.auths.attribute_name"}}</label>
+						<input id="attribute_name" name="attribute_name" value="{{$cfg.AttributeName}}">
+					</div>
+					<div class="field">
+						<label for="attribute_surname">{{.locale.Tr "admin.auths.attribute_surname"}}</label>
+						<input id="attribute_surname" name="attribute_surname" value="{{$cfg.AttributeSurname}}">
+					</div>
+					<div class="required field">
+						<label for="attribute_mail">{{.locale.Tr "admin.auths.attribute_mail"}}</label>
+						<input id="attribute_mail" name="attribute_mail" value="{{$cfg.AttributeMail}}" placeholder="e.g. mail" required>
+					</div>
+					<div class="field">
+						<label for="attribute_ssh_public_key">{{.locale.Tr "admin.auths.attribute_ssh_public_key"}}</label>
+						<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
+					</div>
+					<div class="field">
+						<label for="attribute_avatar">{{.locale.Tr "admin.auths.attribute_avatar"}}</label>
+						<input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="e.g. jpegPhoto">
+					</div>
 
 
-							<!-- ldap group begin -->
-							<div class="inline field">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.auths.enable_ldap_groups"}}</strong></label>
-									<input type="checkbox" name="groups_enabled" class="js-ldap-group-toggle" {{if $cfg.GroupsEnabled}}checked{{end}}>
-								</div>
-							</div>
-							<div id="ldap-group-options" class="ui segment secondary {{if not $cfg.GroupsEnabled}}gt-hidden{{end}}">
-								<div class="field">
-									<label>{{.locale.Tr "admin.auths.group_search_base"}}</label>
-									<input name="group_dn" value="{{$cfg.GroupDN}}" placeholder="e.g. ou=group,dc=mydomain,dc=com">
-								</div>
-								<div class="field">
-									<label>{{.locale.Tr "admin.auths.group_attribute_list_users"}}</label>
-									<input name="group_member_uid" value="{{$cfg.GroupMemberUID}}" placeholder="e.g. memberUid">
-								</div>
-								<div class="field">
-									<label>{{.locale.Tr "admin.auths.user_attribute_in_group"}}</label>
-									<input name="user_uid" value="{{$cfg.UserUID}}" placeholder="e.g. uid">
-								</div>
-								<div class="field">
-									<label>{{.locale.Tr "admin.auths.verify_group_membership"}}</label>
-									<input name="group_filter" value="{{$cfg.GroupFilter}}" placeholder="e.g. (|(cn=gitea_users)(cn=admins))">
-								</div>
-								<div class="field">
-									<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
-									<input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
-								</div>
-								<div class="ui checkbox">
-									<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
-									<input name="group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
-								</div>
-							</div>
-							<!-- ldap group end -->
+					<!-- ldap group begin -->
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.auths.enable_ldap_groups"}}</strong></label>
+							<input type="checkbox" name="groups_enabled" class="js-ldap-group-toggle" {{if $cfg.GroupsEnabled}}checked{{end}}>
+						</div>
+					</div>
+					<div id="ldap-group-options" class="ui segment secondary {{if not $cfg.GroupsEnabled}}gt-hidden{{end}}">
+						<div class="field">
+							<label>{{.locale.Tr "admin.auths.group_search_base"}}</label>
+							<input name="group_dn" value="{{$cfg.GroupDN}}" placeholder="e.g. ou=group,dc=mydomain,dc=com">
+						</div>
+						<div class="field">
+							<label>{{.locale.Tr "admin.auths.group_attribute_list_users"}}</label>
+							<input name="group_member_uid" value="{{$cfg.GroupMemberUID}}" placeholder="e.g. memberUid">
+						</div>
+						<div class="field">
+							<label>{{.locale.Tr "admin.auths.user_attribute_in_group"}}</label>
+							<input name="user_uid" value="{{$cfg.UserUID}}" placeholder="e.g. uid">
+						</div>
+						<div class="field">
+							<label>{{.locale.Tr "admin.auths.verify_group_membership"}}</label>
+							<input name="group_filter" value="{{$cfg.GroupFilter}}" placeholder="e.g. (|(cn=gitea_users)(cn=admins))">
+						</div>
+						<div class="field">
+							<label>{{.locale.Tr "admin.auths.map_group_to_team"}}</label>
+							<input name="group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"cn=my-group,cn=groups,dc=example,dc=org": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
+						</div>
+						<div class="ui checkbox">
+							<label>{{.locale.Tr "admin.auths.map_group_to_team_removal"}}</label>
+							<input name="group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
+						</div>
+					</div>
+					<!-- ldap group end -->
 
-							{{if .Source.IsLDAP}}
-								<div class="inline field">
-									<div class="ui checkbox">
-										<label for="use_paged_search"><strong>{{.locale.Tr "admin.auths.use_paged_search"}}</strong></label>
-										<input id="use_paged_search" name="use_paged_search" type="checkbox" {{if $cfg.UsePagedSearch}}checked{{end}}>
-									</div>
-								</div>
-								<div class="field required search-page-size{{if not $cfg.UsePagedSearch}} gt-hidden{{end}}">
-									<label for="search_page_size">{{.locale.Tr "admin.auths.search_page_size"}}</label>
-									<input id="search_page_size" name="search_page_size" value="{{if $cfg.UsePagedSearch}}{{$cfg.SearchPageSize}}{{end}}">
-								</div>
-								<div class="inline field">
-									<div class="ui checkbox">
-										<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
-										<input name="attributes_in_bind" type="checkbox" {{if $cfg.AttributesInBind}}checked{{end}}>
-									</div>
-								</div>
-							{{end}}
-							<div class="optional field">
-								<div class="ui checkbox">
-									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-								</div>
+					{{if .Source.IsLDAP}}
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label for="use_paged_search"><strong>{{.locale.Tr "admin.auths.use_paged_search"}}</strong></label>
+								<input id="use_paged_search" name="use_paged_search" type="checkbox" {{if $cfg.UsePagedSearch}}checked{{end}}>
 							</div>
-							<div class="inline field">
-								<div class="ui checkbox">
-									<label for="allow_deactivate_all"><strong>{{.locale.Tr "admin.auths.allow_deactivate_all"}}</strong></label>
-									<input id="allow_deactivate_all" name="allow_deactivate_all" type="checkbox" {{if $cfg.AllowDeactivateAll}}checked{{end}}>
-								</div>
+						</div>
+						<div class="field required search-page-size{{if not $cfg.UsePagedSearch}} gt-hidden{{end}}">
+							<label for="search_page_size">{{.locale.Tr "admin.auths.search_page_size"}}</label>
+							<input id="search_page_size" name="search_page_size" value="{{if $cfg.UsePagedSearch}}{{$cfg.SearchPageSize}}{{end}}">
+						</div>
+						<div class="inline field">
+							<div class="ui checkbox">
+								<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
+								<input name="attributes_in_bind" type="checkbox" {{if $cfg.AttributesInBind}}checked{{end}}>
 							</div>
-						{{end}}
+						</div>
+					{{end}}
+					<div class="optional field">
+						<div class="ui checkbox">
+							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+						</div>
+					</div>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label for="allow_deactivate_all"><strong>{{.locale.Tr "admin.auths.allow_deactivate_all"}}</strong></label>
+							<input id="allow_deactivate_all" name="allow_deactivate_all" type="checkbox" {{if $cfg.AllowDeactivateAll}}checked{{end}}>
+						</div>
+					</div>
+				{{end}}
 
-						<!-- SMTP -->
-						{{if .Source.IsSMTP}}
-							{{$cfg:=.Source.Cfg}}
-							<div class="inline required field">
-								<label>{{.locale.Tr "admin.auths.smtp_auth"}}</label>
-								<div class="ui selection type dropdown">
-									<input type="hidden" id="smtp_auth" name="smtp_auth" value="{{$cfg.Auth}}" required>
-									<div class="text">{{$cfg.Auth}}</div>
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="menu">
-										{{range .SMTPAuths}}
-											<div class="item" data-value="{{.}}">{{.}}</div>
-										{{end}}
-									</div>
-								</div>
-							</div>
-							<div class="required field">
-								<label for="smtp_host">{{.locale.Tr "admin.auths.smtphost"}}</label>
-								<input id="smtp_host" name="smtp_host" value="{{$cfg.Host}}" required>
-							</div>
-							<div class="required field">
-								<label for="smtp_port">{{.locale.Tr "admin.auths.smtpport"}}</label>
-								<input id="smtp_port" name="smtp_port" value="{{$cfg.Port}}" required>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<label for="force_smtps"><strong>{{.locale.Tr "admin.auths.force_smtps"}}</strong></label>
-									<input id="force_smtps" name="force_smtps" type="checkbox" {{if $cfg.ForceSMTPS}}checked{{end}}>
-								</div>
-								<p class="help">{{.locale.Tr "admin.auths.force_smtps_helper"}}</p>
-							</div>
-							<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
-									<input name="skip_verify" type="checkbox" {{if $cfg.SkipVerify}}checked{{end}}>
-								</div>
+				<!-- SMTP -->
+				{{if .Source.IsSMTP}}
+					{{$cfg:=.Source.Cfg}}
+					<div class="inline required field">
+						<label>{{.locale.Tr "admin.auths.smtp_auth"}}</label>
+						<div class="ui selection type dropdown">
+							<input type="hidden" id="smtp_auth" name="smtp_auth" value="{{$cfg.Auth}}" required>
+							<div class="text">{{$cfg.Auth}}</div>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu">
+								{{range .SMTPAuths}}
+									<div class="item" data-value="{{.}}">{{.}}</div>
+								{{end}}
 							</div>
-							<div class="field">
-								<label for="helo_hostname">{{.locale.Tr "admin.auths.helo_hostname"}}</label>
-								<input id="helo_hostname" name="helo_hostname" value="{{$cfg.HeloHostname}}">
-								<p class="help">{{.locale.Tr "admin.auths.helo_hostname_helper"}}</p>
-							</div>
-							<div class="inline field">
-								<div class="ui checkbox">
-									<label for="disable_helo"><strong>{{.locale.Tr "admin.auths.disable_helo"}}</strong></label>
-									<input id="disable_helo" name="disable_helo" type="checkbox" {{if $cfg.DisableHelo}}checked{{end}}>
-								</div>
-							</div>
-							<div class="field">
-								<label for="allowed_domains">{{.locale.Tr "admin.auths.allowed_domains"}}</label>
-								<input id="allowed_domains" name="allowed_domains" value="{{$cfg.AllowedDomains}}">
-								<p class="help">{{.locale.Tr "admin.auths.allowed_domains_helper"}}</p>
-							</div>
-							<div class="optional field">
-								<div class="ui checkbox">
-									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-								</div>
-							</div>
-						{{end}}
+						</div>
+					</div>
+					<div class="required field">
+						<label for="smtp_host">{{.locale.Tr "admin.auths.smtphost"}}</label>
+						<input id="smtp_host" name="smtp_host" value="{{$cfg.Host}}" required>
+					</div>
+					<div class="required field">
+						<label for="smtp_port">{{.locale.Tr "admin.auths.smtpport"}}</label>
+						<input id="smtp_port" name="smtp_port" value="{{$cfg.Port}}" required>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<label for="force_smtps"><strong>{{.locale.Tr "admin.auths.force_smtps"}}</strong></label>
+							<input id="force_smtps" name="force_smtps" type="checkbox" {{if $cfg.ForceSMTPS}}checked{{end}}>
+						</div>
+						<p class="help">{{.locale.Tr "admin.auths.force_smtps_helper"}}</p>
+					</div>
+					<div class="has-tls inline field {{if not .HasTLS}}gt-hidden{{end}}">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.auths.skip_tls_verify"}}</strong></label>
+							<input name="skip_verify" type="checkbox" {{if $cfg.SkipVerify}}checked{{end}}>
+						</div>
+					</div>
+					<div class="field">
+						<label for="helo_hostname">{{.locale.Tr "admin.auths.helo_hostname"}}</label>
+						<input id="helo_hostname" name="helo_hostname" value="{{$cfg.HeloHostname}}">
+						<p class="help">{{.locale.Tr "admin.auths.helo_hostname_helper"}}</p>
+					</div>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label for="disable_helo"><strong>{{.locale.Tr "admin.auths.disable_helo"}}</strong></label>
+							<input id="disable_helo" name="disable_helo" type="checkbox" {{if $cfg.DisableHelo}}checked{{end}}>
+						</div>
+					</div>
+					<div class="field">
+						<label for="allowed_domains">{{.locale.Tr "admin.auths.allowed_domains"}}</label>
+						<input id="allowed_domains" name="allowed_domains" value="{{$cfg.AllowedDomains}}">
+						<p class="help">{{.locale.Tr "admin.auths.allowed_domains_helper"}}</p>
+					</div>
+					<div class="optional field">
+						<div class="ui checkbox">
+							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+						</div>
+					</div>
+				{{end}}
 
-						<!-- PAM -->
-						{{if .Source.IsPAM}}
-							{{$cfg:=.Source.Cfg}}
-							<div class="required field">
-								<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
-								<input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required>
-							</div>
-							<div class="field">
-								<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
-								<input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}">
-							</div>
-							<div class="optional field">
-								<div class="ui checkbox">
-									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-								</div>
-							</div>
-						{{end}}
+				<!-- PAM -->
+				{{if .Source.IsPAM}}
+					{{$cfg:=.Source.Cfg}}
+					<div class="required field">
+						<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
+						<input id="pam_service_name" name="pam_service_name" value="{{$cfg.ServiceName}}" required>
+					</div>
+					<div class="field">
+						<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
+						<input id="pam_email_domain" name="pam_email_domain" value="{{$cfg.EmailDomain}}">
+					</div>
+					<div class="optional field">
+						<div class="ui checkbox">
+							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+						</div>
+					</div>
+				{{end}}
 
-						<!-- OAuth2 -->
-						{{if .Source.IsOAuth2}}
-							{{$cfg:=.Source.Cfg}}
-							<div class="inline required field">
-								<label>{{.locale.Tr "admin.auths.oauth2_provider"}}</label>
-								<div class="ui selection type dropdown">
-									<input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{$cfg.Provider}}" required>
-									<div class="text">{{.CurrentOAuth2Provider.DisplayName}}</div>
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="menu">
-										{{range .OAuth2Providers}}
-											<div class="item" data-value="{{.Name}}">{{.DisplayName}}</div>
-										{{end}}
-									</div>
-								</div>
-							</div>
-							<div class="required field">
-								<label for="oauth2_key">{{.locale.Tr "admin.auths.oauth2_clientID"}}</label>
-								<input id="oauth2_key" name="oauth2_key" value="{{$cfg.ClientID}}" required>
-							</div>
-							<div class="required field">
-								<label for="oauth2_secret">{{.locale.Tr "admin.auths.oauth2_clientSecret"}}</label>
-								<input id="oauth2_secret" name="oauth2_secret" value="{{$cfg.ClientSecret}}" required>
-							</div>
-							<div class="optional field">
-								<label for="oauth2_icon_url">{{.locale.Tr "admin.auths.oauth2_icon_url"}}</label>
-								<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
-							</div>
-							<div class="open_id_connect_auto_discovery_url required field">
-								<label for="open_id_connect_auto_discovery_url">{{.locale.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
-								<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}">
-							</div>
-							<div class="optional field">
-								<div class="ui checkbox">
-									<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-									<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-								</div>
-							</div>
-							<div class="oauth2_use_custom_url inline field">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label>
-									<input id="oauth2_use_custom_url" name="oauth2_use_custom_url" type="checkbox" {{if $cfg.CustomURLMapping}}checked{{end}}>
-								</div>
-							</div>
-							<div class="oauth2_use_custom_url_field oauth2_auth_url required field">
-								<label for="oauth2_auth_url">{{.locale.Tr "admin.auths.oauth2_authURL"}}</label>
-								<input id="oauth2_auth_url" name="oauth2_auth_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.AuthURL}}{{end}}">
-							</div>
-							<div class="oauth2_use_custom_url_field oauth2_token_url required field">
-								<label for="oauth2_token_url">{{.locale.Tr "admin.auths.oauth2_tokenURL"}}</label>
-								<input id="oauth2_token_url" name="oauth2_token_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.TokenURL}}{{end}}">
-							</div>
-							<div class="oauth2_use_custom_url_field oauth2_profile_url required field">
-								<label for="oauth2_profile_url">{{.locale.Tr "admin.auths.oauth2_profileURL"}}</label>
-								<input id="oauth2_profile_url" name="oauth2_profile_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.ProfileURL}}{{end}}">
-							</div>
-							<div class="oauth2_use_custom_url_field oauth2_email_url required field">
-								<label for="oauth2_email_url">{{.locale.Tr "admin.auths.oauth2_emailURL"}}</label>
-								<input id="oauth2_email_url" name="oauth2_email_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.EmailURL}}{{end}}">
-							</div>
-							<div class="oauth2_use_custom_url_field oauth2_tenant required field">
-								<label for="oauth2_tenant">{{.locale.Tr "admin.auths.oauth2_tenant"}}</label>
-								<input id="oauth2_tenant" name="oauth2_tenant" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.Tenant}}{{end}}">
+				<!-- OAuth2 -->
+				{{if .Source.IsOAuth2}}
+					{{$cfg:=.Source.Cfg}}
+					<div class="inline required field">
+						<label>{{.locale.Tr "admin.auths.oauth2_provider"}}</label>
+						<div class="ui selection type dropdown">
+							<input type="hidden" id="oauth2_provider" name="oauth2_provider" value="{{$cfg.Provider}}" required>
+							<div class="text">{{.CurrentOAuth2Provider.DisplayName}}</div>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu">
+								{{range .OAuth2Providers}}
+									<div class="item" data-value="{{.Name}}">{{.DisplayName}}</div>
+								{{end}}
 							</div>
+						</div>
+					</div>
+					<div class="required field">
+						<label for="oauth2_key">{{.locale.Tr "admin.auths.oauth2_clientID"}}</label>
+						<input id="oauth2_key" name="oauth2_key" value="{{$cfg.ClientID}}" required>
+					</div>
+					<div class="required field">
+						<label for="oauth2_secret">{{.locale.Tr "admin.auths.oauth2_clientSecret"}}</label>
+						<input id="oauth2_secret" name="oauth2_secret" value="{{$cfg.ClientSecret}}" required>
+					</div>
+					<div class="optional field">
+						<label for="oauth2_icon_url">{{.locale.Tr "admin.auths.oauth2_icon_url"}}</label>
+						<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
+					</div>
+					<div class="open_id_connect_auto_discovery_url required field">
+						<label for="open_id_connect_auto_discovery_url">{{.locale.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
+						<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}">
+					</div>
+					<div class="optional field">
+						<div class="ui checkbox">
+							<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+							<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if $cfg.SkipLocalTwoFA}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+						</div>
+					</div>
+					<div class="oauth2_use_custom_url inline field">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label>
+							<input id="oauth2_use_custom_url" name="oauth2_use_custom_url" type="checkbox" {{if $cfg.CustomURLMapping}}checked{{end}}>
+						</div>
+					</div>
+					<div class="oauth2_use_custom_url_field oauth2_auth_url required field">
+						<label for="oauth2_auth_url">{{.locale.Tr "admin.auths.oauth2_authURL"}}</label>
+						<input id="oauth2_auth_url" name="oauth2_auth_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.AuthURL}}{{end}}">
+					</div>
+					<div class="oauth2_use_custom_url_field oauth2_token_url required field">
+						<label for="oauth2_token_url">{{.locale.Tr "admin.auths.oauth2_tokenURL"}}</label>
+						<input id="oauth2_token_url" name="oauth2_token_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.TokenURL}}{{end}}">
+					</div>
+					<div class="oauth2_use_custom_url_field oauth2_profile_url required field">
+						<label for="oauth2_profile_url">{{.locale.Tr "admin.auths.oauth2_profileURL"}}</label>
+						<input id="oauth2_profile_url" name="oauth2_profile_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.ProfileURL}}{{end}}">
+					</div>
+					<div class="oauth2_use_custom_url_field oauth2_email_url required field">
+						<label for="oauth2_email_url">{{.locale.Tr "admin.auths.oauth2_emailURL"}}</label>
+						<input id="oauth2_email_url" name="oauth2_email_url" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.EmailURL}}{{end}}">
+					</div>
+					<div class="oauth2_use_custom_url_field oauth2_tenant required field">
+						<label for="oauth2_tenant">{{.locale.Tr "admin.auths.oauth2_tenant"}}</label>
+						<input id="oauth2_tenant" name="oauth2_tenant" value="{{if $cfg.CustomURLMapping}}{{$cfg.CustomURLMapping.Tenant}}{{end}}">
+					</div>
 
-							{{range .OAuth2Providers}}{{if .CustomURLSettings}}
-								<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
-								<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
-								<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
-								<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
-								<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
-								<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
-							{{end}}{{end}}
+					{{range .OAuth2Providers}}{{if .CustomURLSettings}}
+						<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
+						<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
+						<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
+						<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
+						<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
+						<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
+					{{end}}{{end}}
 
-							<div class="field">
-								<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
-								<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}">
-							</div>
-							<div class="field">
-								<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
-								<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{$cfg.RequiredClaimName}}">
-								<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p>
-							</div>
-							<div class="field">
-								<label for="oauth2_required_claim_value">{{.locale.Tr "admin.auths.oauth2_required_claim_value"}}</label>
-								<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" value="{{$cfg.RequiredClaimValue}}">
-								<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}</p>
-							</div>
-							<div class="field">
-								<label for="oauth2_group_claim_name">{{.locale.Tr "admin.auths.oauth2_group_claim_name"}}</label>
-								<input id="oauth2_group_claim_name" name="oauth2_group_claim_name" value="{{$cfg.GroupClaimName}}">
-							</div>
-							<div class="field">
-								<label for="oauth2_admin_group">{{.locale.Tr "admin.auths.oauth2_admin_group"}}</label>
-								<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{$cfg.AdminGroup}}">
-							</div>
-							<div class="field">
-								<label for="oauth2_restricted_group">{{.locale.Tr "admin.auths.oauth2_restricted_group"}}</label>
-								<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{$cfg.RestrictedGroup}}">
-							</div>
-							<div class="field">
-								<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
-								<input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
-							</div>
-							<div class="ui checkbox">
-								<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
-								<input name="oauth2_group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
-							</div>
-						{{end}}
+					<div class="field">
+						<label for="oauth2_scopes">{{.locale.Tr "admin.auths.oauth2_scopes"}}</label>
+						<input id="oauth2_scopes" name="oauth2_scopes" value="{{if $cfg.Scopes}}{{Join $cfg.Scopes ","}}{{end}}">
+					</div>
+					<div class="field">
+						<label for="oauth2_required_claim_name">{{.locale.Tr "admin.auths.oauth2_required_claim_name"}}</label>
+						<input id="oauth2_required_claim_name" name="oauth2_required_claim_name" value="{{$cfg.RequiredClaimName}}">
+						<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}</p>
+					</div>
+					<div class="field">
+						<label for="oauth2_required_claim_value">{{.locale.Tr "admin.auths.oauth2_required_claim_value"}}</label>
+						<input id="oauth2_required_claim_value" name="oauth2_required_claim_value" value="{{$cfg.RequiredClaimValue}}">
+						<p class="help">{{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}</p>
+					</div>
+					<div class="field">
+						<label for="oauth2_group_claim_name">{{.locale.Tr "admin.auths.oauth2_group_claim_name"}}</label>
+						<input id="oauth2_group_claim_name" name="oauth2_group_claim_name" value="{{$cfg.GroupClaimName}}">
+					</div>
+					<div class="field">
+						<label for="oauth2_admin_group">{{.locale.Tr "admin.auths.oauth2_admin_group"}}</label>
+						<input id="oauth2_admin_group" name="oauth2_admin_group" value="{{$cfg.AdminGroup}}">
+					</div>
+					<div class="field">
+						<label for="oauth2_restricted_group">{{.locale.Tr "admin.auths.oauth2_restricted_group"}}</label>
+						<input id="oauth2_restricted_group" name="oauth2_restricted_group" value="{{$cfg.RestrictedGroup}}">
+					</div>
+					<div class="field">
+						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team"}}</label>
+						<input name="oauth2_group_team_map" value="{{$cfg.GroupTeamMap}}" placeholder='e.g. {"Developer": {"MyGiteaOrganization": ["MyGiteaTeam1", "MyGiteaTeam2"]}}'>
+					</div>
+					<div class="ui checkbox">
+						<label>{{.locale.Tr "admin.auths.oauth2_map_group_to_team_removal"}}</label>
+						<input name="oauth2_group_team_map_removal" type="checkbox" {{if $cfg.GroupTeamMapRemoval}}checked{{end}}>
+					</div>
+				{{end}}
 
-						<!-- SSPI -->
-						{{if .Source.IsSSPI}}
-							{{$cfg:=.Source.Cfg}}
-							<div class="field">
-								<div class="ui checkbox">
-									<label for="sspi_auto_create_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_create_users"}}</strong></label>
-									<input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if $cfg.AutoCreateUsers}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<label for="sspi_auto_activate_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label>
-									<input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if $cfg.AutoActivateUsers}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<label for="sspi_strip_domain_names"><strong>{{.locale.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label>
-									<input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if $cfg.StripDomainNames}}checked{{end}}>
-									<p class="help">{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p>
-								</div>
-							</div>
-							<div class="required field">
-								<label for="sspi_separator_replacement">{{.locale.Tr "admin.auths.sspi_separator_replacement"}}</label>
-								<input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{$cfg.SeparatorReplacement}}" required>
-								<p class="help">{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}</p>
-							</div>
-							<div class="field">
-								<label for="sspi_default_language">{{.locale.Tr "admin.auths.sspi_default_language"}}</label>
-								<div class="ui language selection dropdown" id="sspi_default_language">
-									<input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}">
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div>
-									<div class="menu">
-										<div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div>
-									{{range .AllLangs}}
-										<div class="item{{if eq $cfg.DefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
-									{{end}}
-									</div>
-								</div>
-								<p class="help">{{.locale.Tr "admin.auths.sspi_default_language_helper"}}</p>
-							</div>
-						{{end}}
-						{{if .Source.IsLDAP}}
-							<div class="inline field">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
-									<input name="is_sync_enabled" type="checkbox" {{if .Source.IsSyncEnabled}}checked{{end}}>
-								</div>
-							</div>
-						{{end}}
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
-								<input name="is_active" type="checkbox" {{if .Source.IsActive}}checked{{end}}>
+				<!-- SSPI -->
+				{{if .Source.IsSSPI}}
+					{{$cfg:=.Source.Cfg}}
+					<div class="field">
+						<div class="ui checkbox">
+							<label for="sspi_auto_create_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_create_users"}}</strong></label>
+							<input id="sspi_auto_create_users" name="sspi_auto_create_users" class="sspi-auto-create-users" type="checkbox" {{if $cfg.AutoCreateUsers}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.sspi_auto_create_users_helper"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<label for="sspi_auto_activate_users"><strong>{{.locale.Tr "admin.auths.sspi_auto_activate_users"}}</strong></label>
+							<input id="sspi_auto_activate_users" name="sspi_auto_activate_users" class="sspi-auto-activate-users" type="checkbox" {{if $cfg.AutoActivateUsers}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.sspi_auto_activate_users_helper"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<label for="sspi_strip_domain_names"><strong>{{.locale.Tr "admin.auths.sspi_strip_domain_names"}}</strong></label>
+							<input id="sspi_strip_domain_names" name="sspi_strip_domain_names" class="sspi-strip-domain-names" type="checkbox" {{if $cfg.StripDomainNames}}checked{{end}}>
+							<p class="help">{{.locale.Tr "admin.auths.sspi_strip_domain_names_helper"}}</p>
+						</div>
+					</div>
+					<div class="required field">
+						<label for="sspi_separator_replacement">{{.locale.Tr "admin.auths.sspi_separator_replacement"}}</label>
+						<input id="sspi_separator_replacement" name="sspi_separator_replacement" value="{{$cfg.SeparatorReplacement}}" required>
+						<p class="help">{{.locale.Tr "admin.auths.sspi_separator_replacement_helper"}}</p>
+					</div>
+					<div class="field">
+						<label for="sspi_default_language">{{.locale.Tr "admin.auths.sspi_default_language"}}</label>
+						<div class="ui language selection dropdown" id="sspi_default_language">
+							<input name="sspi_default_language" type="hidden" value="{{$cfg.DefaultLanguage}}">
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="text">{{range .AllLangs}}{{if eq $cfg.DefaultLanguage .Lang}}{{.Name}}{{end}}{{end}}</div>
+							<div class="menu">
+								<div class="item{{if not $.SSPIDefaultLanguage}} active selected{{end}}" data-value="">-</div>
+							{{range .AllLangs}}
+								<div class="item{{if eq $cfg.DefaultLanguage .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
+							{{end}}
 							</div>
 						</div>
-
-						<div class="field">
-							<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button>
-							<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</button>
+						<p class="help">{{.locale.Tr "admin.auths.sspi_default_language_helper"}}</p>
+					</div>
+				{{end}}
+				{{if .Source.IsLDAP}}
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
+							<input name="is_sync_enabled" type="checkbox" {{if .Source.IsSyncEnabled}}checked{{end}}>
 						</div>
-					</form>
+					</div>
+				{{end}}
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
+						<input name="is_active" type="checkbox" {{if .Source.IsActive}}checked{{end}}>
+					</div>
+				</div>
+
+				<div class="field">
+					<button class="ui green button">{{.locale.Tr "admin.auths.update"}}</button>
+					<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{.locale.Tr "admin.auths.delete"}}</button>
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
 </div>
-
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
@@ -453,5 +447,5 @@
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
+

From d1e9c239dabcb460d0821234ad8a27ca6dbab23f Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 09:33:59 +0800
Subject: [PATCH 09/21] try for edit

---
 templates/admin/auth/edit.tmpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 97b812be5d5f..dd5fdc9330b3 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,7 +1,5 @@
-{{template "base/head" .}}
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
 	<div class="admin-main-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.edit"}}
 		</h4>

From 7b23c0893ae3a2ee980e50b959fb098a37e3612b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 10:08:32 +0800
Subject: [PATCH 10/21] updates for admin

---
 templates/admin/auth/edit.tmpl                |   1 -
 templates/admin/auth/list.tmpl                |  78 +-
 templates/admin/auth/new.tmpl                 | 222 +++--
 templates/admin/config.tmpl                   | 788 +++++++++---------
 templates/admin/emails/list.tmpl              | 184 ++--
 templates/admin/hook_new.tmpl                 | 112 ++-
 templates/admin/hooks.tmpl                    |  20 +-
 templates/admin/monitor.tmpl                  |  76 +-
 templates/admin/notice.tmpl                   | 136 ++-
 templates/admin/org/list.tmpl                 | 110 ++-
 templates/admin/packages/list.tmpl            | 156 ++--
 templates/admin/queue.tmpl                    | 323 ++++---
 templates/admin/repo/list.tmpl                | 184 ++--
 templates/admin/repo/unadopted.tmpl           | 181 ++--
 templates/admin/runners/base.tmpl             |  15 +-
 templates/admin/runners/edit.tmpl             |  15 +-
 templates/admin/stacktrace.tmpl               |  37 +-
 templates/admin/user/edit.tmpl                | 362 ++++----
 templates/admin/user/list.tmpl                | 210 +++--
 templates/admin/user/new.tmpl                 | 166 ++--
 templates/shared/actions/runner_edit.tmpl     |   1 -
 templates/shared/actions/runner_list.tmpl     |   1 -
 .../applications_oauth2_edit_form.tmpl        |   1 -
 23 files changed, 1611 insertions(+), 1768 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index dd5fdc9330b3..934dc231d0bb 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -446,4 +446,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 {{template "admin/layout_footer" .}}
-
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 9bdb0583a7b4..750261aede38 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,46 +1,38 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/auths/new">{{.locale.Tr "admin.auths.new"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th>ID</th>
-								<th>{{.locale.Tr "admin.auths.name"}}</th>
-								<th>{{.locale.Tr "admin.auths.type"}}</th>
-								<th>{{.locale.Tr "admin.auths.enabled"}}</th>
-								<th>{{.locale.Tr "admin.auths.updated"}}</th>
-								<th>{{.locale.Tr "admin.users.created"}}</th>
-								<th>{{.locale.Tr "admin.users.edit"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Sources}}
-								<tr>
-									<td>{{.ID}}</td>
-									<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
-									<td>{{.TypeName}}</td>
-									<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-									<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
-				</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/auths/new">{{.locale.Tr "admin.auths.new"}}</a>
 			</div>
+		</h4>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th>ID</th>
+						<th>{{.locale.Tr "admin.auths.name"}}</th>
+						<th>{{.locale.Tr "admin.auths.type"}}</th>
+						<th>{{.locale.Tr "admin.auths.enabled"}}</th>
+						<th>{{.locale.Tr "admin.auths.updated"}}</th>
+						<th>{{.locale.Tr "admin.users.created"}}</th>
+						<th>{{.locale.Tr "admin.users.edit"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Sources}}
+						<tr>
+							<td>{{.ID}}</td>
+							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
+							<td>{{.TypeName}}</td>
+							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+							<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index 696c3ddac226..071a95948e8b 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,130 +1,122 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.auths.new"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<!-- Types and name -->
-						<div class="inline required field {{if .Err_Type}}error{{end}}">
-							<label>{{.locale.Tr "admin.auths.auth_type"}}</label>
-							<div class="ui selection type dropdown">
-								<input type="hidden" id="auth_type" name="type" value="{{.type}}">
-								<div class="text">{{.CurrentTypeName}}</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									{{range .AuthSources}}
-										<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
-									{{end}}
-								</div>
-							</div>
-						</div>
-						<div class="required inline field {{if .Err_Name}}error{{end}}">
-							<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
-							<input id="name" name="name" value="{{.name}}" autofocus required>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.auths.new"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<!-- Types and name -->
+				<div class="inline required field {{if .Err_Type}}error{{end}}">
+					<label>{{.locale.Tr "admin.auths.auth_type"}}</label>
+					<div class="ui selection type dropdown">
+						<input type="hidden" id="auth_type" name="type" value="{{.type}}">
+						<div class="text">{{.CurrentTypeName}}</div>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							{{range .AuthSources}}
+								<div class="item" data-value="{{.Type.Int}}">{{.Name}}</div>
+							{{end}}
 						</div>
+					</div>
+				</div>
+				<div class="required inline field {{if .Err_Name}}error{{end}}">
+					<label for="name">{{.locale.Tr "admin.auths.auth_name"}}</label>
+					<input id="name" name="name" value="{{.name}}" autofocus required>
+				</div>
 
-						<!-- LDAP and DLDAP -->
-						{{template "admin/auth/source/ldap" .}}
+				<!-- LDAP and DLDAP -->
+				{{template "admin/auth/source/ldap" .}}
 
-						<!-- SMTP -->
-						{{template "admin/auth/source/smtp" .}}
+				<!-- SMTP -->
+				{{template "admin/auth/source/smtp" .}}
 
-						<!-- PAM -->
-						<div class="pam required field {{if not (eq .type 4)}}gt-hidden{{end}}">
-							<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
-							<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}">
-							<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
-							<input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}">
-						</div>
-						<div class="pam optional field {{if not (eq .type 4)}}gt-hidden{{end}}">
-							<div class="ui checkbox">
-								<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
-								<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if .skip_local_two_fa}}checked{{end}}>
-								<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
-							</div>
-						</div>
+				<!-- PAM -->
+				<div class="pam required field {{if not (eq .type 4)}}gt-hidden{{end}}">
+					<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
+					<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}">
+					<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
+					<input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}">
+				</div>
+				<div class="pam optional field {{if not (eq .type 4)}}gt-hidden{{end}}">
+					<div class="ui checkbox">
+						<label for="skip_local_two_fa"><strong>{{.locale.Tr "admin.auths.skip_local_two_fa"}}</strong></label>
+						<input id="skip_local_two_fa" name="skip_local_two_fa" type="checkbox" {{if .skip_local_two_fa}}checked{{end}}>
+						<p class="help">{{.locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
+					</div>
+				</div>
 
-						<!-- OAuth2 -->
-						{{template "admin/auth/source/oauth" .}}
+				<!-- OAuth2 -->
+				{{template "admin/auth/source/oauth" .}}
 
-						<!-- SSPI -->
-						{{template "admin/auth/source/sspi" .}}
+				<!-- SSPI -->
+				{{template "admin/auth/source/sspi" .}}
 
-						<div class="ldap field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
-								<input name="attributes_in_bind" type="checkbox" {{if .attributes_in_bind}}checked{{end}}>
-							</div>
-						</div>
-						<div class="ldap inline field {{if not (eq .type 2)}}gt-hidden{{end}}">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
-								<input name="is_sync_enabled" type="checkbox" {{if .is_sync_enabled}}checked{{end}}>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
-								<input name="is_active" type="checkbox" {{if .is_active}}checked{{end}}>
-							</div>
-						</div>
+				<div class="ldap field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.auths.attributes_in_bind"}}</strong></label>
+						<input name="attributes_in_bind" type="checkbox" {{if .attributes_in_bind}}checked{{end}}>
+					</div>
+				</div>
+				<div class="ldap inline field {{if not (eq .type 2)}}gt-hidden{{end}}">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.auths.syncenabled"}}</strong></label>
+						<input name="is_sync_enabled" type="checkbox" {{if .is_sync_enabled}}checked{{end}}>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.auths.activated"}}</strong></label>
+						<input name="is_active" type="checkbox" {{if .is_active}}checked{{end}}>
+					</div>
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{.locale.Tr "admin.auths.new"}}</button>
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{.locale.Tr "admin.auths.new"}}</button>
 				</div>
+			</form>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.auths.tips"}}
-				</h4>
-				<div class="ui attached segment">
-					<h5>GMail Settings:</h5>
-					<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.auths.tips"}}
+		</h4>
+		<div class="ui attached segment">
+			<h5>GMail Settings:</h5>
+			<p>Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true</p>
 
-					<h5>{{.locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>
-					<p>{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}</p>
+			<h5>{{.locale.Tr "admin.auths.tips.oauth2.general"}}:</h5>
+			<p>{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}</p>
 
-					<h5 class="ui top attached header">{{.locale.Tr "admin.auths.tip.oauth2_provider"}}</h5>
-					<div class="ui attached segment">
-						<li>Bitbucket</li>
-						<span>{{.locale.Tr "admin.auths.tip.bitbucket"}}</span>
-						<li>Dropbox</li>
-						<span>{{.locale.Tr "admin.auths.tip.dropbox"}}</span>
-						<li>Facebook</li>
-						<span>{{.locale.Tr "admin.auths.tip.facebook"}}</span>
-						<li>GitHub</li>
-						<span>{{.locale.Tr "admin.auths.tip.github"}}</span>
-						<li>GitLab</li>
-						<span>{{.locale.Tr "admin.auths.tip.gitlab"}}</span>
-						<li>Google</li>
-						<span>{{.locale.Tr "admin.auths.tip.google_plus"}}</span>
-						<li>OpenID Connect</li>
-						<span>{{.locale.Tr "admin.auths.tip.openid_connect"}}</span>
-						<li>Twitter</li>
-						<span>{{.locale.Tr "admin.auths.tip.twitter"}}</span>
-						<li>Discord</li>
-						<span>{{.locale.Tr "admin.auths.tip.discord"}}</span>
-						<li>Gitea</li>
-						<span>{{.locale.Tr "admin.auths.tip.gitea"}}</span>
-						<li>Nextcloud</li>
-						<span>{{.locale.Tr "admin.auths.tip.nextcloud"}}</span>
-						<li>Yandex</li>
-						<span>{{.locale.Tr "admin.auths.tip.yandex"}}</span>
-						<li>Mastodon</li>
-						<span>{{.locale.Tr "admin.auths.tip.mastodon"}}</span>
-					</div>
-				</div>
+			<h5 class="ui top attached header">{{.locale.Tr "admin.auths.tip.oauth2_provider"}}</h5>
+			<div class="ui attached segment">
+				<li>Bitbucket</li>
+				<span>{{.locale.Tr "admin.auths.tip.bitbucket"}}</span>
+				<li>Dropbox</li>
+				<span>{{.locale.Tr "admin.auths.tip.dropbox"}}</span>
+				<li>Facebook</li>
+				<span>{{.locale.Tr "admin.auths.tip.facebook"}}</span>
+				<li>GitHub</li>
+				<span>{{.locale.Tr "admin.auths.tip.github"}}</span>
+				<li>GitLab</li>
+				<span>{{.locale.Tr "admin.auths.tip.gitlab"}}</span>
+				<li>Google</li>
+				<span>{{.locale.Tr "admin.auths.tip.google_plus"}}</span>
+				<li>OpenID Connect</li>
+				<span>{{.locale.Tr "admin.auths.tip.openid_connect"}}</span>
+				<li>Twitter</li>
+				<span>{{.locale.Tr "admin.auths.tip.twitter"}}</span>
+				<li>Discord</li>
+				<span>{{.locale.Tr "admin.auths.tip.discord"}}</span>
+				<li>Gitea</li>
+				<span>{{.locale.Tr "admin.auths.tip.gitea"}}</span>
+				<li>Nextcloud</li>
+				<span>{{.locale.Tr "admin.auths.tip.nextcloud"}}</span>
+				<li>Yandex</li>
+				<span>{{.locale.Tr "admin.auths.tip.yandex"}}</span>
+				<li>Mastodon</li>
+				<span>{{.locale.Tr "admin.auths.tip.mastodon"}}</span>
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index bb033c871886..40a0111bd9cc 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,434 +1,426 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin config">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.server_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.app_name"}}</dt>
-						<dd>{{AppName}}</dd>
-						<dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
-						<dd>{{AppVer}}{{.AppBuiltWith}}</dd>
-						<dt>{{.locale.Tr "admin.config.custom_conf"}}</dt>
-						<dd>{{.CustomConf}}</dd>
-						<dt>{{.locale.Tr "admin.config.app_url"}}</dt>
-						<dd>{{.AppUrl}}</dd>
-						<dt>{{.locale.Tr "admin.config.domain"}}</dt>
-						<dd>{{.Domain}}</dd>
-						<dt>{{.locale.Tr "admin.config.offline_mode"}}</dt>
-						<dd>{{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.disable_router_log"}}</dt>
-						<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.server_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.app_name"}}</dt>
+				<dd>{{AppName}}</dd>
+				<dt>{{.locale.Tr "admin.config.app_ver"}}</dt>
+				<dd>{{AppVer}}{{.AppBuiltWith}}</dd>
+				<dt>{{.locale.Tr "admin.config.custom_conf"}}</dt>
+				<dd>{{.CustomConf}}</dd>
+				<dt>{{.locale.Tr "admin.config.app_url"}}</dt>
+				<dd>{{.AppUrl}}</dd>
+				<dt>{{.locale.Tr "admin.config.domain"}}</dt>
+				<dd>{{.Domain}}</dd>
+				<dt>{{.locale.Tr "admin.config.offline_mode"}}</dt>
+				<dd>{{if .OfflineMode}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.disable_router_log"}}</dt>
+				<dd>{{if .DisableRouterLog}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<dt>{{.locale.Tr "admin.config.run_user"}}</dt>
-						<dd>{{.RunUser}}</dd>
-						<dt>{{.locale.Tr "admin.config.run_mode"}}</dt>
-						<dd>{{.RunMode}}</dd>
+				<dt>{{.locale.Tr "admin.config.run_user"}}</dt>
+				<dd>{{.RunUser}}</dd>
+				<dt>{{.locale.Tr "admin.config.run_mode"}}</dt>
+				<dd>{{.RunMode}}</dd>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<dt>{{.locale.Tr "admin.config.git_version"}}</dt>
-						<dd>{{.GitVersion}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_version"}}</dt>
+				<dd>{{.GitVersion}}</dd>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<dt>{{.locale.Tr "admin.config.repo_root_path"}}</dt>
-						<dd>{{.RepoRootPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.static_file_root_path"}}</dt>
-						<dd>{{.StaticRootPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.custom_file_root_path"}}</dt>
-						<dd>{{.CustomRootPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.log_file_root_path"}}</dt>
-						<dd>{{.LogRootPath}}</dd>
-						<dt>{{.locale.Tr "admin.config.script_type"}}</dt>
-						<dd>{{.ScriptType}}</dd>
-						<dt>{{.locale.Tr "admin.config.reverse_auth_user"}}</dt>
-						<dd>{{.ReverseProxyAuthUser}}</dd>
+				<dt>{{.locale.Tr "admin.config.repo_root_path"}}</dt>
+				<dd>{{.RepoRootPath}}</dd>
+				<dt>{{.locale.Tr "admin.config.static_file_root_path"}}</dt>
+				<dd>{{.StaticRootPath}}</dd>
+				<dt>{{.locale.Tr "admin.config.custom_file_root_path"}}</dt>
+				<dd>{{.CustomRootPath}}</dd>
+				<dt>{{.locale.Tr "admin.config.log_file_root_path"}}</dt>
+				<dd>{{.LogRootPath}}</dd>
+				<dt>{{.locale.Tr "admin.config.script_type"}}</dt>
+				<dd>{{.ScriptType}}</dd>
+				<dt>{{.locale.Tr "admin.config.reverse_auth_user"}}</dt>
+				<dd>{{.ReverseProxyAuthUser}}</dd>
 
-						{{if .EnvVars}}
-						<div class="ui divider"></div>
-						{{range .EnvVars}}
-						<dt>{{.Name}}</dt>
-						<dd>{{.Value}}</dd>
-						{{end}}
-						{{end}}
+				{{if .EnvVars}}
+				<div class="ui divider"></div>
+				{{range .EnvVars}}
+				<dt>{{.Name}}</dt>
+				<dd>{{.Value}}</dd>
+				{{end}}
+				{{end}}
 
-					</dl>
-				</div>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.ssh_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
-						<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{if not .SSH.Disabled}}
-							<dt>{{.locale.Tr "admin.config.ssh_start_builtin_server"}}</dt>
-							<dd>{{if .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-							<dt>{{.locale.Tr "admin.config.ssh_domain"}}</dt>
-							<dd>{{.SSH.Domain}}</dd>
-							<dt>{{.locale.Tr "admin.config.ssh_port"}}</dt>
-							<dd>{{.SSH.Port}}</dd>
-							<dt>{{.locale.Tr "admin.config.ssh_listen_port"}}</dt>
-							<dd>{{.SSH.ListenPort}}</dd>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.ssh_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.ssh_enabled"}}</dt>
+				<dd>{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{if not .SSH.Disabled}}
+					<dt>{{.locale.Tr "admin.config.ssh_start_builtin_server"}}</dt>
+					<dd>{{if .SSH.StartBuiltinServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+					<dt>{{.locale.Tr "admin.config.ssh_domain"}}</dt>
+					<dd>{{.SSH.Domain}}</dd>
+					<dt>{{.locale.Tr "admin.config.ssh_port"}}</dt>
+					<dd>{{.SSH.Port}}</dd>
+					<dt>{{.locale.Tr "admin.config.ssh_listen_port"}}</dt>
+					<dd>{{.SSH.ListenPort}}</dd>
 
-							{{if not .SSH.StartBuiltinServer}}
-								<dt>{{.locale.Tr "admin.config.ssh_root_path"}}</dt>
-								<dd>{{.SSH.RootPath}}</dd>
-								<dt>{{.locale.Tr "admin.config.ssh_key_test_path"}}</dt>
-								<dd>{{.SSH.KeyTestPath}}</dd>
-								<dt>{{.locale.Tr "admin.config.ssh_keygen_path"}}</dt>
-								<dd>{{.SSH.KeygenPath}}</dd>
-								<dt>{{.locale.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
-								<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-								{{if .SSH.MinimumKeySizeCheck}}
-									<dt>{{.locale.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
-									<dd>{{.SSH.MinimumKeySizes}}</dd>
-								{{end}}
-							{{end}}
+					{{if not .SSH.StartBuiltinServer}}
+						<dt>{{.locale.Tr "admin.config.ssh_root_path"}}</dt>
+						<dd>{{.SSH.RootPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.ssh_key_test_path"}}</dt>
+						<dd>{{.SSH.KeyTestPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.ssh_keygen_path"}}</dt>
+						<dd>{{.SSH.KeygenPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.ssh_minimum_key_size_check"}}</dt>
+						<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						{{if .SSH.MinimumKeySizeCheck}}
+							<dt>{{.locale.Tr "admin.config.ssh_minimum_key_sizes"}}</dt>
+							<dd>{{.SSH.MinimumKeySizes}}</dd>
 						{{end}}
-					</dl>
-				</div>
+					{{end}}
+				{{end}}
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.lfs_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
-						<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{if .LFS.StartServer}}
-							<dt>{{.locale.Tr "admin.config.lfs_content_path"}}</dt>
-							<dd>{{.LFS.Path}}</dd>
-							<dt>{{.locale.Tr "admin.config.lfs_http_auth_expiry"}}</dt>
-							<dd>{{.LFS.HTTPAuthExpiry}}</dd>
-						{{end}}
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.lfs_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.lfs_enabled"}}</dt>
+				<dd>{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{if .LFS.StartServer}}
+					<dt>{{.locale.Tr "admin.config.lfs_content_path"}}</dt>
+					<dd>{{.LFS.Path}}</dd>
+					<dt>{{.locale.Tr "admin.config.lfs_http_auth_expiry"}}</dt>
+					<dd>{{.LFS.HTTPAuthExpiry}}</dd>
+				{{end}}
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.db_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.db_type"}}</dt>
-						<dd>{{.DbCfg.Type}}</dd>
-						{{if not (eq .DbCfg.Type "sqlite3")}}
-							<dt>{{.locale.Tr "admin.config.db_host"}}</dt>
-							<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
-							<dt>{{.locale.Tr "admin.config.db_name"}}</dt>
-							<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
-							<dt>{{.locale.Tr "admin.config.db_user"}}</dt>
-							<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
-						{{end}}
-						{{if eq .DbCfg.Type "postgres"}}
-							<dt>{{.locale.Tr "admin.config.db_schema"}}</dt>
-							<dd>{{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}</dd>
-							<dt>{{.locale.Tr "admin.config.db_ssl_mode"}}</dt>
-							<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
-						{{end}}
-						{{if eq .DbCfg.Type "sqlite3"}}
-							<dt>{{.locale.Tr "admin.config.db_path"}}</dt>
-							<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
-						{{end}}
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.db_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.db_type"}}</dt>
+				<dd>{{.DbCfg.Type}}</dd>
+				{{if not (eq .DbCfg.Type "sqlite3")}}
+					<dt>{{.locale.Tr "admin.config.db_host"}}</dt>
+					<dd>{{if .DbCfg.Host}}{{.DbCfg.Host}}{{else}}-{{end}}</dd>
+					<dt>{{.locale.Tr "admin.config.db_name"}}</dt>
+					<dd>{{if .DbCfg.Name}}{{.DbCfg.Name}}{{else}}-{{end}}</dd>
+					<dt>{{.locale.Tr "admin.config.db_user"}}</dt>
+					<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
+				{{end}}
+				{{if eq .DbCfg.Type "postgres"}}
+					<dt>{{.locale.Tr "admin.config.db_schema"}}</dt>
+					<dd>{{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}</dd>
+					<dt>{{.locale.Tr "admin.config.db_ssl_mode"}}</dt>
+					<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
+				{{end}}
+				{{if eq .DbCfg.Type "sqlite3"}}
+					<dt>{{.locale.Tr "admin.config.db_path"}}</dt>
+					<dd>{{if .DbCfg.Path}}{{.DbCfg.Path}}{{else}}-{{end}}</dd>
+				{{end}}
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.service_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
-						<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
-						<dd>{{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.allow_only_internal_registration"}}</dt>
-						<dd>{{if .Service.AllowOnlyInternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.allow_only_external_registration"}}</dt>
-						<dd>{{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.show_registration_button"}}</dt>
-						<dd>{{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.enable_openid_signup"}}</dt>
-						<dd>{{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.enable_openid_signin"}}</dt>
-						<dd>{{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.require_sign_in_view"}}</dt>
-						<dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.mail_notify"}}</dt>
-						<dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.disable_key_size_check"}}</dt>
-						<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.enable_captcha"}}</dt>
-						<dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.default_keep_email_private"}}</dt>
-						<dd>{{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.default_allow_create_organization"}}</dt>
-						<dd>{{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.enable_timetracking"}}</dt>
-						<dd>{{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{if .Service.EnableTimetracking}}
-							<dt>{{.locale.Tr "admin.config.default_enable_timetracking"}}</dt>
-							<dd>{{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-							<dt>{{.locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
-							<dd>{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{end}}
-						<dt>{{.locale.Tr "admin.config.default_visibility_organization"}}</dt>
-						<dd>{{.Service.DefaultOrgVisibility}}</dd>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.service_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.register_email_confirm"}}</dt>
+				<dd>{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.disable_register"}}</dt>
+				<dd>{{if .Service.DisableRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.allow_only_internal_registration"}}</dt>
+				<dd>{{if .Service.AllowOnlyInternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.allow_only_external_registration"}}</dt>
+				<dd>{{if .Service.AllowOnlyExternalRegistration}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.show_registration_button"}}</dt>
+				<dd>{{if .Service.ShowRegistrationButton}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.enable_openid_signup"}}</dt>
+				<dd>{{if .Service.EnableOpenIDSignUp}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.enable_openid_signin"}}</dt>
+				<dd>{{if .Service.EnableOpenIDSignIn}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.require_sign_in_view"}}</dt>
+				<dd>{{if .Service.RequireSignInView}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.mail_notify"}}</dt>
+				<dd>{{if .Service.EnableNotifyMail}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.disable_key_size_check"}}</dt>
+				<dd>{{if .SSH.MinimumKeySizeCheck}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.enable_captcha"}}</dt>
+				<dd>{{if .Service.EnableCaptcha}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.default_keep_email_private"}}</dt>
+				<dd>{{if .Service.DefaultKeepEmailPrivate}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.default_allow_create_organization"}}</dt>
+				<dd>{{if .Service.DefaultAllowCreateOrganization}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.enable_timetracking"}}</dt>
+				<dd>{{if .Service.EnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{if .Service.EnableTimetracking}}
+					<dt>{{.locale.Tr "admin.config.default_enable_timetracking"}}</dt>
+					<dd>{{if .Service.DefaultEnableTimetracking}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+					<dt>{{.locale.Tr "admin.config.default_allow_only_contributors_to_track_time"}}</dt>
+					<dd>{{if .Service.DefaultAllowOnlyContributorsToTrackTime}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{end}}
+				<dt>{{.locale.Tr "admin.config.default_visibility_organization"}}</dt>
+				<dd>{{.Service.DefaultOrgVisibility}}</dd>
 
-						<dt>{{.locale.Tr "admin.config.no_reply_address"}}</dt>
-						<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.default_enable_dependencies"}}</dt>
-						<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.config.active_code_lives"}}</dt>
-						<dd>{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
-						<dt>{{.locale.Tr "admin.config.reset_password_code_lives"}}</dt>
-						<dd>{{.Service.ResetPwdCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
-					</dl>
-				</div>
+				<dt>{{.locale.Tr "admin.config.no_reply_address"}}</dt>
+				<dd>{{if .Service.NoReplyAddress}}{{.Service.NoReplyAddress}}{{else}}-{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.default_enable_dependencies"}}</dt>
+				<dd>{{if .Service.DefaultEnableDependencies}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.config.active_code_lives"}}</dt>
+				<dd>{{.Service.ActiveCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
+				<dt>{{.locale.Tr "admin.config.reset_password_code_lives"}}</dt>
+				<dd>{{.Service.ResetPwdCodeLives}} {{.locale.Tr "tool.raw_minutes"}}</dd>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.webhook_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
-						<dd>{{.Webhook.QueueLength}}</dd>
-						<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
-						<dd>{{.Webhook.DeliverTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.skip_tls_verify"}}</dt>
-						<dd>{{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.webhook_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.queue_length"}}</dt>
+				<dd>{{.Webhook.QueueLength}}</dd>
+				<dt>{{.locale.Tr "admin.config.deliver_timeout"}}</dt>
+				<dd>{{.Webhook.DeliverTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.skip_tls_verify"}}</dt>
+				<dd>{{if .Webhook.SkipTLSVerify}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.mailer_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
-						<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{if .MailerEnabled}}
-							<dt>{{.locale.Tr "admin.config.mailer_name"}}</dt>
-							<dd>{{.Mailer.Name}}</dd>
-							{{if eq .Mailer.Protocol "sendmail"}}
-								<dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt>
-								<dd>{{svg "octicon-check"}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt>
-								<dd>{{.Mailer.SendmailPath}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_sendmail_args"}}</dt>
-								<dd>{{.Mailer.SendmailArgs}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
-								<dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-							{{else if eq .Mailer.Protocol "dummy"}}
-								<dt>{{.locale.Tr "admin.config.mailer_use_dummy"}}</dt>
-								<dd>{{svg "octicon-check"}}</dd>
-							{{else}}{{/* SMTP family */}}
-								<dt>{{.locale.Tr "admin.config.mailer_protocol"}}</dt>
-								<dd>{{.Mailer.Protocol}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_enable_helo"}}</dt>
-								<dd>{{if .Mailer.EnableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_smtp_addr"}}</dt>
-								<dd>{{.Mailer.SMTPAddr}}</dd>
-								<dt>{{.locale.Tr "admin.config.mailer_smtp_port"}}</dt>
-								<dd>{{.Mailer.SMTPPort}}</dd>
-							{{end}}
-							<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
-							<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
-							<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
-								{{.CsrfTokenHtml}}
-								<div class="inline field ui left">
-									<div class="ui input">
-										<input type="email" name="email" placeholder="{{.locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
-									</div>
-								</div>
-								<button class="ui green button" id="test-mail-btn">{{.locale.Tr "admin.config.send_test_mail"}}</button>
-							</form>
-						{{end}}
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.mailer_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.mailer_enabled"}}</dt>
+				<dd>{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{if .MailerEnabled}}
+					<dt>{{.locale.Tr "admin.config.mailer_name"}}</dt>
+					<dd>{{.Mailer.Name}}</dd>
+					{{if eq .Mailer.Protocol "sendmail"}}
+						<dt>{{.locale.Tr "admin.config.mailer_use_sendmail"}}</dt>
+						<dd>{{svg "octicon-check"}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_sendmail_path"}}</dt>
+						<dd>{{.Mailer.SendmailPath}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_sendmail_args"}}</dt>
+						<dd>{{.Mailer.SendmailArgs}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
+						<dd>{{.Mailer.SendmailTimeout}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+					{{else if eq .Mailer.Protocol "dummy"}}
+						<dt>{{.locale.Tr "admin.config.mailer_use_dummy"}}</dt>
+						<dd>{{svg "octicon-check"}}</dd>
+					{{else}}{{/* SMTP family */}}
+						<dt>{{.locale.Tr "admin.config.mailer_protocol"}}</dt>
+						<dd>{{.Mailer.Protocol}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_enable_helo"}}</dt>
+						<dd>{{if .Mailer.EnableHelo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_smtp_addr"}}</dt>
+						<dd>{{.Mailer.SMTPAddr}}</dd>
+						<dt>{{.locale.Tr "admin.config.mailer_smtp_port"}}</dt>
+						<dd>{{.Mailer.SMTPPort}}</dd>
+					{{end}}
+					<dt>{{.locale.Tr "admin.config.mailer_user"}}</dt>
+					<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
+					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="inline field ui left">
+							<div class="ui input">
+								<input type="email" name="email" placeholder="{{.locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
+							</div>
+						</div>
+						<button class="ui green button" id="test-mail-btn">{{.locale.Tr "admin.config.send_test_mail"}}</button>
+					</form>
+				{{end}}
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.cache_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
-						<dd>{{.CacheAdapter}}</dd>
-						{{if eq .CacheAdapter "memory"}}
-							<dt>{{.locale.Tr "admin.config.cache_interval"}}</dt>
-							<dd>{{.CacheInterval}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						{{end}}
-						{{if .CacheConn}}
-							<dt>{{.locale.Tr "admin.config.cache_conn"}}</dt>
-							<dd><code>{{.CacheConn}}</code></dd>
-							<dt>{{.locale.Tr "admin.config.cache_item_ttl"}}</dt>
-							<dd><code>{{.CacheItemTTL}}</code></dd>
-						{{end}}
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.cache_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.cache_adapter"}}</dt>
+				<dd>{{.CacheAdapter}}</dd>
+				{{if eq .CacheAdapter "memory"}}
+					<dt>{{.locale.Tr "admin.config.cache_interval"}}</dt>
+					<dd>{{.CacheInterval}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				{{end}}
+				{{if .CacheConn}}
+					<dt>{{.locale.Tr "admin.config.cache_conn"}}</dt>
+					<dd><code>{{.CacheConn}}</code></dd>
+					<dt>{{.locale.Tr "admin.config.cache_item_ttl"}}</dt>
+					<dd><code>{{.CacheItemTTL}}</code></dd>
+				{{end}}
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.session_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
-						<dd>{{.SessionConfig.Provider}}</dd>
-						<dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
-						<dd><code>{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}</code></dd>
-						<dt>{{.locale.Tr "admin.config.cookie_name"}}</dt>
-						<dd>{{.SessionConfig.CookieName}}</dd>
-						<dt>{{.locale.Tr "admin.config.gc_interval_time"}}</dt>
-						<dd>{{.SessionConfig.Gclifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.session_life_time"}}</dt>
-						<dd>{{.SessionConfig.Maxlifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.https_only"}}</dt>
-						<dd>{{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.session_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.session_provider"}}</dt>
+				<dd>{{.SessionConfig.Provider}}</dd>
+				<dt>{{.locale.Tr "admin.config.provider_config"}}</dt>
+				<dd><code>{{if .SessionConfig.ProviderConfig}}{{.SessionConfig.ProviderConfig}}{{else}}-{{end}}</code></dd>
+				<dt>{{.locale.Tr "admin.config.cookie_name"}}</dt>
+				<dd>{{.SessionConfig.CookieName}}</dd>
+				<dt>{{.locale.Tr "admin.config.gc_interval_time"}}</dt>
+				<dd>{{.SessionConfig.Gclifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.session_life_time"}}</dt>
+				<dd>{{.SessionConfig.Maxlifetime}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.https_only"}}</dt>
+				<dd>{{if .SessionConfig.Secure}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.picture_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
-						<dd>
-							<div class="ui toggle checkbox">
-								<input type="checkbox" name="picture.disable_gravatar" version="{{.SystemSettings.GetVersion "picture.disable_gravatar"}}"{{if .SystemSettings.GetBool "picture.disable_gravatar"}} checked{{end}} title="{{.locale.Tr "admin.config.disable_gravatar"}}">
-							</div>
-						</dd>
-						<div class="ui divider"></div>
-						<dt>{{.locale.Tr "admin.config.enable_federated_avatar"}}</dt>
-						<dd>
-							<div class="ui toggle checkbox">
-								<input type="checkbox" name="picture.enable_federated_avatar" version="{{.SystemSettings.GetVersion "picture.enable_federated_avatar"}}"{{if .SystemSettings.GetBool "picture.enable_federated_avatar"}} checked{{end}} title="{{.locale.Tr "admin.config.enable_federated_avatar"}}">
-							</div>
-						</dd>
-					</dl>
-				</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.picture_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.disable_gravatar"}}</dt>
+				<dd>
+					<div class="ui toggle checkbox">
+						<input type="checkbox" name="picture.disable_gravatar" version="{{.SystemSettings.GetVersion "picture.disable_gravatar"}}"{{if .SystemSettings.GetBool "picture.disable_gravatar"}} checked{{end}} title="{{.locale.Tr "admin.config.disable_gravatar"}}">
+					</div>
+				</dd>
+				<div class="ui divider"></div>
+				<dt>{{.locale.Tr "admin.config.enable_federated_avatar"}}</dt>
+				<dd>
+					<div class="ui toggle checkbox">
+						<input type="checkbox" name="picture.enable_federated_avatar" version="{{.SystemSettings.GetVersion "picture.enable_federated_avatar"}}"{{if .SystemSettings.GetBool "picture.enable_federated_avatar"}} checked{{end}} title="{{.locale.Tr "admin.config.enable_federated_avatar"}}">
+					</div>
+				</dd>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.git_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
-						<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
-						<dd>{{.Git.MaxGitDiffLines}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_max_diff_line_characters"}}</dt>
-						<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_max_diff_files"}}</dt>
-						<dd>{{.Git.MaxGitDiffFiles}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_gc_args"}}</dt>
-						<dd><code>{{.Git.GCArgs}}</code></dd>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.git_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				<dt>{{.locale.Tr "admin.config.git_disable_diff_highlight"}}</dt>
+				<dd>{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_max_diff_lines"}}</dt>
+				<dd>{{.Git.MaxGitDiffLines}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_max_diff_line_characters"}}</dt>
+				<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_max_diff_files"}}</dt>
+				<dd>{{.Git.MaxGitDiffFiles}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_gc_args"}}</dt>
+				<dd><code>{{.Git.GCArgs}}</code></dd>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<dt>{{.locale.Tr "admin.config.git_enable_reflogs"}}</dt>
-						<dd>{{if .Git.Reflog.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_enable_reflogs"}}</dt>
+				<dd>{{if .Git.Reflog.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
 
-						{{if .Git.Reflog.Enabled}}
-							<dt>{{.locale.Tr "admin.config.git_reflog_expiry_time"}}</dt>
-							<dd>{{.locale.Tr "tool.days" .Git.Reflog.Expiration}}</dd>
-						{{end}}
+				{{if .Git.Reflog.Enabled}}
+					<dt>{{.locale.Tr "admin.config.git_reflog_expiry_time"}}</dt>
+					<dd>{{.locale.Tr "tool.days" .Git.Reflog.Expiration}}</dd>
+				{{end}}
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<dt>{{.locale.Tr "admin.config.git_migrate_timeout"}}</dt>
-						<dd>{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_mirror_timeout"}}</dt>
-						<dd>{{.Git.Timeout.Mirror}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_clone_timeout"}}</dt>
-						<dd>{{.Git.Timeout.Clone}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_pull_timeout"}}</dt>
-						<dd>{{.Git.Timeout.Pull}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-						<dt>{{.locale.Tr "admin.config.git_gc_timeout"}}</dt>
-						<dd>{{.Git.Timeout.GC}} {{.locale.Tr "tool.raw_seconds"}}</dd>
-					</dl>
-				</div>
+				<dt>{{.locale.Tr "admin.config.git_migrate_timeout"}}</dt>
+				<dd>{{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_mirror_timeout"}}</dt>
+				<dd>{{.Git.Timeout.Mirror}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_clone_timeout"}}</dt>
+				<dd>{{.Git.Timeout.Clone}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_pull_timeout"}}</dt>
+				<dd>{{.Git.Timeout.Pull}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+				<dt>{{.locale.Tr "admin.config.git_gc_timeout"}}</dt>
+				<dd>{{.Git.Timeout.GC}} {{.locale.Tr "tool.raw_seconds"}}</dd>
+			</dl>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.config.log_config"}}
-				</h4>
-				<div class="ui attached table segment">
-					<dl class="dl-horizontal admin-dl-horizontal">
-						{{range .Loggers.default.SubLogDescriptions}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.config.log_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="dl-horizontal admin-dl-horizontal">
+				{{range .Loggers.default.SubLogDescriptions}}
+					<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+					<dd>{{.Name}} ({{.Provider}})</dd>
+					<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+					<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
+				{{end}}
+				<div class="ui divider"></div>
+				<dt>{{$.locale.Tr "admin.config.router_log_mode"}}</dt>
+				{{if .DisableRouterLog}}
+					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+				{{else}}
+					{{if .Loggers.router.SubLogDescriptions}}
+						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+						{{range .Loggers.router.SubLogDescriptions}}
 							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
 							<dd>{{.Name}} ({{.Provider}})</dd>
 							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
 							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 						{{end}}
-						<div class="ui divider"></div>
-						<dt>{{$.locale.Tr "admin.config.router_log_mode"}}</dt>
-						{{if .DisableRouterLog}}
-							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
-						{{else}}
-							{{if .Loggers.router.SubLogDescriptions}}
-								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-								{{range .Loggers.router.SubLogDescriptions}}
-									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-									<dd>{{.Name}} ({{.Provider}})</dd>
-									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
-								{{end}}
-							{{else}}
-								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-							{{end}}
-						{{end}}
-						<div class="ui divider"></div>
-						<dt>{{$.locale.Tr "admin.config.access_log_mode"}}</dt>
-						{{if .EnableAccessLog}}
-							{{if .Loggers.access.SubLogDescriptions}}
-								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-								{{range .Loggers.access.SubLogDescriptions}}
-									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-									<dd>{{.Name}} ({{.Provider}})</dd>
-									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
-								{{end}}
-							{{else}}
-								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-							{{end}}
-							<dt>{{$.locale.Tr "admin.config.access_log_template"}}</dt>
-							<dd><code>{{$.AccessLogTemplate}}</code></dd>
-						{{else}}
-							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+					{{else}}
+						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+					{{end}}
+				{{end}}
+				<div class="ui divider"></div>
+				<dt>{{$.locale.Tr "admin.config.access_log_mode"}}</dt>
+				{{if .EnableAccessLog}}
+					{{if .Loggers.access.SubLogDescriptions}}
+						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+						{{range .Loggers.access.SubLogDescriptions}}
+							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+							<dd>{{.Name}} ({{.Provider}})</dd>
+							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 						{{end}}
-						<div class="ui divider"></div>
-						<dt>{{$.locale.Tr "admin.config.xorm_log_mode"}}</dt>
-						{{if .EnableXORMLog}}
-							{{if .Loggers.xorm.SubLogDescriptions}}
-								<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
-								{{range .Loggers.xorm.SubLogDescriptions}}
-									<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
-									<dd>{{.Name}} ({{.Provider}})</dd>
-									<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
-									<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
-								{{end}}
-							{{else}}
-								<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
-							{{end}}
-							<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
-							<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
-						{{else}}
-							<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+					{{else}}
+						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+					{{end}}
+					<dt>{{$.locale.Tr "admin.config.access_log_template"}}</dt>
+					<dd><code>{{$.AccessLogTemplate}}</code></dd>
+				{{else}}
+					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+				{{end}}
+				<div class="ui divider"></div>
+				<dt>{{$.locale.Tr "admin.config.xorm_log_mode"}}</dt>
+				{{if .EnableXORMLog}}
+					{{if .Loggers.xorm.SubLogDescriptions}}
+						<dd>{{$.locale.Tr "admin.config.own_named_logger"}}</dd>
+						{{range .Loggers.xorm.SubLogDescriptions}}
+							<dt>{{$.locale.Tr "admin.config.log_mode"}}</dt>
+							<dd>{{.Name}} ({{.Provider}})</dd>
+							<dt>{{$.locale.Tr "admin.config.log_config"}}</dt>
+							<dd><pre>{{.Config | JsonPrettyPrint}}</pre></dd>
 						{{end}}
-					</dl>
-				</div>
-			</div>
+					{{else}}
+						<dd>{{$.locale.Tr "admin.config.routes_to_default_logger"}}</dd>
+					{{end}}
+					<dt>{{$.locale.Tr "admin.config.xorm_log_sql"}}</dt>
+					<dd>{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+				{{else}}
+					<dd>{{$.locale.Tr "admin.config.disabled_logger"}}</dd>
+				{{end}}
+			</dl>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index c72b34860fed..56c11be3ad1c 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,109 +1,101 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui right floated secondary filter menu">
-					<!-- Sort -->
-						<div class="ui dropdown type jump item">
-							<span class="text">
-								{{.locale.Tr "repo.issues.filter_sort"}}
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-							</span>
-							<div class="menu">
-								<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a>
-								<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>
-								<a class="{{if eq .SortType "username"}}active {{end}}item" href="{{$.Link}}?sort=username&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name"}}</a>
-								<a class="{{if eq .SortType "reverseusername"}}active {{end}}item" href="{{$.Link}}?sort=reverseusername&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name_reverse"}}</a>
-							</div>
-						</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui right floated secondary filter menu">
+			<!-- Sort -->
+				<div class="ui dropdown type jump item">
+					<span class="text">
+						{{.locale.Tr "repo.issues.filter_sort"}}
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+					</span>
+					<div class="menu">
+						<a class="{{if or (eq .SortType "email") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=email&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email"}}</a>
+						<a class="{{if eq .SortType "reverseemail"}}active {{end}}item" href="{{$.Link}}?sort=reverseemail&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.email_reverse"}}</a>
+						<a class="{{if eq .SortType "username"}}active {{end}}item" href="{{$.Link}}?sort=username&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name"}}</a>
+						<a class="{{if eq .SortType "reverseusername"}}active {{end}}item" href="{{$.Link}}?sort=reverseusername&q={{$.Keyword}}">{{.locale.Tr "admin.emails.filter_sort.name_reverse"}}</a>
 					</div>
-					<form class="ui form ignore-dirty"  style="max-width: 90%">
-						<div class="ui fluid action input">
-							<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-						</div>
-					</form>
 				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th data-sortt-asc="username" data-sortt-desc="reverseusername">
-									{{.locale.Tr "admin.users.name"}}
-									{{SortArrow "username" "reverseusername" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.users.full_name"}}</th>
-								<th data-sortt-asc="email" data-sortt-desc="reverseemail" data-sortt-default="true">
-									{{.locale.Tr "email"}}
-									{{SortArrow "email" "reverseemail" $.SortType true}}
-								</th>
-								<th>{{.locale.Tr "admin.emails.primary"}}</th>
-								<th>{{.locale.Tr "admin.emails.activated"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Emails}}
-								<tr>
-									<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
-									<td><span class="text truncate">{{.FullName}}</span></td>
-									<td><span class="text email">{{.Email}}</span></td>
-									<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>
-										{{if .CanChange}}
-											<a class="link-email-action" href data-uid="{{.UID}}"
-												data-email="{{.Email}}"
-												data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
-												data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
-												{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-											</a>
-										{{else}}
-											{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
-										{{end}}
-									</td>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
+			</div>
+			<form class="ui form ignore-dirty"  style="max-width: 90%">
+				<div class="ui fluid action input">
+					<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
 				</div>
+			</form>
+		</div>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th data-sortt-asc="username" data-sortt-desc="reverseusername">
+							{{.locale.Tr "admin.users.name"}}
+							{{SortArrow "username" "reverseusername" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.users.full_name"}}</th>
+						<th data-sortt-asc="email" data-sortt-desc="reverseemail" data-sortt-default="true">
+							{{.locale.Tr "email"}}
+							{{SortArrow "email" "reverseemail" $.SortType true}}
+						</th>
+						<th>{{.locale.Tr "admin.emails.primary"}}</th>
+						<th>{{.locale.Tr "admin.emails.activated"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Emails}}
+						<tr>
+							<td><a href="{{AppSubUrl}}/{{.Name | PathEscape}}">{{.Name}}</a></td>
+							<td><span class="text truncate">{{.FullName}}</span></td>
+							<td><span class="text email">{{.Email}}</span></td>
+							<td>{{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>
+								{{if .CanChange}}
+									<a class="link-email-action" href data-uid="{{.UID}}"
+										data-email="{{.Email}}"
+										data-primary="{{if .IsPrimary}}1{{else}}0{{end}}"
+										data-activate="{{if .IsActivated}}0{{else}}1{{end}}">
+										{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
+									</a>
+								{{else}}
+									{{if .IsActivated}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
+								{{end}}
+							</td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
+		</div>
 
-				{{template "base/paginate" .}}
+		{{template "base/paginate" .}}
 
-				<div class="ui basic modal" id="change-email-modal">
-					<div class="ui icon header">
-						{{.locale.Tr "admin.emails.change_email_header"}}
-					</div>
-					<div class="content center">
-						<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
+		<div class="ui basic modal" id="change-email-modal">
+			<div class="ui icon header">
+				{{.locale.Tr "admin.emails.change_email_header"}}
+			</div>
+			<div class="content center">
+				<p class="center">{{.locale.Tr "admin.emails.change_email_text"}}</p>
 
-						<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
-							{{$.CsrfTokenHtml}}
+				<form class="ui form" id="email-action-form" action="{{AppSubUrl}}/admin/emails/activate" method="post">
+					{{$.CsrfTokenHtml}}
 
-							<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
-							<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
-							<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
-							<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
+					<input type="hidden" id="query-sort" name="sort" value="{{.SortType}}">
+					<input type="hidden" id="query-keyword" name="q" value="{{.Keyword}}">
+					<input type="hidden" id="query-primary" name="is_primary" value="{{.IsPrimary}}" required>
+					<input type="hidden" id="query-activated" name="is_activated" value="{{.IsActivated}}" required>
 
-							<input type="hidden" id="form-uid" name="uid" value="" required>
-							<input type="hidden" id="form-email" name="email" value="" required>
-							<input type="hidden" id="form-primary" name="primary" value="" required>
-							<input type="hidden" id="form-activate" name="activate" value="" required>
+					<input type="hidden" id="form-uid" name="uid" value="" required>
+					<input type="hidden" id="form-email" name="email" value="" required>
+					<input type="hidden" id="form-primary" name="primary" value="" required>
+					<input type="hidden" id="form-activate" name="activate" value="" required>
 
-							<div class="center">
-								{{template "base/delete_modal_actions" .}}
-							</div>
-						</form>
+					<div class="center">
+						{{template "base/delete_modal_actions" .}}
 					</div>
-				</div>
-
+				</form>
 			</div>
 		</div>
+
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index cbff3756489f..34dd9479fcb5 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,63 +1,55 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{if .PageIsAdminDefaultHooksNew}}
-						{{.locale.Tr "admin.defaulthooks.add_webhook"}}
-					{{else if .PageIsAdminSystemHooksNew}}
-						{{.locale.Tr "admin.systemhooks.add_webhook"}}
-					{{else if .Webhook.IsSystemWebhook}}
-						{{.locale.Tr "admin.systemhooks.update_webhook"}}
-					{{else}}
-						{{.locale.Tr "admin.defaulthooks.update_webhook"}}
-					{{end}}
-					<div class="ui right">
-						{{if eq .HookType "gitea"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-						{{else if eq .HookType "gogs"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-						{{else if eq .HookType "slack"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-						{{else if eq .HookType "discord"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-						{{else if eq .HookType "dingtalk"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-						{{else if eq .HookType "telegram"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-						{{else if eq .HookType "msteams"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-						{{else if eq .HookType "feishu"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-						{{else if eq .HookType "matrix"}}
-							{{svg "gitea-matrix" 26}}
-						{{else if eq .HookType "wechatwork"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-						{{else if eq .HookType "packagist"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-						{{end}}
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					{{template "repo/settings/webhook/gitea" .}}
-					{{template "repo/settings/webhook/gogs" .}}
-					{{template "repo/settings/webhook/slack" .}}
-					{{template "repo/settings/webhook/discord" .}}
-					{{template "repo/settings/webhook/dingtalk" .}}
-					{{template "repo/settings/webhook/telegram" .}}
-					{{template "repo/settings/webhook/msteams" .}}
-					{{template "repo/settings/webhook/feishu" .}}
-					{{template "repo/settings/webhook/matrix" .}}
-					{{template "repo/settings/webhook/wechatwork" .}}
-					{{template "repo/settings/webhook/packagist" .}}
-				</div>
-
-				{{template "repo/settings/webhook/history" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{if .PageIsAdminDefaultHooksNew}}
+				{{.locale.Tr "admin.defaulthooks.add_webhook"}}
+			{{else if .PageIsAdminSystemHooksNew}}
+				{{.locale.Tr "admin.systemhooks.add_webhook"}}
+			{{else if .Webhook.IsSystemWebhook}}
+				{{.locale.Tr "admin.systemhooks.update_webhook"}}
+			{{else}}
+				{{.locale.Tr "admin.defaulthooks.update_webhook"}}
+			{{end}}
+			<div class="ui right">
+				{{if eq .HookType "gitea"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+				{{else if eq .HookType "gogs"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+				{{else if eq .HookType "slack"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+				{{else if eq .HookType "discord"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+				{{else if eq .HookType "dingtalk"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+				{{else if eq .HookType "telegram"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+				{{else if eq .HookType "msteams"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+				{{else if eq .HookType "feishu"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+				{{else if eq .HookType "matrix"}}
+					{{svg "gitea-matrix" 26}}
+				{{else if eq .HookType "wechatwork"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+				{{else if eq .HookType "packagist"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+				{{end}}
 			</div>
+		</h4>
+		<div class="ui attached segment">
+			{{template "repo/settings/webhook/gitea" .}}
+			{{template "repo/settings/webhook/gogs" .}}
+			{{template "repo/settings/webhook/slack" .}}
+			{{template "repo/settings/webhook/discord" .}}
+			{{template "repo/settings/webhook/dingtalk" .}}
+			{{template "repo/settings/webhook/telegram" .}}
+			{{template "repo/settings/webhook/msteams" .}}
+			{{template "repo/settings/webhook/feishu" .}}
+			{{template "repo/settings/webhook/matrix" .}}
+			{{template "repo/settings/webhook/wechatwork" .}}
+			{{template "repo/settings/webhook/packagist" .}}
 		</div>
+
+		{{template "repo/settings/webhook/history" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index 41b743c56c6a..ca88c90b52c8 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,17 +1,9 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
+	<div class="admin-main-content">
 
-				{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
-				{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
+		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
+		{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
 
-				{{template "repo/settings/webhook/delete_modal" .}}
-			</div>
-		</div>
+		{{template "repo/settings/webhook/delete_modal" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index c9a43c3bad2b..8279b020a304 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,44 +1,37 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "admin/cron" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queues"}}
-				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
-								<th></th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Queues}}
-								<tr>
-									<td>{{.Name}}</td>
-									<td>{{.Type}}</td>
-									<td>{{.ExemplarType}}</td>
-									<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-									<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-									<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
-				</div>
-
-				{{template "admin/process" .}}
-			</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-main-content">
+		{{template "admin/cron" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queues"}}
+		</h4>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Queues}}
+						<tr>
+							<td>{{.Name}}</td>
+							<td>{{.Type}}</td>
+							<td>{{.ExemplarType}}</td>
+							<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+							<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+							<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
+
+		{{template "admin/process" .}}
 	</div>
 </div>
 <div class="ui small basic delete modal">
@@ -51,5 +44,4 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 0f77ff854f77..dfe9d4b03ba0 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,77 +1,70 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin notice">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
-				</h4>
-				<div class="ui attached table segment">
-					<table id="notice-table" class="ui very basic select selectable table unstackable">
-						<thead>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
+		</h4>
+		<div class="ui attached table segment">
+			<table id="notice-table" class="ui very basic select selectable table unstackable">
+				<thead>
+					<tr>
+						<th></th>
+						<th>ID</th>
+						<th>{{.locale.Tr "admin.notices.type"}}</th>
+						<th>{{.locale.Tr "admin.notices.desc"}}</th>
+						<th width="100px">{{.locale.Tr "admin.users.created"}}</th>
+						<th>{{.locale.Tr "admin.notices.op"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Notices}}
+						<tr>
+							<td class="collapsing">
+								<div class="ui fitted checkbox" data-id="{{.ID}}">
+									<input type="checkbox">
+								</div>
+							</td>
+							<td>{{.ID}}</td>
+							<td>{{$.locale.Tr .TrStr}}</td>
+							<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+							<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+				{{if .Notices}}
+					<tfoot class="full-width">
 							<tr>
 								<th></th>
-								<th>ID</th>
-								<th>{{.locale.Tr "admin.notices.type"}}</th>
-								<th>{{.locale.Tr "admin.notices.desc"}}</th>
-								<th width="100px">{{.locale.Tr "admin.users.created"}}</th>
-								<th>{{.locale.Tr "admin.notices.op"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Notices}}
-								<tr>
-									<td class="collapsing">
-										<div class="ui fitted checkbox" data-id="{{.ID}}">
-											<input type="checkbox">
-										</div>
-									</td>
-									<td>{{.ID}}</td>
-									<td>{{$.locale.Tr .TrStr}}</td>
-									<td class="view-detail"><span class="notice-description text truncate">{{.Description}}</span></td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-									<td><a href="#">{{svg "octicon-note" 16 "view-detail"}}</a></td>
-								</tr>
-							{{end}}
-						</tbody>
-						{{if .Notices}}
-							<tfoot class="full-width">
-									<tr>
-										<th></th>
-										<th colspan="5">
-											<form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
-												{{.CsrfTokenHtml}}
-												<button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
-											</form>
-											<div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
-												<span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
-												<div class="menu">
-													<div class="item select action" data-action="select-all">
-														{{.locale.Tr "admin.notices.select_all"}}
-													</div>
-													<div class="item select action" data-action="deselect-all">
-														{{.locale.Tr "admin.notices.deselect_all"}}
-													</div>
-													<div class="item select action" data-action="inverse">
-														{{.locale.Tr "admin.notices.inverse_selection"}}
-													</div>
-												</div>
+								<th colspan="5">
+									<form class="ui right" method="post" action="{{AppSubUrl}}/admin/notices/empty">
+										{{.CsrfTokenHtml}}
+										<button type="submit" class="ui red small button">{{.locale.Tr "admin.notices.delete_all"}}</button>
+									</form>
+									<div class="ui floating upward dropdown small button">{{/* TODO: Make this dropdown accessible */}}
+										<span class="text">{{.locale.Tr "admin.notices.operations"}}</span>
+										<div class="menu">
+											<div class="item select action" data-action="select-all">
+												{{.locale.Tr "admin.notices.select_all"}}
 											</div>
-											<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
-												{{.locale.Tr "admin.notices.delete_selected"}}
-											</button>
-										</th>
-									</tr>
-							</tfoot>
-						{{end}}
-					</table>
-				</div>
-
-				{{template "base/paginate" .}}
-			</div>
+											<div class="item select action" data-action="deselect-all">
+												{{.locale.Tr "admin.notices.deselect_all"}}
+											</div>
+											<div class="item select action" data-action="inverse">
+												{{.locale.Tr "admin.notices.inverse_selection"}}
+											</div>
+										</div>
+									</div>
+									<button class="ui small teal button" id="delete-selection" data-link="{{.Link}}/delete" data-redirect="{{.Link}}?page={{.Page.Paginater.Current}}">
+										{{.locale.Tr "admin.notices.delete_selected"}}
+									</button>
+								</th>
+							</tr>
+					</tfoot>
+				{{end}}
+			</table>
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
 </div>
 
@@ -82,5 +75,4 @@
 		<div class="sub header"></div>
 		<pre></pre>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 2d568b2c5aa4..fcff4a951c9c 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,62 +1,54 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					{{template "admin/base/search" .}}
-				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
-								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
-									{{.locale.Tr "admin.orgs.name"}}
-									{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
-								</th>
-								<th>{{.locale.Tr "admin.orgs.teams"}}</th>
-								<th>{{.locale.Tr "admin.orgs.members"}}</th>
-								<th>{{.locale.Tr "admin.users.repos"}}</th>
-								<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
-									{{.locale.Tr "admin.users.created"}}
-									{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.users.edit"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Users}}
-								<tr>
-									<td>{{.ID}}</td>
-									<td>
-										<a href="{{.HomeLink}}">{{.Name}}</a>
-										{{if .Visibility.IsPrivate}}
-											<span class="text gold">{{svg "octicon-lock"}}</span>
-										{{end}}
-									</td>
-									<td>{{.NumTeams}}</td>
-									<td>{{.NumMembers}}</td>
-									<td>{{.NumRepos}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-									<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
-				</div>
-
-				{{template "base/paginate" .}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
 			</div>
+		</h4>
+		<div class="ui attached segment">
+			{{template "admin/base/search" .}}
+		</div>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
+						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
+							{{.locale.Tr "admin.orgs.name"}}
+							{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
+						</th>
+						<th>{{.locale.Tr "admin.orgs.teams"}}</th>
+						<th>{{.locale.Tr "admin.orgs.members"}}</th>
+						<th>{{.locale.Tr "admin.users.repos"}}</th>
+						<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
+							{{.locale.Tr "admin.users.created"}}
+							{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.users.edit"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Users}}
+						<tr>
+							<td>{{.ID}}</td>
+							<td>
+								<a href="{{.HomeLink}}">{{.Name}}</a>
+								{{if .Visibility.IsPrivate}}
+									<span class="text gold">{{svg "octicon-lock"}}</span>
+								{{end}}
+							</td>
+							<td>{{.NumTeams}}</td>
+							<td>{{.NumMembers}}</td>
+							<td>{{.NumRepos}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+							<td><a href="{{.OrganisationLink}}/settings">{{svg "octicon-pencil"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 21eec70dc35d..5adbce296e91 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,86 +1,79 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
-					{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
-					{{.locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form ignore-dirty">
-						<div class="ui fluid action input">
-							<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-							<select class="ui dropdown" name="type">
-								<option value="">{{.locale.Tr "packages.filter.type"}}</option>
-								<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
-								{{range $type := .AvailableTypes}}
-								<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
-								{{end}}
-							</select>
-							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-						</div>
-					</form>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
+			{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
+			{{.locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}})
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form ignore-dirty">
+				<div class="ui fluid action input">
+					<input name="q" value="{{.Query}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+					<select class="ui dropdown" name="type">
+						<option value="">{{.locale.Tr "packages.filter.type"}}</option>
+						<option value="all">{{.locale.Tr "packages.filter.type.all"}}</option>
+						{{range $type := .AvailableTypes}}
+						<option{{if eq $.PackageType $type}} selected="selected"{{end}} value="{{$type}}">{{$type.Name}}</option>
+						{{end}}
+					</select>
+					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
 				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th>ID</th>
-								<th>{{.locale.Tr "admin.packages.owner"}}</th>
-								<th>{{.locale.Tr "admin.packages.type"}}</th>
-								<th data-sortt-asc="name_asc" data-sortt-desc="name_desc">
-									{{.locale.Tr "admin.packages.name"}}
-									{{SortArrow "name_asc" "name_desc" .SortType false}}
-								</th>
-								<th data-sortt-asc="version_desc" data-sortt-desc="version_asc">
-									{{.locale.Tr "admin.packages.version"}}
-									{{SortArrow "version_desc" "version_asc" .SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.packages.creator"}}</th>
-								<th>{{.locale.Tr "admin.packages.repository"}}</th>
-								<th>{{.locale.Tr "admin.packages.size"}}</th>
-								<th data-sortt-asc="created_asc" data-sortt-desc="created_desc">
-									{{.locale.Tr "admin.packages.published"}}
-									{{SortArrow "created_asc" "created_desc" .SortType true}}
-								</th>
-								<th>{{.locale.Tr "admin.notices.op"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .PackageDescriptors}}
-								<tr>
-									<td>{{.Version.ID}}</td>
-									<td>
-										<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
-										{{if .Owner.Visibility.IsPrivate}}
-											<span class="text gold">{{svg "octicon-lock"}}</span>
-										{{end}}
-									</td>
-									<td>{{.Package.Type.Name}}</td>
-									<td class="text truncate email">{{.Package.Name}}</td>
-									<td><a href="{{.FullWebLink}}" class="text truncate email">{{.Version.Version}}</a></td>
-									<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
-									<td>
-									{{if .Repository}}
-										<a href="{{.Repository.Link}}">{{.Repository.Name}}</a>
-									{{end}}
-									</td>
-									<td>{{FileSize .CalculateBlobSize}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
-									<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
-								</tr>
+			</form>
+		</div>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th>ID</th>
+						<th>{{.locale.Tr "admin.packages.owner"}}</th>
+						<th>{{.locale.Tr "admin.packages.type"}}</th>
+						<th data-sortt-asc="name_asc" data-sortt-desc="name_desc">
+							{{.locale.Tr "admin.packages.name"}}
+							{{SortArrow "name_asc" "name_desc" .SortType false}}
+						</th>
+						<th data-sortt-asc="version_desc" data-sortt-desc="version_asc">
+							{{.locale.Tr "admin.packages.version"}}
+							{{SortArrow "version_desc" "version_asc" .SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.packages.creator"}}</th>
+						<th>{{.locale.Tr "admin.packages.repository"}}</th>
+						<th>{{.locale.Tr "admin.packages.size"}}</th>
+						<th data-sortt-asc="created_asc" data-sortt-desc="created_desc">
+							{{.locale.Tr "admin.packages.published"}}
+							{{SortArrow "created_asc" "created_desc" .SortType true}}
+						</th>
+						<th>{{.locale.Tr "admin.notices.op"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .PackageDescriptors}}
+						<tr>
+							<td>{{.Version.ID}}</td>
+							<td>
+								<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
+								{{if .Owner.Visibility.IsPrivate}}
+									<span class="text gold">{{svg "octicon-lock"}}</span>
+								{{end}}
+							</td>
+							<td>{{.Package.Type.Name}}</td>
+							<td class="text truncate email">{{.Package.Name}}</td>
+							<td><a href="{{.FullWebLink}}" class="text truncate email">{{.Version.Version}}</a></td>
+							<td><a href="{{.Creator.HomeLink}}">{{.Creator.Name}}</a></td>
+							<td>
+							{{if .Repository}}
+								<a href="{{.Repository.Link}}">{{.Repository.Name}}</a>
 							{{end}}
-						</tbody>
-					</table>
-				</div>
-
-				{{template "base/paginate" .}}
-			</div>
+							</td>
+							<td>{{FileSize .CalculateBlobSize}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .Version.CreatedUnix.FormatLong "Fallback" .Version.CreatedUnix.FormatShort)}}</td>
+							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
 </div>
 
@@ -93,5 +86,4 @@
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index d3d50132536d..0b1584392aed 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,187 +1,180 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
-				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
-						<thead>
-							<tr>
-								<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>{{.Queue.Name}}</td>
-								<td>{{.Queue.Type}}</td>
-								<td>{{.Queue.ExemplarType}}</td>
-								<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-								<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
-								<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-							</tr>
-						</tbody>
-					</table>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
+		</h4>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table">
+				<thead>
+					<tr>
+						<th>{{.locale.Tr "admin.monitor.queue.name"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.type"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.exemplar"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.maxnumberworkers"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.numberinqueue"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td>{{.Queue.Name}}</td>
+						<td>{{.Queue.Type}}</td>
+						<td>{{.Queue.ExemplarType}}</td>
+						<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+						<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
+						<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		{{if lt $sum 0}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.nopool.title"}}
+		</h4>
+		<div class="ui attached segment">
+			{{if eq .Queue.Type "wrapped"}}
+			<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
+			{{else if eq .Queue.Type "persistable-channel"}}
+			<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
+			{{else}}
+			<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
+			{{end}}
+		</div>
+		{{else}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.settings.title"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
+			<form method="POST" action="{{.Link}}/set">
+				{{$.CsrfTokenHtml}}
+				<div class="ui form">
+					<div class="inline field">
+						<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
+						<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
+					</div>
+					<div class="inline field">
+						<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
+						<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
+					</div>
+					<div class="inline field">
+						<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
+						<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
+					</div>
+					<div class="inline field">
+						<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
+						<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
+					</div>
+					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
 				</div>
-				{{if lt $sum 0}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.nopool.title"}}
-				</h4>
-				<div class="ui attached segment">
-					{{if eq .Queue.Type "wrapped"}}
-					<p>{{.locale.Tr "admin.monitor.queue.wrapped.desc"}}</p>
-					{{else if eq .Queue.Type "persistable-channel"}}
-					<p>{{.locale.Tr "admin.monitor.queue.persistable-channel.desc"}}</p>
-					{{else}}
-					<p>{{.locale.Tr "admin.monitor.queue.nopool.desc"}}</p>
-					{{end}}
+			</form>
+		</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
+			<form method="POST" action="{{.Link}}/add">
+				{{$.CsrfTokenHtml}}
+				<div class="ui form">
+					<div class="fields">
+						<div class="field">
+							<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
+							<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
+						</div>
+						<div class="field">
+							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
+							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
+						</div>
+					</div>
+					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
 				</div>
-				{{else}}
+			</form>
+		</div>
+		{{if .Queue.Pausable}}
+			{{if .Queue.IsPaused}}
 				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.settings.title"}}
+					{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
 				</h4>
 				<div class="ui attached segment">
-					<p>{{.locale.Tr "admin.monitor.queue.settings.desc"}}</p>
-					<form method="POST" action="{{.Link}}/set">
+					<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
+					<form method="POST" action="{{.Link}}/resume">
 						{{$.CsrfTokenHtml}}
 						<div class="ui form">
-							<div class="inline field">
-								<label for="max-number">{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers"}}</label>
-								<input name="max-number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.maxnumberworkers.placeholder" .Queue.MaxNumberOfWorkers}}">
-							</div>
-							<div class="inline field">
-								<label for="timeout">{{.locale.Tr "admin.monitor.queue.settings.timeout"}}</label>
-								<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.timeout.placeholder" .Queue.BoostTimeout}}">
-							</div>
-							<div class="inline field">
-								<label for="number">{{.locale.Tr "admin.monitor.queue.settings.numberworkers"}}</label>
-								<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.settings.numberworkers.placeholder" .Queue.BoostWorkers}}">
-							</div>
-							<div class="inline field">
-								<label>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout"}}</label>
-								<span>{{.locale.Tr "admin.monitor.queue.settings.blocktimeout.value" .Queue.BlockTimeout}}</span>
-							</div>
-							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.settings.submit"}}</button>
+							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
 						</div>
 					</form>
 				</div>
+			{{else}}
 				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.pool.addworkers.title"}}
+					{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
 				</h4>
 				<div class="ui attached segment">
-					<p>{{.locale.Tr "admin.monitor.queue.pool.addworkers.desc"}}</p>
-					<form method="POST" action="{{.Link}}/add">
+					<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
+					<form method="POST" action="{{.Link}}/pause">
 						{{$.CsrfTokenHtml}}
 						<div class="ui form">
-							<div class="fields">
-								<div class="field">
-									<label>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</label>
-									<input name="number" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.numberworkers.placeholder"}}">
-								</div>
-								<div class="field">
-									<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
-									<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
-								</div>
-							</div>
-							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.addworkers.submit"}}</button>
+							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
 						</div>
 					</form>
 				</div>
-				{{if .Queue.Pausable}}
-					{{if .Queue.IsPaused}}
-						<h4 class="ui top attached header">
-							{{.locale.Tr "admin.monitor.queue.pool.resume.title"}}
-						</h4>
-						<div class="ui attached segment">
-							<p>{{.locale.Tr "admin.monitor.queue.pool.resume.desc"}}</p>
-							<form method="POST" action="{{.Link}}/resume">
-								{{$.CsrfTokenHtml}}
-								<div class="ui form">
-									<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.resume.submit"}}</button>
-								</div>
-							</form>
+			{{end}}
+		{{end}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
+			<form method="POST" action="{{.Link}}/flush">
+				{{$.CsrfTokenHtml}}
+				<div class="ui form">
+					<div class="fields">
+						<div class="field">
+							<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
+							<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
 						</div>
+					</div>
+					<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
+				</div>
+			</form>
+		</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
+		</h4>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table">
+				<thead>
+					<tr>
+						<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
+						<th>{{.locale.Tr "admin.monitor.start"}}</th>
+						<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
+						<th></th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Queue.Workers}}
+					<tr>
+						<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
+						<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
+						<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
+						<td>
+							<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
+						</td>
+					</tr>
 					{{else}}
-						<h4 class="ui top attached header">
-							{{.locale.Tr "admin.monitor.queue.pool.pause.title"}}
-						</h4>
-						<div class="ui attached segment">
-							<p>{{.locale.Tr "admin.monitor.queue.pool.pause.desc"}}</p>
-							<form method="POST" action="{{.Link}}/pause">
-								{{$.CsrfTokenHtml}}
-								<div class="ui form">
-									<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.pause.submit"}}</button>
-								</div>
-							</form>
-						</div>
+						<tr>
+							<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
+						</tr>
 					{{end}}
-				{{end}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.pool.flush.title"}}
-				</h4>
-				<div class="ui attached segment">
-					<p>{{.locale.Tr "admin.monitor.queue.pool.flush.desc"}}</p>
-					<form method="POST" action="{{.Link}}/flush">
-						{{$.CsrfTokenHtml}}
-						<div class="ui form">
-							<div class="fields">
-								<div class="field">
-									<label>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</label>
-									<input name="timeout" type="text" placeholder="{{.locale.Tr "admin.monitor.queue.pool.addworkers.timeout.placeholder"}}">
-								</div>
-							</div>
-							<button class="ui submit button">{{.locale.Tr "admin.monitor.queue.pool.flush.submit"}}</button>
-						</div>
-					</form>
-				</div>
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.pool.workers.title"}}
-				</h4>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table">
-						<thead>
-							<tr>
-								<th>{{.locale.Tr "admin.monitor.queue.numberworkers"}}</th>
-								<th>{{.locale.Tr "admin.monitor.start"}}</th>
-								<th>{{.locale.Tr "admin.monitor.queue.pool.timeout"}}</th>
-								<th></th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Queue.Workers}}
-							<tr>
-								<td>{{.Workers}}{{if .IsFlusher}}<span title="{{$.locale.Tr "admin.monitor.queue.flush"}}">{{svg "octicon-sync"}}</span>{{end}}</td>
-								<td>{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Start) "Fallback" (DateFmtLong .Start) )}}</td>
-								<td>{{if .HasTimeout}}{{template "shared/datetime/full" (dict "Datetime" (DateFmtLong .Timeout) "Fallback" (DateFmtLong .Timeout) )}}{{else}}-{{end}}</td>
-								<td>
-									<a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Workers}}" title="{{$.locale.Tr "remove"}}">{{svg "octicon-trash"}}</a>
-								</td>
-							</tr>
-							{{else}}
-								<tr>
-									<td colspan="4">{{.locale.Tr "admin.monitor.queue.pool.workers.none"}}
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
-				</div>
-				{{end}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.queue.configuration"}}
-				</h4>
-				<div class="ui attached segment">
-					<pre>{{.Queue.Configuration | JsonPrettyPrint}}
-				</div>
-			</div>
+				</tbody>
+			</table>
+		</div>
+		{{end}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.queue.configuration"}}
+		</h4>
+		<div class="ui attached segment">
+			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
 		</div>
 	</div>
 </div>
@@ -195,6 +188,4 @@
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 9b3138e8fc2b..a23cfe2aafa4 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,101 +1,94 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos/unadopted">{{.locale.Tr "admin.repos.unadopted"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					{{template "admin/repo/search" .}}
-				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
-								<th>{{.locale.Tr "admin.repos.owner"}}</th>
-								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
-									{{.locale.Tr "admin.repos.name"}}
-									{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.repos.watches"}}</th>
-								<th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
-									{{.locale.Tr "admin.repos.stars"}}
-									{{SortArrow "moststars" "feweststars" $.SortType false}}
-								</th>
-								<th  data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
-									{{.locale.Tr "admin.repos.forks"}}
-									{{SortArrow "mostforks" "fewestforks" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.repos.issues"}}</th>
-								<th  data-sortt-asc="size" data-sortt-desc="reversesize">
-									{{.locale.Tr "admin.repos.size"}}
-									{{SortArrow "size" "reversesize" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.users.created"}}</th>
-								<th>{{.locale.Tr "admin.notices.op"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Repos}}
-								<tr>
-									<td>{{.ID}}</td>
-									<td>
-										<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos/unadopted">{{.locale.Tr "admin.repos.unadopted"}}</a>
+			</div>
+		</h4>
+		<div class="ui attached segment">
+			{{template "admin/repo/search" .}}
+		</div>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" $.SortType false}}</th>
+						<th>{{.locale.Tr "admin.repos.owner"}}</th>
+						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically">
+							{{.locale.Tr "admin.repos.name"}}
+							{{SortArrow "alphabetically" "reversealphabetically" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.repos.watches"}}</th>
+						<th  data-sortt-asc="moststars" data-sortt-desc="feweststars">
+							{{.locale.Tr "admin.repos.stars"}}
+							{{SortArrow "moststars" "feweststars" $.SortType false}}
+						</th>
+						<th  data-sortt-asc="mostforks" data-sortt-desc="fewestforks">
+							{{.locale.Tr "admin.repos.forks"}}
+							{{SortArrow "mostforks" "fewestforks" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.repos.issues"}}</th>
+						<th  data-sortt-asc="size" data-sortt-desc="reversesize">
+							{{.locale.Tr "admin.repos.size"}}
+							{{SortArrow "size" "reversesize" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.users.created"}}</th>
+						<th>{{.locale.Tr "admin.notices.op"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Repos}}
+						<tr>
+							<td>{{.ID}}</td>
+							<td>
+								<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
+								{{if .Owner.Visibility.IsPrivate}}
+									<span class="text gold">{{svg "octicon-lock"}}</span>
+								{{end}}
+							</td>
+							<td>
+								<a href="{{.Link}}">{{.Name}}</a>
+								{{if .IsArchived}}
+									<span class="ui basic mini label">{{$.locale.Tr "repo.desc.archived"}}</span>
+								{{end}}
+								{{if .IsTemplate}}
+									{{if .IsPrivate}}
+										<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private_template"}}</span>
+									{{else}}
 										{{if .Owner.Visibility.IsPrivate}}
-											<span class="text gold">{{svg "octicon-lock"}}</span>
-										{{end}}
-									</td>
-									<td>
-										<a href="{{.Link}}">{{.Name}}</a>
-										{{if .IsArchived}}
-											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.archived"}}</span>
+											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal_template"}}</span>
 										{{end}}
-										{{if .IsTemplate}}
-											{{if .IsPrivate}}
-												<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private_template"}}</span>
-											{{else}}
-												{{if .Owner.Visibility.IsPrivate}}
-													<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal_template"}}</span>
-												{{end}}
-											{{end}}
-										{{else}}
-											{{if .IsPrivate}}
-												<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private"}}</span>
-											{{else}}
-												{{if .Owner.Visibility.IsPrivate}}
-													<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal"}}</span>
-												{{end}}
-											{{end}}
-										{{end}}
-										{{if .IsFork}}
-											{{svg "octicon-repo-forked"}}
-										{{else if .IsMirror}}
-											{{svg "octicon-mirror"}}
+									{{end}}
+								{{else}}
+									{{if .IsPrivate}}
+										<span class="ui basic mini label">{{$.locale.Tr "repo.desc.private"}}</span>
+									{{else}}
+										{{if .Owner.Visibility.IsPrivate}}
+											<span class="ui basic mini label">{{$.locale.Tr "repo.desc.internal"}}</span>
 										{{end}}
-									</td>
-									<td>{{.NumWatches}}</td>
-									<td>{{.NumStars}}</td>
-									<td>{{.NumForks}}</td>
-									<td>{{.NumIssues}}</td>
-									<td>{{FileSize .Size}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-									<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
-				</div>
-
-				{{template "base/paginate" .}}
-			</div>
+									{{end}}
+								{{end}}
+								{{if .IsFork}}
+									{{svg "octicon-repo-forked"}}
+								{{else if .IsMirror}}
+									{{svg "octicon-mirror"}}
+								{{end}}
+							</td>
+							<td>{{.NumWatches}}</td>
+							<td>{{.NumStars}}</td>
+							<td>{{.NumForks}}</td>
+							<td>{{.NumIssues}}</td>
+							<td>{{FileSize .Size}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
+
+		{{template "base/paginate" .}}
 	</div>
 </div>
 
@@ -110,5 +103,4 @@
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index edaa6ee97e28..330a2abd510a 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,106 +1,97 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.repos.unadopted"}}
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos">{{.locale.Tr "admin.repos.repo_manage_panel"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form ignore-dirty">
-						<div class="ui fluid action input">
-						<input name="search" value="true" type="hidden">
-						<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "repo.adopt_search"}}" autofocus>
-						<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
-						</div>
-					</form>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.repos.unadopted"}}
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/repos">{{.locale.Tr "admin.repos.repo_manage_panel"}}</a>
+			</div>
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form ignore-dirty">
+				<div class="ui fluid action input">
+				<input name="search" value="true" type="hidden">
+				<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "repo.adopt_search"}}" autofocus>
+				<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
 				</div>
-				{{if .search}}
-					<div class="ui attached segment settings">
-						{{if .Dirs}}
-							<div class="ui middle aligned divided list">
-								{{range $dirI, $dir := .Dirs}}
-									<div class="item">
-										<div class="content">
-											<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
-											<span class="name">{{$dir}}</span>
-											<div class="right floated content">
-												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
-													<div class="header">
-														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
-													</div>
-													<div class="content">
-														<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
-													</div>
-													<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
-														{{$.CsrfTokenHtml}}
-														<input type="hidden" name="id" value="{{$dir}}">
-														<input type="hidden" name="action" value="adopt">
-														<input type="hidden" name="q" value="{{$.Keyword}}">
-														<input type="hidden" name="page" value="{{$.CurrentPage}}">
-														<div class="actions">
-															<button class="ui red basic inverted cancel button">
-																{{svg "octicon-trash" 16 "gt-mr-2"}}
-																{{$.locale.Tr "modal.no"}}
-															</button>
-															<button class="ui green basic inverted ok button">
-																{{svg "octicon-check" 16 "gt-mr-2"}}
-																{{$.locale.Tr "modal.yes"}}
-															</button>
-														</div>
-													</form>
-												</div>
-												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-												<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-													{{svg "octicon-x" 16 "close inside"}}
-													<div class="header">
-														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
-													</div>
-													<div class="content">
-														<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
-													</div>
-													<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
-														{{$.CsrfTokenHtml}}
-														<input type="hidden" name="id" value="{{$dir}}">
-														<input type="hidden" name="action" value="delete">
-														<input type="hidden" name="q" value="{{$.Keyword}}">
-														<input type="hidden" name="page" value="{{$.CurrentPage}}">
-														<div class="actions">
-															<button class="ui red basic inverted cancel button">
-																{{svg "octicon-trash" 16 "gt-mr-2"}}
-																{{$.locale.Tr "modal.no"}}
-															</button>
-															<button class="ui green basic inverted ok button">
-																{{svg "octicon-check" 16 "gt-mr-2"}}
-																{{$.locale.Tr "modal.yes"}}
-															</button>
-														</div>
-													</form>
+			</form>
+		</div>
+		{{if .search}}
+			<div class="ui attached segment settings">
+				{{if .Dirs}}
+					<div class="ui middle aligned divided list">
+						{{range $dirI, $dir := .Dirs}}
+							<div class="item">
+								<div class="content">
+									<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
+									<span class="name">{{$dir}}</span>
+									<div class="right floated content">
+										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
+										<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+											{{svg "octicon-x" 16 "close inside"}}
+											<div class="header">
+												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
+											</div>
+											<div class="content">
+												<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
+											</div>
+											<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
+												{{$.CsrfTokenHtml}}
+												<input type="hidden" name="id" value="{{$dir}}">
+												<input type="hidden" name="action" value="adopt">
+												<input type="hidden" name="q" value="{{$.Keyword}}">
+												<input type="hidden" name="page" value="{{$.CurrentPage}}">
+												<div class="actions">
+													<button class="ui red basic inverted cancel button">
+														{{svg "octicon-trash" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.no"}}
+													</button>
+													<button class="ui green basic inverted ok button">
+														{{svg "octicon-check" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.yes"}}
+													</button>
 												</div>
+											</form>
+										</div>
+										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+										<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+											{{svg "octicon-x" 16 "close inside"}}
+											<div class="header">
+												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+											</div>
+											<div class="content">
+												<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
 											</div>
+											<form class="ui form" method="POST" action="{{AppSubUrl}}/admin/repos/unadopted">
+												{{$.CsrfTokenHtml}}
+												<input type="hidden" name="id" value="{{$dir}}">
+												<input type="hidden" name="action" value="delete">
+												<input type="hidden" name="q" value="{{$.Keyword}}">
+												<input type="hidden" name="page" value="{{$.CurrentPage}}">
+												<div class="actions">
+													<button class="ui red basic inverted cancel button">
+														{{svg "octicon-trash" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.no"}}
+													</button>
+													<button class="ui green basic inverted ok button">
+														{{svg "octicon-check" 16 "gt-mr-2"}}
+														{{$.locale.Tr "modal.yes"}}
+													</button>
+												</div>
+											</form>
 										</div>
 									</div>
-								{{end}}
+								</div>
 							</div>
-							{{template "base/paginate" .}}
-						{{else}}
-							<div class="item">
-								{{.locale.Tr "admin.repos.unadopted.no_more"}}
-							</div>
-							{{template "base/paginate" .}}
 						{{end}}
 					</div>
+					{{template "base/paginate" .}}
+				{{else}}
+					<div class="item">
+						{{.locale.Tr "admin.repos.unadopted.no_more"}}
+					</div>
+					{{template "base/paginate" .}}
 				{{end}}
 			</div>
-		</div>
+		{{end}}
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index 0561dbd05d22..8cd3d6418a62 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -1,12 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content admin runners">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "shared/actions/runner_list" .}}
-			</div>
-		</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
+	<div class="admin-main-content">
+		{{template "shared/actions/runner_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index 4c966f5ea0c7..63c6f2dd020f 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -1,12 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content admin runners">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "shared/actions/runner_edit" .}}
-			</div>
-		</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
+	<div class="admin-main-content">
+		{{template "shared/actions/runner_edit" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index dfc6ab157d5e..30ec10963958 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,23 +1,16 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/monitor">{{.locale.Tr "admin.monitor"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui relaxed divided list">
-						{{range .ProcessStacks}}
-							{{template "admin/stacktrace-row" dict "Process" . "root" $}}
-						{{end}}
-					</div>
-				</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/monitor">{{.locale.Tr "admin.monitor"}}</a>
+			</div>
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui relaxed divided list">
+				{{range .ProcessStacks}}
+					{{template "admin/stacktrace-row" dict "Process" . "root" $}}
+				{{end}}
 			</div>
 		</div>
 	</div>
@@ -32,6 +25,4 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-</div>
-
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 8c520a36b31e..df2e4cbebf57 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,201 +1,194 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.users.edit_account"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<div class="field {{if .Err_UserName}}error{{end}}">
-							<label for="user_name">{{.locale.Tr "username"}}</label>
-							<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
-						</div>
-						<!-- Types and name -->
-						<div class="inline required field {{if .Err_LoginType}}error{{end}}">
-							<label>{{.locale.Tr "admin.users.auth_source"}}</label>
-							<div class="ui selection type dropdown">
-								<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
-								<div class="text">{{.locale.Tr "admin.users.local"}}</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
-									{{range .Sources}}
-										<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
-									{{end}}
-								</div>
-							</div>
-						</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.users.edit_account"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<div class="field {{if .Err_UserName}}error{{end}}">
+					<label for="user_name">{{.locale.Tr "username"}}</label>
+					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}}>
+				</div>
+				<!-- Types and name -->
+				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
+					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
+					<div class="ui selection type dropdown">
+						<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
+						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
+							{{range .Sources}}
+								<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
+							{{end}}
+						</div>
+					</div>
+				</div>
 
-						<div class="inline field {{if .Err_Visibility}}error{{end}}">
-							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-							<div class="ui selection type dropdown">
-								{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
-								{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
-								{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
-								<div class="text">
-									{{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-									{{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-									{{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-								</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									{{range $mode := .AllowedUserVisibilityModes}}
-										{{if $mode.IsPublic}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-										{{else if $mode.IsLimited}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-										{{else if $mode.IsPrivate}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-										{{end}}
-									{{end}}
-								</div>
-							</div>
-						</div>
+				<div class="inline field {{if .Err_Visibility}}error{{end}}">
+					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+					<div class="ui selection type dropdown">
+						{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
+						{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
+						{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
+						<div class="text">
+							{{if .User.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+							{{if .User.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+							{{if .User.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+						</div>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							{{range $mode := .AllowedUserVisibilityModes}}
+								{{if $mode.IsPublic}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+								{{else if $mode.IsLimited}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+								{{else if $mode.IsPrivate}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+								{{end}}
+							{{end}}
+						</div>
+					</div>
+				</div>
 
-						<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}gt-hidden{{end}}">
-							<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-							<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
-						</div>
-						<div class="field {{if .Err_FullName}}error{{end}}">
-							<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
-							<input id="full_name" name="full_name" value="{{.User.FullName}}">
-						</div>
-						<div class="required field {{if .Err_Email}}error{{end}}">
-							<label for="email">{{.locale.Tr "email"}}</label>
-							<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
-						</div>
-						<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}gt-hidden{{end}}">
-							<label for="password">{{.locale.Tr "password"}}</label>
-							<input id="password" name="password" type="password" autocomplete="new-password">
-							<p class="help">{{.locale.Tr "admin.users.password_helper"}}</p>
-						</div>
-						<div class="field {{if .Err_Website}}error{{end}}">
-							<label for="website">{{.locale.Tr "settings.website"}}</label>
-							<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
-						</div>
-						<div class="field {{if .Err_Location}}error{{end}}">
-							<label for="location">{{.locale.Tr "settings.location"}}</label>
-							<input id="location" name="location" value="{{.User.Location}}">
-						</div>
+				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}gt-hidden{{end}}">
+					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
+					<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
+				</div>
+				<div class="field {{if .Err_FullName}}error{{end}}">
+					<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
+					<input id="full_name" name="full_name" value="{{.User.FullName}}">
+				</div>
+				<div class="required field {{if .Err_Email}}error{{end}}">
+					<label for="email">{{.locale.Tr "email"}}</label>
+					<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
+				</div>
+				<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}gt-hidden{{end}}">
+					<label for="password">{{.locale.Tr "password"}}</label>
+					<input id="password" name="password" type="password" autocomplete="new-password">
+					<p class="help">{{.locale.Tr "admin.users.password_helper"}}</p>
+				</div>
+				<div class="field {{if .Err_Website}}error{{end}}">
+					<label for="website">{{.locale.Tr "settings.website"}}</label>
+					<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
+				</div>
+				<div class="field {{if .Err_Location}}error{{end}}">
+					<label for="location">{{.locale.Tr "settings.location"}}</label>
+					<input id="location" name="location" value="{{.User.Location}}">
+				</div>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
-							<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
-							<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
-							<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
-						</div>
+				<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
+					<label for="max_repo_creation">{{.locale.Tr "admin.users.max_repo_creation"}}</label>
+					<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
+					<p class="help">{{.locale.Tr "admin.users.max_repo_creation_desc"}}</p>
+				</div>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.is_activated"}}</strong></label>
-								<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.prohibit_login"}}</strong></label>
-								<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.is_admin"}}</strong></label>
-								<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.is_restricted"}}</strong></label>
-								<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
-							</div>
-						</div>
-						<div class="inline field {{if DisableGitHooks}}gt-hidden{{end}}">
-							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "admin.users.allow_git_hook_tooltip"}}">
-								<label><strong>{{.locale.Tr "admin.users.allow_git_hook"}}</strong></label>
-								<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
-							</div>
-						</div>
-						<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}gt-hidden{{end}}">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.allow_import_local"}}</strong></label>
-								<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
-							</div>
-						</div>
-						{{if not .DisableRegularOrgCreation}}
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.allow_create_organization"}}</strong></label>
-								<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
-							</div>
-						</div>
-						{{end}}
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.is_activated"}}</strong></label>
+						<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.prohibit_login"}}</strong></label>
+						<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.is_admin"}}</strong></label>
+						<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.is_restricted"}}</strong></label>
+						<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
+					</div>
+				</div>
+				<div class="inline field {{if DisableGitHooks}}gt-hidden{{end}}">
+					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "admin.users.allow_git_hook_tooltip"}}">
+						<label><strong>{{.locale.Tr "admin.users.allow_git_hook"}}</strong></label>
+						<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
+					</div>
+				</div>
+				<div class="inline field {{if or (DisableImportLocal) (.DisableMigrations)}}gt-hidden{{end}}">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.allow_import_local"}}</strong></label>
+						<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
+					</div>
+				</div>
+				{{if not .DisableRegularOrgCreation}}
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.allow_create_organization"}}</strong></label>
+						<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
+					</div>
+				</div>
+				{{end}}
 
-						{{if .TwoFactorEnabled}}
-						<div class="ui divider"></div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
-								<input name="reset_2fa" type="checkbox">
-							</div>
-						</div>
-						{{end}}
+				{{if .TwoFactorEnabled}}
+				<div class="ui divider"></div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "admin.users.reset_2fa"}}</strong></label>
+						<input name="reset_2fa" type="checkbox">
+					</div>
+				</div>
+				{{end}}
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<div class="field">
-							<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
-							<button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{.locale.Tr "admin.users.update_profile"}}</button>
+					<button class="ui red button show-modal" data-modal="#delete-user-modal">{{.locale.Tr "admin.users.delete_account"}}</button>
 				</div>
+			</form>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.avatar"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-						{{.CsrfTokenHtml}}
-						{{if not (DisableGravatar $.Context)}}
-						<div class="inline field">
-							<div class="ui radio checkbox">
-								<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
-								<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
-							</div>
-						</div>
-						<div class="field {{if .Err_Gravatar}}error{{end}}">
-							<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
-							<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
-						</div>
-						{{end}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.avatar"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+				{{.CsrfTokenHtml}}
+				{{if not (DisableGravatar $.Context)}}
+				<div class="inline field">
+					<div class="ui radio checkbox">
+						<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
+						<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
+					</div>
+				</div>
+				<div class="field {{if .Err_Gravatar}}error{{end}}">
+					<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
+					<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}">
+				</div>
+				{{end}}
 
-						<div class="inline field">
-							<div class="ui radio checkbox">
-								<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
-								<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
-							</div>
-						</div>
+				<div class="inline field">
+					<div class="ui radio checkbox">
+						<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
+						<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
+					</div>
+				</div>
 
-						<div class="inline field">
-							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-							<input name="avatar" type="file" >
-						</div>
+				<div class="inline field">
+					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+					<input name="avatar" type="file" >
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>{{/* TODO: Convert links without href to buttons for a11y */}}
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
 </div>
@@ -219,5 +212,4 @@
 		</div>
 		{{template "base/delete_modal_actions" .}}
 	</form>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 4b797b1488ed..94953a90f8d4 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,117 +1,109 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/users/new">{{.locale.Tr "admin.users.new_account"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form ignore-dirty" id="user-list-search-form">
-
-						<!-- Right Menu -->
-						<div class="ui right floated secondary filter menu">
-							<!-- Status Filter Menu Item -->
-							<div class="ui dropdown type jump item">
-								<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
-								<div class="menu">
-									<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
-									<div class="ui divider"></div>
-									<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_admin"}}</label>
-									<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_admin"}}</label>
-									<div class="ui divider"></div>
-									<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_active"}}</label>
-									<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_active"}}</label>
-									<div class="ui divider"></div>
-									<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_restricted"}}</label>
-									<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_restricted"}}</label>
-									<div class="ui divider"></div>
-									<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
-									<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
-									<div class="ui divider"></div>
-									<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
-									<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
-								</div>
-							</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/users/new">{{.locale.Tr "admin.users.new_account"}}</a>
+			</div>
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form ignore-dirty" id="user-list-search-form">
 
-							<!-- Sort Menu Item -->
-							<div class="ui dropdown type jump item">
-								<span class="text">
-									{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								</span>
-								<div class="menu">
-									<button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button>
-									<button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button>
-									<button class="item" name="sort" value="alphabetically">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</button>
-									<button class="item" name="sort" value="reversealphabetically">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</button>
-									<button class="item" name="sort" value="recentupdate">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</button>
-									<button class="item" name="sort" value="leastupdate">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</button>
-								</div>
-							</div>
+				<!-- Right Menu -->
+				<div class="ui right floated secondary filter menu">
+					<!-- Status Filter Menu Item -->
+					<div class="ui dropdown type jump item">
+						<span class="text">{{.locale.Tr "admin.users.list_status_filter.menu_text"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}</span>
+						<div class="menu">
+							<a class="item j-reset-status-filter">{{.locale.Tr "admin.users.list_status_filter.reset"}}</a>
+							<div class="ui divider"></div>
+							<label class="item"><input type="radio" name="status_filter[is_admin]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_admin"}}</label>
+							<label class="item"><input type="radio" name="status_filter[is_admin]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_admin"}}</label>
+							<div class="ui divider"></div>
+							<label class="item"><input type="radio" name="status_filter[is_active]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_active"}}</label>
+							<label class="item"><input type="radio" name="status_filter[is_active]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_active"}}</label>
+							<div class="ui divider"></div>
+							<label class="item"><input type="radio" name="status_filter[is_restricted]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_restricted"}}</label>
+							<label class="item"><input type="radio" name="status_filter[is_restricted]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_restricted"}}</label>
+							<div class="ui divider"></div>
+							<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_prohibit_login"}}</label>
+							<label class="item"><input type="radio" name="status_filter[is_prohibit_login]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_prohibit_login"}}</label>
+							<div class="ui divider"></div>
+							<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="1"> {{.locale.Tr "admin.users.list_status_filter.is_2fa_enabled"}}</label>
+							<label class="item"><input type="radio" name="status_filter[is_2fa_enabled]" value="0"> {{.locale.Tr "admin.users.list_status_filter.not_2fa_enabled"}}</label>
 						</div>
+					</div>
 
-						<!-- Search Text -->
-						<div class="ui fluid action input" style="max-width: 70%;">
-							<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
-							<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+					<!-- Sort Menu Item -->
+					<div class="ui dropdown type jump item">
+						<span class="text">
+							{{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						</span>
+						<div class="menu">
+							<button class="item" name="sort" value="oldest">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</button>
+							<button class="item" name="sort" value="newest">{{.locale.Tr "repo.issues.filter_sort.latest"}}</button>
+							<button class="item" name="sort" value="alphabetically">{{.locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</button>
+							<button class="item" name="sort" value="reversealphabetically">{{.locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</button>
+							<button class="item" name="sort" value="recentupdate">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</button>
+							<button class="item" name="sort" value="leastupdate">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</button>
 						</div>
-					</form>
-				</div>
-				<div class="ui attached table segment">
-					<table class="ui very basic striped table unstackable">
-						<thead>
-							<tr>
-								<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th>
-								<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
-									{{.locale.Tr "admin.users.name"}}
-									{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
-								</th>
-								<th>{{.locale.Tr "email"}}</th>
-								<th>{{.locale.Tr "admin.users.activated"}}</th>
-								<th>{{.locale.Tr "admin.users.admin"}}</th>
-								<th>{{.locale.Tr "admin.users.restricted"}}</th>
-								<th>{{.locale.Tr "admin.users.2fa"}}</th>
-								<th>{{.locale.Tr "admin.users.repos"}}</th>
-								<th>{{.locale.Tr "admin.users.created"}}</th>
-								<th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin">
-									{{.locale.Tr "admin.users.last_login"}}
-									{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
-								</th>
-								<th>{{.locale.Tr "admin.users.edit"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Users}}
-								<tr>
-									<td>{{.ID}}</td>
-									<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
-									<td><span class="text truncate email">{{.Email}}</span></td>
-									<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{.NumRepos}}</td>
-									<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
-									{{if .LastLoginUnix}}
-										<td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td>
-									{{else}}
-										<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
-									{{end}}
-									<td><a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
-								</tr>
-							{{end}}
-						</tbody>
-					</table>
+					</div>
 				</div>
 
-				{{template "base/paginate" .}}
-			</div>
+				<!-- Search Text -->
+				<div class="ui fluid action input" style="max-width: 70%;">
+					<input name="q" value="{{.Keyword}}" placeholder="{{.locale.Tr "explore.search"}}..." autofocus>
+					<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
+				</div>
+			</form>
 		</div>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped table unstackable">
+				<thead>
+					<tr>
+						<th data-sortt-asc="oldest" data-sortt-desc="newest">ID{{SortArrow "oldest" "newest" .SortType false}}</th>
+						<th data-sortt-asc="alphabetically" data-sortt-desc="reversealphabetically" data-sortt-default="true">
+							{{.locale.Tr "admin.users.name"}}
+							{{SortArrow "alphabetically" "reversealphabetically" $.SortType true}}
+						</th>
+						<th>{{.locale.Tr "email"}}</th>
+						<th>{{.locale.Tr "admin.users.activated"}}</th>
+						<th>{{.locale.Tr "admin.users.admin"}}</th>
+						<th>{{.locale.Tr "admin.users.restricted"}}</th>
+						<th>{{.locale.Tr "admin.users.2fa"}}</th>
+						<th>{{.locale.Tr "admin.users.repos"}}</th>
+						<th>{{.locale.Tr "admin.users.created"}}</th>
+						<th data-sortt-asc="lastlogin" data-sortt-desc="reverselastlogin">
+							{{.locale.Tr "admin.users.last_login"}}
+							{{SortArrow "lastlogin" "reverselastlogin" $.SortType false}}
+						</th>
+						<th>{{.locale.Tr "admin.users.edit"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Users}}
+						<tr>
+							<td>{{.ID}}</td>
+							<td><a href="{{.HomeLink}}">{{.Name}}</a></td>
+							<td><span class="text truncate email">{{.Email}}</span></td>
+							<td>{{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{if .IsAdmin}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{.NumRepos}}</td>
+							<td>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</td>
+							{{if .LastLoginUnix}}
+								<td>{{template "shared/datetime/short" (dict "Datetime" .LastLoginUnix.FormatLong "Fallback" .LastLoginUnix.FormatShort)}}</td>
+							{{else}}
+								<td><span>{{$.locale.Tr "admin.users.never_login"}}</span></td>
+							{{end}}
+							<td><a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
+		</div>
+
+		{{template "base/paginate" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 258209170849..9274c28231e0 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,98 +1,90 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content admin new user">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "admin/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "admin.users.new_account"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<!-- Types and name -->
-						<div class="inline required field {{if .Err_LoginType}}error{{end}}">
-							<label>{{.locale.Tr "admin.users.auth_source"}}</label>
-							<div class="ui selection type dropdown">
-								<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
-								<div class="text">{{.locale.Tr "admin.users.local"}}</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
-									{{range .Sources}}
-										<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
-									{{end}}
-								</div>
-							</div>
-						</div>
-
-						<div class="inline field {{if .Err_Visibility}}error{{end}}">
-							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-							<div class="ui selection type dropdown">
-								<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
-								<div class="text">
-									{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-									{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-									{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-								</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									{{range $mode := .AllowedUserVisibilityModes}}
-										{{if $mode.IsPublic}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-										{{else if $mode.IsLimited}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-										{{else if $mode.IsPrivate}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-										{{end}}
-									{{end}}
-								</div>
-							</div>
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
+	<div class="admin-main-content">
+		<h4 class="ui top attached header">
+			{{.locale.Tr "admin.users.new_account"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<!-- Types and name -->
+				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
+					<label>{{.locale.Tr "admin.users.auth_source"}}</label>
+					<div class="ui selection type dropdown">
+						<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
+						<div class="text">{{.locale.Tr "admin.users.local"}}</div>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							<div class="item" data-value="0-0">{{.locale.Tr "admin.users.local"}}</div>
+							{{range .Sources}}
+								<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
+							{{end}}
 						</div>
+					</div>
+				</div>
 
-						<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}gt-hidden{{end}}">
-							<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
-							<input id="login_name" name="login_name" value="{{.login_name}}">
-						</div>
-						<div class="required field {{if .Err_UserName}}error{{end}}">
-							<label for="user_name">{{.locale.Tr "username"}}</label>
-							<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+				<div class="inline field {{if .Err_Visibility}}error{{end}}">
+					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+					<div class="ui selection type dropdown">
+						<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
+						<div class="text">
+							{{if .DefaultUserVisibilityMode.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+							{{if .DefaultUserVisibilityMode.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+							{{if .DefaultUserVisibilityMode.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
 						</div>
-						<div class="required field {{if .Err_Email}}error{{end}}">
-							<label for="email">{{.locale.Tr "email"}}</label>
-							<input id="email" name="email" type="email" value="{{.email}}" required>
-						</div>
-						<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}gt-hidden{{end}}">
-							<label for="password">{{.locale.Tr "password"}}</label>
-							<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							{{range $mode := .AllowedUserVisibilityModes}}
+								{{if $mode.IsPublic}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+								{{else if $mode.IsLimited}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+								{{else if $mode.IsPrivate}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+								{{end}}
+							{{end}}
 						</div>
+					</div>
+				</div>
 
-						<div class="inline field local {{if ne .login_type "0-0"}}gt-hidden{{end}}">
-							<div class="ui checkbox">
-								<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
-								<input name="must_change_password" type="checkbox" checked>
-							</div>
-						</div>
+				<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}gt-hidden{{end}}">
+					<label for="login_name">{{.locale.Tr "admin.users.auth_login_name"}}</label>
+					<input id="login_name" name="login_name" value="{{.login_name}}">
+				</div>
+				<div class="required field {{if .Err_UserName}}error{{end}}">
+					<label for="user_name">{{.locale.Tr "username"}}</label>
+					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+				</div>
+				<div class="required field {{if .Err_Email}}error{{end}}">
+					<label for="email">{{.locale.Tr "email"}}</label>
+					<input id="email" name="email" type="email" value="{{.email}}" required>
+				</div>
+				<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}gt-hidden{{end}}">
+					<label for="password">{{.locale.Tr "password"}}</label>
+					<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
+				</div>
 
-						<!-- Send register notify e-mail -->
-						{{if .CanSendEmail}}
-							<div class="inline field">
-								<div class="ui checkbox">
-									<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
-									<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
-								</div>
-							</div>
-						{{end}}
+				<div class="inline field local {{if ne .login_type "0-0"}}gt-hidden{{end}}">
+					<div class="ui checkbox">
+						<label><strong>{{.locale.Tr "auth.allow_password_change"}}</strong></label>
+						<input name="must_change_password" type="checkbox" checked>
+					</div>
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{.locale.Tr "admin.users.new_account"}}</button>
+				<!-- Send register notify e-mail -->
+				{{if .CanSendEmail}}
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label><strong>{{.locale.Tr "admin.users.send_register_notify"}}</strong></label>
+							<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
 						</div>
-					</form>
+					</div>
+				{{end}}
+
+				<div class="field">
+					<button class="ui green button">{{.locale.Tr "admin.users.new_account"}}</button>
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "admin/layout_footer" .}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 40b492474322..e6bc6975dba9 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -1,5 +1,4 @@
 <div class="runner-container">
-	{{template "base/alert" .}}
 	<h4 class="ui top attached header">
 		{{.locale.Tr "actions.runners.runner_title"}} {{.Runner.ID}} {{.Runner.Name}}
 	</h4>
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index d4a5b863abc2..536ae6b06651 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -1,5 +1,4 @@
 <div class="runner-container">
-	{{template "base/alert" .}}
 
 	<h4 class="ui top attached header">
 		{{.locale.Tr "actions.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/user/settings/applications_oauth2_edit_form.tmpl b/templates/user/settings/applications_oauth2_edit_form.tmpl
index 9d7273fd6d0b..1a8336b15065 100644
--- a/templates/user/settings/applications_oauth2_edit_form.tmpl
+++ b/templates/user/settings/applications_oauth2_edit_form.tmpl
@@ -1,5 +1,4 @@
 <div class="ui container">
-	{{template "base/alert" .}}
 	<h4 class="ui top attached header">
 		{{.locale.Tr "settings.edit_oauth2_application"}}
 	</h4>

From 58b30bc85675290d6cd8ca656a97bf008e823481 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 11:39:21 +0800
Subject: [PATCH 11/21] update repo settings and modify admin pages with modals

---
 templates/admin/auth/edit.tmpl                |    5 +-
 templates/admin/layout_head.tmpl              |    2 +-
 templates/admin/monitor.tmpl                  |    4 +-
 templates/admin/notice.tmpl                   |    4 +-
 templates/admin/packages/list.tmpl            |    4 +-
 templates/admin/queue.tmpl                    |    4 +-
 templates/admin/repo/list.tmpl                |    4 +-
 templates/admin/stacktrace.tmpl               |    4 +-
 templates/admin/user/edit.tmpl                |    4 +-
 .../settings/applications_oauth2_edit.tmpl    |    1 +
 templates/org/settings/hooks.tmpl             |    1 +
 templates/repo/settings/branches.tmpl         |  181 +--
 templates/repo/settings/collaboration.tmpl    |  198 ++-
 templates/repo/settings/deploy_keys.tmpl      |  138 +-
 templates/repo/settings/githook_edit.tmpl     |   60 +-
 templates/repo/settings/githooks.tmpl         |   48 +-
 templates/repo/settings/layout_footer.tmpl    |    8 +
 templates/repo/settings/layout_head.tmpl      |   10 +
 templates/repo/settings/lfs.tmpl              |  117 +-
 templates/repo/settings/lfs_file.tmpl         |  114 +-
 templates/repo/settings/lfs_file_find.tmpl    |  102 +-
 templates/repo/settings/lfs_locks.tmpl        |  115 +-
 templates/repo/settings/lfs_pointers.tmpl     |  134 +-
 templates/repo/settings/options.tmpl          | 1429 ++++++++---------
 templates/repo/settings/protected_branch.tmpl |  466 +++---
 templates/repo/settings/runner_edit.tmpl      |   17 +-
 templates/repo/settings/runners.tmpl          |   17 +-
 templates/repo/settings/secrets.tmpl          |   18 +-
 templates/repo/settings/tags.tmpl             |   10 +-
 templates/repo/settings/webhook/base.tmpl     |   17 +-
 templates/repo/settings/webhook/list.tmpl     |    1 -
 templates/repo/settings/webhook/new.tmpl      |   98 +-
 templates/user/settings/hooks.tmpl            |    1 +
 web_src/css/admin.css                         |    2 +-
 34 files changed, 1611 insertions(+), 1727 deletions(-)
 create mode 100644 templates/repo/settings/layout_footer.tmpl
 create mode 100644 templates/repo/settings/layout_head.tmpl

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 934dc231d0bb..ef3fd31270c3 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -435,7 +435,8 @@
 			</form>
 		</div>
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
+
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
@@ -445,4 +446,4 @@
 		<p>{{.locale.Tr "admin.auths.delete_auth_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl
index 0462d7fe3725..6612b69aca2d 100644
--- a/templates/admin/layout_head.tmpl
+++ b/templates/admin/layout_head.tmpl
@@ -8,4 +8,4 @@
 		{{/* block: admin-main-content */}}
 	</div>
 </div>
-{{end}}
\ No newline at end of file
+{{end}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 8279b020a304..5e8366f336c3 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -33,7 +33,7 @@
 
 		{{template "admin/process" .}}
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -44,4 +44,4 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index dfe9d4b03ba0..e1a07685dd63 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -66,7 +66,7 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 
 <div class="ui modal admin" id="detail-modal">
 	{{svg "octicon-x" 16 "close inside"}}
@@ -75,4 +75,4 @@
 		<div class="sub header"></div>
 		<pre></pre>
 	</div>
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 5adbce296e91..b37de4b29b1f 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -75,7 +75,7 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -86,4 +86,4 @@
 		{{.locale.Tr "packages.settings.delete.notice" `<span class="name"></span>` `<span class="dataVersion"></span>` | Safe}}
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 0b1584392aed..b27aefda5885 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -177,7 +177,7 @@
 			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
 		</div>
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -188,4 +188,4 @@
 		<p>{{$.locale.Tr "admin.monitor.queue.pool.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index a23cfe2aafa4..1d5bc8eb4619 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -90,7 +90,7 @@
 
 		{{template "base/paginate" .}}
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -103,4 +103,4 @@
 		{{.locale.Tr "repo.settings.delete_notices_fork_1"}}<br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 30ec10963958..479f8c0f5bd2 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -14,7 +14,7 @@
 			</div>
 		</div>
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -25,4 +25,4 @@
 		<p>{{$.locale.Tr "admin.monitor.process.cancel_desc"}}</p>
 	</div>
 	{{template "base/delete_modal_actions" .}}
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index df2e4cbebf57..942885a38868 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -191,7 +191,7 @@
 			</form>
 		</div>
 	</div>
-</div>
+{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-user-modal">
 	<div class="ui icon header">
@@ -212,4 +212,4 @@
 		</div>
 		{{template "base/delete_modal_actions" .}}
 	</form>
-{{template "admin/layout_footer" .}}
+</div>
diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl
index b686f7ffb7c3..a805d5058481 100644
--- a/templates/org/settings/applications_oauth2_edit.tmpl
+++ b/templates/org/settings/applications_oauth2_edit.tmpl
@@ -4,6 +4,7 @@
 		<div class="ui grid">
 			{{template "org/header" .}}
 			<div class="twelve wide column content">
+				{{template "base/alert" .}}
 				{{template "user/settings/applications_oauth2_edit_form" .}}
 			</div>
 		</div>
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 3abbc62ecf87..c94a12368ea2 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -5,6 +5,7 @@
 		<div class="ui grid">
 			{{template "org/settings/navbar" .}}
 			<div class="twelve wide column content">
+				{{template "base/alert" .}}
 				{{template "repo/settings/webhook/list" .}}
 			</div>
 		</div>
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 3646ad714a3e..effee6d14138 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,104 +1,97 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{if .Repository.IsArchived}}
-					<div class="ui warning message">
-						{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
-					</div>
-				{{else}}
-					<h4 class="ui top attached header">
-						{{.locale.Tr "repo.default_branch"}}
-					</h4>
-					<div class="ui attached segment">
-						<p>
-							{{.locale.Tr "repo.settings.default_branch_desc"}}
-						</p>
-						<form class="ui form" action="{{.Link}}" method="post">
-							{{.CsrfTokenHtml}}
-							<input type="hidden" name="action" value="default_branch">
-							{{if not .Repository.IsEmpty}}
-							<div class="required inline field">
-								<div class="ui dropdown selection" tabindex="0">
-									<select name="branch">
-										<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
-										{{range .Branches}}
-											<option value="{{.}}">{{.}}</option>
-										{{end}}
-									</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="default text">{{.Repository.DefaultBranch}}</div>
-									<div class="menu">
-										{{range .Branches}}
-											<div class="item" data-value="{{.}}">{{.}}</div>
-										{{end}}
-									</div>
-								</div>
-								<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		{{if .Repository.IsArchived}}
+			<div class="ui warning message">
+				{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
+			</div>
+		{{else}}
+			<h4 class="ui top attached header">
+				{{.locale.Tr "repo.default_branch"}}
+			</h4>
+			<div class="ui attached segment">
+				<p>
+					{{.locale.Tr "repo.settings.default_branch_desc"}}
+				</p>
+				<form class="ui form" action="{{.Link}}" method="post">
+					{{.CsrfTokenHtml}}
+					<input type="hidden" name="action" value="default_branch">
+					{{if not .Repository.IsEmpty}}
+					<div class="required inline field">
+						<div class="ui dropdown selection" tabindex="0">
+							<select name="branch">
+								<option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
+								{{range .Branches}}
+									<option value="{{.}}">{{.}}</option>
+								{{end}}
+							</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="default text">{{.Repository.DefaultBranch}}</div>
+							<div class="menu">
+								{{range .Branches}}
+									<div class="item" data-value="{{.}}">{{.}}</div>
+								{{end}}
 							</div>
-							{{end}}
-						</form>
+						</div>
+						<button class="ui green button">{{$.locale.Tr "repo.settings.branches.update_default_branch"}}</button>
 					</div>
+					{{end}}
+				</form>
+			</div>
 
-					<h4 class="ui top attached header">
-						{{.locale.Tr "repo.settings.protected_branch"}}
-						<div class="ui right">
-							<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
-						</div>
-					</h4>
+			<h4 class="ui top attached header">
+				{{.locale.Tr "repo.settings.protected_branch"}}
+				<div class="ui right">
+					<a class="ui primary tiny button" href="{{$.Repository.Link}}/settings/branches/edit">{{$.locale.Tr "repo.settings.branches.add_new_rule"}}</a>
+				</div>
+			</h4>
 
-					<div class="ui attached table segment">
-						<div class="ui grid padded">
-							<div class="sixteen wide column">
-								<table class="ui single line table padded">
-									<tbody>
-										{{range .ProtectedBranches}}
-											<tr>
-												<td><div class="ui basic primary label">{{.RuleName}}</div></td>
-												<td class="right aligned">
-												<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
-												<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
-												{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
-												</td>
-											</tr>
-										{{else}}
-											<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
-										{{end}}
-									</tbody>
-								</table>
-							</div>
-						</div>
+			<div class="ui attached table segment">
+				<div class="ui grid padded">
+					<div class="sixteen wide column">
+						<table class="ui single line table padded">
+							<tbody>
+								{{range .ProtectedBranches}}
+									<tr>
+										<td><div class="ui basic primary label">{{.RuleName}}</div></td>
+										<td class="right aligned">
+										<a class="rm ui button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{$.locale.Tr "repo.settings.edit_protected_branch"}}</a>
+										<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
+										{{$.locale.Tr "repo.settings.protected_branch.delete_rule"}}</button>
+										</td>
+									</tr>
+								{{else}}
+									<tr class="center aligned"><td>{{.locale.Tr "repo.settings.no_protected_branch"}}</td></tr>
+								{{end}}
+							</tbody>
+						</table>
 					</div>
+				</div>
+			</div>
 
-					{{if $.Repository.CanCreateBranch}}
-						<h4 class="ui top attached header">
-							{{.locale.Tr "repo.settings.rename_branch"}}
-						</h4>
-						<div class="ui attached segment">
-							<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
-								{{.CsrfTokenHtml}}
-								<div class="required field">
-									<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
-									<input id="from" name="from" required>
-								</div>
-								<div class="required field {{if .Err_BranchName}}error{{end}}">
-									<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
-									<input id="to" name="to" required>
-								</div>
-								<div class="field">
-									<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-								</div>
-							</form>
+			{{if $.Repository.CanCreateBranch}}
+				<h4 class="ui top attached header">
+					{{.locale.Tr "repo.settings.rename_branch"}}
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form" action="{{$.Repository.Link}}/settings/rename_branch" method="post">
+						{{.CsrfTokenHtml}}
+						<div class="required field">
+							<label for="from">{{.locale.Tr "repo.settings.rename_branch_from"}}</label>
+							<input id="from" name="from" required>
 						</div>
-					{{end}}
-				{{end}}
-			</div>
-		</div>
+						<div class="required field {{if .Err_BranchName}}error{{end}}">
+							<label for="to">{{.locale.Tr "repo.settings.rename_branch_to"}}</label>
+							<input id="to" name="to" required>
+						</div>
+						<div class="field">
+							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+						</div>
+					</form>
+				</div>
+			{{end}}
+		{{end}}
 	</div>
-</div>
+{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui header">
@@ -110,5 +103,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-
-{{template "base/footer" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 4c6a4b85302d..b40c77a838a0 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,120 +1,113 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings collaboration">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.collaboration"}}
-				</h4>
-				{{if .Collaborators}}
-				<div class="ui attached segment collaborator list">
-					{{range .Collaborators}}
-						<div class="item ui grid">
-							<div class="ui five wide column">
-								<a href="{{.HomeLink}}">
-									{{avatar $.Context .}}
-									{{.DisplayName}}
-								</a>
-							</div>
-							<div class="ui eight wide column">
-								{{svg "octicon-shield-lock"}}
-								<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
-									<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="menu">
-										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
-										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
-										<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
-									</div>
-								</div>
-							</div>
-							<div class="ui two wide column">
-								<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-									{{$.locale.Tr "repo.settings.delete_collaborator"}}
-								</button>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.collaboration"}}
+		</h4>
+		{{if .Collaborators}}
+		<div class="ui attached segment collaborator list">
+			{{range .Collaborators}}
+				<div class="item ui grid">
+					<div class="ui five wide column">
+						<a href="{{.HomeLink}}">
+							{{avatar $.Context .}}
+							{{.DisplayName}}
+						</a>
+					</div>
+					<div class="ui eight wide column">
+						{{svg "octicon-shield-lock"}}
+						<div class="ui inline dropdown access-mode" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}" data-last-value="{{printf "%d" .Collaboration.Mode}}">
+							<div class="text">{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu">
+								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.locale.Tr "repo.settings.collaboration.admin"}}</div>
+								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.locale.Tr "repo.settings.collaboration.write"}}</div>
+								<div class="item" data-text="{{$.locale.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.locale.Tr "repo.settings.collaboration.read"}}</div>
 							</div>
 						</div>
-					{{end}}
+					</div>
+					<div class="ui two wide column">
+						<button class="ui red tiny button inline text-thin delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+							{{$.locale.Tr "repo.settings.delete_collaborator"}}
+						</button>
+					</div>
 				</div>
-				{{end}}
-				<div class="ui bottom attached segment">
-					<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="inline field ui left">
-							<div id="search-user-box" class="ui search">
-								<div class="ui input">
-									<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
-								</div>
-							</div>
+			{{end}}
+		</div>
+		{{end}}
+		<div class="ui bottom attached segment">
+			<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="inline field ui left">
+					<div id="search-user-box" class="ui search">
+						<div class="ui input">
+							<input class="prompt" name="collaborator" placeholder="{{.locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
 						</div>
-						<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
-					</form>
+					</div>
 				</div>
+				<button class="ui green button">{{.locale.Tr "repo.settings.add_collaborator"}}</button>
+			</form>
+		</div>
 
-				{{if .RepoOwnerIsOrganization}}
-				<h4 class="ui top attached header">
-					{{$.locale.Tr "repo.settings.teams"}}
-				</h4>
-				{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
-				{{if .Teams}}
-				<div class="ui attached segment collaborator list">
-					{{range $t, $team := .Teams}}
-						<div class="item ui grid">
-							<div class="ui five wide column">
-								<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
-									{{.Name}}
-								</a>
-							</div>
-							<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
-								{{svg "octicon-shield-lock"}}
-								<div class="ui inline dropdown">
-									<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
-								</div>
-								{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
-									{{$first := true}}
-									<div class="description">
-									Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
-									</div>
-								{{end}}
+		{{if .RepoOwnerIsOrganization}}
+		<h4 class="ui top attached header">
+			{{$.locale.Tr "repo.settings.teams"}}
+		</h4>
+		{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
+		{{if .Teams}}
+		<div class="ui attached segment collaborator list">
+			{{range $t, $team := .Teams}}
+				<div class="item ui grid">
+					<div class="ui five wide column">
+						<a href="{{AppSubUrl}}/org/{{$.OrgName|PathEscape}}/teams/{{.LowerName|PathEscape}}">
+							{{.Name}}
+						</a>
+					</div>
+					<div class="ui eight wide column" data-tooltip-content="{{$.locale.Tr "repo.settings.change_team_permission_tip"}}">
+						{{svg "octicon-shield-lock"}}
+						<div class="ui inline dropdown">
+							<div class="text">{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}</div>
+						</div>
+						{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
+							{{$first := true}}
+							<div class="description">
+							Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled $.Context $unit.Type) ($team.UnitEnabled $.Context $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{$.locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
 							</div>
-							{{if $allowedToChangeTeams}}
-								<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
-									<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
-											{{$.locale.Tr "repo.settings.delete_collaborator"}}
-									</button>
-								</div>
-							{{end}}
+						{{end}}
+					</div>
+					{{if $allowedToChangeTeams}}
+						<div class="ui two wide column" {{if .IncludesAllRepositories}} data-tooltip-content="{{$.locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
+							<button class="ui red tiny button inline text-thin delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
+									{{$.locale.Tr "repo.settings.delete_collaborator"}}
+							</button>
 						</div>
 					{{end}}
 				</div>
-				{{end}}
-				<div class="ui bottom attached segment">
-					{{if $allowedToChangeTeams}}
-						<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
-							{{.CsrfTokenHtml}}
-							<div class="inline field ui left">
-								<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
-									<div class="ui input">
-										<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
-									</div>
-								</div>
+			{{end}}
+		</div>
+		{{end}}
+		<div class="ui bottom attached segment">
+			{{if $allowedToChangeTeams}}
+				<form class="ui form" id="repo-collab-team-form" action="{{.Link}}/team" method="post">
+					{{.CsrfTokenHtml}}
+					<div class="inline field ui left">
+						<div id="search-team-box" class="ui search" data-org="{{.OrgName}}">
+							<div class="ui input">
+								<input class="prompt" name="team" placeholder="{{$.locale.Tr "repo.settings.search_team"}}" autocomplete="off" autofocus required>
 							</div>
-							<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
-						</form>
-					{{else}}
-						<div class="item">
-							{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
 						</div>
-					{{end}}
+					</div>
+					<button class="ui green button">{{$.locale.Tr "repo.settings.add_team"}}</button>
+				</form>
+			{{else}}
+				<div class="item">
+					{{$.locale.Tr "repo.settings.change_team_access_not_allowed"}}
 				</div>
-				{{end}}
-			</div>
+			{{end}}
 		</div>
+		{{end}}
 	</div>
-</div>
+{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -126,4 +119,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-{{template "base/footer" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 9365df28195c..91a30aece331 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,85 +1,78 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.deploy_keys"}}
-					<div class="ui right">
-					{{if not .DisableSSH}}
-						<button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
-					{{else}}
-						<button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
-					{{end}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.deploy_keys"}}
+			<div class="ui right">
+			{{if not .DisableSSH}}
+				<button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
+			{{else}}
+				<button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
+			{{end}}
+			</div>
+		</h4>
+		<div class="ui attached segment">
+			<div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
+				<form class="ui form" action="{{.Link}}" method="post">
+					{{.CsrfTokenHtml}}
+					<div class="field">
+						{{.locale.Tr "repo.settings.deploy_key_desc"}}
 					</div>
-				</h4>
-				<div class="ui attached segment">
-					<div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
-						<form class="ui form" action="{{.Link}}" method="post">
-							{{.CsrfTokenHtml}}
-							<div class="field">
-								{{.locale.Tr "repo.settings.deploy_key_desc"}}
-							</div>
-							<div class="field {{if .Err_Title}}error{{end}}">
-								<label for="title">{{.locale.Tr "repo.settings.title"}}</label>
-								<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
+					<div class="field {{if .Err_Title}}error{{end}}">
+						<label for="title">{{.locale.Tr "repo.settings.title"}}</label>
+						<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
+					</div>
+					<div class="field {{if .Err_Content}}error{{end}}">
+						<label for="content">{{.locale.Tr "repo.settings.deploy_key_content"}}</label>
+						<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
+					</div>
+					<div class="field">
+						<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
+							<input id="ssh-key-is-writable" name="is_writable" type="checkbox" value="1">
+							<label for="is_writable">
+								{{.locale.Tr "repo.settings.is_writable"}}
+							</label>
+							<small style="padding-left: 26px;">{{$.locale.Tr "repo.settings.is_writable_info" | Str2html}}</small>
+						</div>
+					</div>
+					<button class="ui green button">
+						{{.locale.Tr "repo.settings.add_deploy_key"}}
+					</button>
+					<button class="ui hide-panel button" data-panel="#add-deploy-key-panel">
+						{{.locale.Tr "cancel"}}
+					</button>
+				</form>
+			</div>
+			{{if .Deploykeys}}
+				<div class="ui key list">
+					{{range .Deploykeys}}
+						<div class="item">
+							<div class="right floated content">
+								<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+									{{$.locale.Tr "settings.delete_key"}}
+								</button>
 							</div>
-							<div class="field {{if .Err_Content}}error{{end}}">
-								<label for="content">{{.locale.Tr "repo.settings.deploy_key_content"}}</label>
-								<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
+							<div class="left floated content">
+								<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</i>
 							</div>
-							<div class="field">
-								<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
-									<input id="ssh-key-is-writable" name="is_writable" type="checkbox" value="1">
-									<label for="is_writable">
-										{{.locale.Tr "repo.settings.is_writable"}}
-									</label>
-									<small style="padding-left: 26px;">{{$.locale.Tr "repo.settings.is_writable_info" | Str2html}}</small>
+							<div class="content">
+								<strong>{{.Name}}</strong>
+								<div class="print meta">
+									{{.Fingerprint}}
 								</div>
-							</div>
-							<button class="ui green button">
-								{{.locale.Tr "repo.settings.add_deploy_key"}}
-							</button>
-							<button class="ui hide-panel button" data-panel="#add-deploy-key-panel">
-								{{.locale.Tr "cancel"}}
-							</button>
-						</form>
-					</div>
-					{{if .Deploykeys}}
-						<div class="ui key list">
-							{{range .Deploykeys}}
-								<div class="item">
-									<div class="right floated content">
-										<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-											{{$.locale.Tr "settings.delete_key"}}
-										</button>
-									</div>
-									<div class="left floated content">
-										<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.key_state_desc"}}"{{end}}>{{svg "octicon-key" 32}}</i>
-									</div>
-									<div class="content">
-										<strong>{{.Name}}</strong>
-										<div class="print meta">
-											{{.Fingerprint}}
-										</div>
-										<div class="activity meta">
-											<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
-										</div>
-									</div>
+								<div class="activity meta">
+									<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - <span>{{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}</span></i>
 								</div>
-							{{end}}
+							</div>
 						</div>
-					{{else}}
-						{{.locale.Tr "repo.settings.no_deploy_keys"}}
 					{{end}}
 				</div>
-			</div>
+			{{else}}
+				{{.locale.Tr "repo.settings.no_deploy_keys"}}
+			{{end}}
 		</div>
 	</div>
-</div>
+{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -91,4 +84,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-{{template "base/footer" .}}
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index be550136bf91..64f4c7da7672 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,36 +1,28 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit githook">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.githooks"}}
-				</h4>
-				<div class="ui attached segment">
-					<p>{{.locale.Tr "repo.settings.githook_edit_desc"}}</p>
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						{{with .Hook}}
-							<div class="inline field">
-								<label>{{$.locale.Tr "repo.settings.githook_name"}}</label>
-								<span class="hook-filename">{{.Name}}</span>
-							</div>
-							<div class="field">
-								<label for="content">{{$.locale.Tr "repo.settings.githook_content"}}</label>
-								<textarea id="content" name="content" class="gt-hidden">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
-								<div class="editor-loading is-loading"></div>
-							</div>
-							<div class="inline field">
-								<button class="ui green button">{{$.locale.Tr "repo.settings.update_githook"}}</button>
-							</div>
-						{{end}}
-					</form>
-				</div>
-			</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit githook")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.githooks"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "repo.settings.githook_edit_desc"}}</p>
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				{{with .Hook}}
+					<div class="inline field">
+						<label>{{$.locale.Tr "repo.settings.githook_name"}}</label>
+						<span class="hook-filename">{{.Name}}</span>
+					</div>
+					<div class="field">
+						<label for="content">{{$.locale.Tr "repo.settings.githook_content"}}</label>
+						<textarea id="content" name="content" class="gt-hidden">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
+						<div class="editor-loading is-loading"></div>
+					</div>
+					<div class="inline field">
+						<button class="ui green button">{{$.locale.Tr "repo.settings.update_githook"}}</button>
+					</div>
+				{{end}}
+			</form>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 838fc3ad14ce..f61baba54a69 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,32 +1,24 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings githooks">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.githooks"}}
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui list">
-						<div class="item">
-							{{.locale.Tr "repo.settings.githooks_desc" | Str2html}}
-						</div>
-						{{range .Hooks}}
-							<div class="item truncated-item-container">
-								<span class="text {{if .IsActive}}green{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span>
-								<span class="text truncate gt-f1 gt-mr-3">{{.Name}}</span>
-								<a class="muted ui right gt-p-3" href="{{$.RepoLink}}/settings/hooks/git/{{.Name|PathEscape}}">
-									{{svg "octicon-pencil"}}
-								</a>
-							</div>
-						{{end}}
-					</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings githooks")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.githooks"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui list">
+				<div class="item">
+					{{.locale.Tr "repo.settings.githooks_desc" | Str2html}}
 				</div>
+				{{range .Hooks}}
+					<div class="item truncated-item-container">
+						<span class="text {{if .IsActive}}green{{else}}grey{{end}} gt-mr-3">{{svg "octicon-dot-fill" 22}}</span>
+						<span class="text truncate gt-f1 gt-mr-3">{{.Name}}</span>
+						<a class="muted ui right gt-p-3" href="{{$.RepoLink}}/settings/hooks/git/{{.Name|PathEscape}}">
+							{{svg "octicon-pencil"}}
+						</a>
+					</div>
+				{{end}}
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/layout_footer.tmpl b/templates/repo/settings/layout_footer.tmpl
new file mode 100644
index 000000000000..31e87cb5373c
--- /dev/null
+++ b/templates/repo/settings/layout_footer.tmpl
@@ -0,0 +1,8 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="repo-layout-right">
+		{{/* block: repo-main-content */}}
+{{end}}
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl
new file mode 100644
index 000000000000..7fb936860f39
--- /dev/null
+++ b/templates/repo/settings/layout_head.tmpl
@@ -0,0 +1,10 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	{{template "repo/header" .ctxData}}
+	<div class="ui container stackable grid">
+        {{template "repo/settings/navbar" .ctxData}}
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		{{/* block: admin-main-content */}}
+	</div>
+</div>
+{{end}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 1ce4bf787d79..dd583bb9e6c5 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,67 +1,60 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
-					<div class="ui right">
-						<a class="ui tiny button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
-						<a class="ui primary tiny button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
-					</div>
-				</h4>
-				<table id="lfs-files-table" class="ui attached segment single line table">
-					<tbody>
-						{{range .LFSFiles}}
-							<tr>
-								<td>
-									<span class="text sha label">
-										<a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui detail icon button brown truncate">
-											{{ShortSha .Oid}}
-										</a>
-									</span>
-								</td>
-								<td>{{FileSize .Size}}</td>
-								<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
-								<td class="right aligned">
-									<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-									<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
-										<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
-									</button>
-								</td>
-							</tr>
-						{{else}}
-							<tr>
-								<td colspan="4">{{.locale.Tr "repo.settings.lfs_no_lfs_files"}}</td>
-							</tr>
-						{{end}}
-					</tbody>
-				</table>
-				{{template "base/paginate" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
+			<div class="ui right">
+				<a class="ui tiny button" href="{{.Link}}/locks">{{.locale.Tr "repo.settings.lfs_locks"}}</a>
+				<a class="ui primary tiny button" href="{{.Link}}/pointers">&nbsp;{{.locale.Tr "repo.settings.lfs_findpointerfiles"}}</a>
+			</div>
+		</h4>
+		<table id="lfs-files-table" class="ui attached segment single line table">
+			<tbody>
 				{{range .LFSFiles}}
-					<div class="ui basic modal" id="delete-{{.Oid}}">
-						<div class="ui icon header">
-							{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
-						</div>
-						<div class="content center">
-							<p>
-								{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
-							</p>
-							<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
-								{{$.CsrfTokenHtml}}
-								<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
-									<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
-									<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
-								</div>
-							</form>
-						</div>
-					</div>
+					<tr>
+						<td>
+							<span class="text sha label">
+								<a href="{{$.Link}}/show/{{.Oid}}" title="{{.Oid}}" class="ui detail icon button brown truncate">
+									{{ShortSha .Oid}}
+								</a>
+							</span>
+						</td>
+						<td>{{FileSize .Size}}</td>
+						<td>{{TimeSince .CreatedUnix.AsTime $.locale}}</td>
+						<td class="right aligned">
+							<a class="ui primary button" href="{{$.Link}}/find?oid={{.Oid}}&size={{.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+							<button class="ui basic show-modal icon button" data-modal="#delete-{{.Oid}}">
+								<span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{$.locale.Tr "repo.editor.delete_this_file"}}">{{svg "octicon-trash"}}</span>
+							</button>
+						</td>
+					</tr>
+				{{else}}
+					<tr>
+						<td colspan="4">{{.locale.Tr "repo.settings.lfs_no_lfs_files"}}</td>
+					</tr>
 				{{end}}
+			</tbody>
+		</table>
+		{{template "base/paginate" .}}
+		{{range .LFSFiles}}
+			<div class="ui basic modal" id="delete-{{.Oid}}">
+				<div class="ui icon header">
+					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
+				</div>
+				<div class="content center">
+					<p>
+						{{$.locale.Tr "repo.settings.lfs_delete_warning"}}
+					</p>
+					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
+						{{$.CsrfTokenHtml}}
+						<div class="center actions">{{/* TODO: Convert to base/delete_modal_actions */}}
+							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
+							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
+						</div>
+					</form>
+				</div>
 			</div>
-		</div>
+		{{end}}
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 1e8795161426..15daf59a5034 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,68 +1,60 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				<div class="ui container repository file list">
-					{{template "base/alert" .}}
-					<div class="tab-size-8 non-diff-file-content">
-						<h4 class="ui top attached header">
-							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
-							<div class="ui right">
-								{{if .EscapeStatus.Escaped}}
-									<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
-									<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
-								{{end}}
-								<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-							</div>
-						</h4>
-						<div class="ui attached table unstackable segment">
-							{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
-							<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
-								{{if .IsMarkup}}
-									{{if .FileContent}}{{.FileContent | Safe}}{{end}}
-								{{else if .IsPlainText}}
-									<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
-								{{else if not .IsTextFile}}
-									<div class="view-raw ui center">
-										{{if .IsImageFile}}
-											<img src="{{$.RawFileLink}}">
-										{{else if .IsVideoFile}}
-											<video controls src="{{$.RawFileLink}}">
-												<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
-											</video>
-										{{else if .IsAudioFile}}
-											<audio controls src="{{$.RawFileLink}}">
-												<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
-											</audio>
-										{{else if .IsPDFFile}}
-											<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
-										{{else}}
-											<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
-										{{end}}
-									</div>
-								{{else if .FileSize}}
-									<table>
-										<tbody>
-											<tr>
-											{{if .IsFileTooLarge}}
-												<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
-											{{else}}
-												<td class="lines-num">{{.LineNums}}</td>
-												<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
-											{{end}}
-											</tr>
-										</tbody>
-									</table>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="twelve wide column content">
+		<div class="ui container repository file list">
+			{{template "base/alert" .}}
+			<div class="tab-size-8 non-diff-file-content">
+				<h4 class="ui top attached header">
+					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
+					<div class="ui right">
+						{{if .EscapeStatus.Escaped}}
+							<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
+							<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
+						{{end}}
+						<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+					</div>
+				</h4>
+				<div class="ui attached table unstackable segment">
+					{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
+					<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
+						{{if .IsMarkup}}
+							{{if .FileContent}}{{.FileContent | Safe}}{{end}}
+						{{else if .IsPlainText}}
+							<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
+						{{else if not .IsTextFile}}
+							<div class="view-raw ui center">
+								{{if .IsImageFile}}
+									<img src="{{$.RawFileLink}}">
+								{{else if .IsVideoFile}}
+									<video controls src="{{$.RawFileLink}}">
+										<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
+									</video>
+								{{else if .IsAudioFile}}
+									<audio controls src="{{$.RawFileLink}}">
+										<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
+									</audio>
+								{{else if .IsPDFFile}}
+									<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
+								{{else}}
+									<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
 								{{end}}
 							</div>
-						</div>
+						{{else if .FileSize}}
+							<table>
+								<tbody>
+									<tr>
+									{{if .IsFileTooLarge}}
+										<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
+									{{else}}
+										<td class="lines-num">{{.LineNums}}</td>
+										<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
+									{{end}}
+									</tr>
+								</tbody>
+							</table>
+						{{end}}
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 172968522dbe..b15bc4d1d61d 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,58 +1,50 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				<div class="ui container repository file list">
-					{{template "base/alert" .}}
-					<div class="tab-size-8 non-diff-file-content">
-						<h4 class="ui top attached header">
-							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
-						</h4>
-						<table id="lfs-files-find-table" class="ui attached segment single line table">
-							<tbody>
-								{{range .Results}}
-									<tr>
-										<td>
-											{{svg "octicon-file"}}
-											<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
-										</td>
-										<td class="message">
-											<span class="truncate">
-												<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
-													{{.Summary | RenderEmoji $.Context}}
-												</a>
-											</span>
-										</td>
-										<td>
-											<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
-										</td>
-										<td>
-											{{if .ParentHashes}}
-												{{$.locale.Tr "repo.diff.parent"}}
-												{{range .ParentHashes}}
-													<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
-												{{end}}
-											{{end}}
-											<div class="mobile-only"></div>
-											{{$.locale.Tr "repo.diff.commit"}}
-											<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
-										</td>
-										<td>{{TimeSince .When $.locale}}</td>
-									</tr>
-								{{else}}
-									<tr>
-										<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
-									</tr>
-								{{end}}
-							</tbody>
-						</table>
-					</div>
-				</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="twelve wide column content">
+		<div class="ui container repository file list">
+			{{template "base/alert" .}}
+			<div class="tab-size-8 non-diff-file-content">
+				<h4 class="ui top attached header">
+					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
+				</h4>
+				<table id="lfs-files-find-table" class="ui attached segment single line table">
+					<tbody>
+						{{range .Results}}
+							<tr>
+								<td>
+									{{svg "octicon-file"}}
+									<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
+								</td>
+								<td class="message">
+									<span class="truncate">
+										<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
+											{{.Summary | RenderEmoji $.Context}}
+										</a>
+									</span>
+								</td>
+								<td>
+									<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
+								</td>
+								<td>
+									{{if .ParentHashes}}
+										{{$.locale.Tr "repo.diff.parent"}}
+										{{range .ParentHashes}}
+											<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
+										{{end}}
+									{{end}}
+									<div class="mobile-only"></div>
+									{{$.locale.Tr "repo.diff.commit"}}
+									<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
+								</td>
+								<td>{{TimeSince .When $.locale}}</td>
+							</tr>
+						{{else}}
+							<tr>
+								<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
+							</tr>
+						{{end}}
+					</tbody>
+				</table>
 			</div>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index ebecafcce379..a1395f70032c 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,67 +1,60 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				<div class="ui container repository file list">
-					{{template "base/alert" .}}
-					<div class="tab-size-8 non-diff-file-content">
-						<h4 class="ui top attached header">
-							<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
-						</h4>
-						<div class="ui attached segment">
-							<form class="ui form ignore-dirty" method="POST">
-								{{$.CsrfTokenHtml}}
-								<div class="ui fluid action input">
-									<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
-									<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
-								</div>
-							</form>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="twelve wide column content">
+		<div class="ui container repository file list">
+			{{template "base/alert" .}}
+			<div class="tab-size-8 non-diff-file-content">
+				<h4 class="ui top attached header">
+					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
+				</h4>
+				<div class="ui attached segment">
+					<form class="ui form ignore-dirty" method="POST">
+						{{$.CsrfTokenHtml}}
+						<div class="ui fluid action input">
+							<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
+							<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
 						</div>
-						<table id="lfs-files-locks-table" class="ui attached segment single line table">
-							<tbody>
-								{{range $index, $lock := .LFSLocks}}
-									<tr>
-										<td>
-											{{if index $.Linkable $index}}
-												{{svg "octicon-file"}}
-											<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
-											{{else}}
-												{{svg "octicon-diff"}}
-											<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
-											{{end}}
-											{{if not (index $.Lockables $index)}}
-												<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
-											{{end}}
-										</td>
-										<td>
-											<a href="{{$.Owner.HomeLink}}">
-												{{avatar $.Context $.Owner}}
-												{{$.Owner.DisplayName}}
-											</a>
-										</td>
-										<td>{{TimeSince .Created $.locale}}</td>
-										<td class="right aligned">
-											<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
-												{{$.CsrfTokenHtml}}
-												<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
-											</form>
-										</td>
-									</tr>
-								{{else}}
-									<tr>
-										<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
-									</tr>
-								{{end}}
-							</tbody>
-						</table>
-						{{template "base/paginate" .}}
-					</div>
+					</form>
 				</div>
+				<table id="lfs-files-locks-table" class="ui attached segment single line table">
+					<tbody>
+						{{range $index, $lock := .LFSLocks}}
+							<tr>
+								<td>
+									{{if index $.Linkable $index}}
+										{{svg "octicon-file"}}
+									<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
+									{{else}}
+										{{svg "octicon-diff"}}
+									<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
+									{{end}}
+									{{if not (index $.Lockables $index)}}
+										<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
+									{{end}}
+								</td>
+								<td>
+									<a href="{{$.Owner.HomeLink}}">
+										{{avatar $.Context $.Owner}}
+										{{$.Owner.DisplayName}}
+									</a>
+								</td>
+								<td>{{TimeSince .Created $.locale}}</td>
+								<td class="right aligned">
+									<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
+										{{$.CsrfTokenHtml}}
+										<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
+									</form>
+								</td>
+							</tr>
+						{{else}}
+							<tr>
+								<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
+							</tr>
+						{{end}}
+					</tbody>
+				</table>
+				{{template "base/paginate" .}}
 			</div>
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 992dc5f938d2..0d2d9a6a406d 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,75 +1,67 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings lfs">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
-					{{if gt .NumAssociatable 0}}
-						<div class="ui right">
-							<form class="ui form" method="post" action="{{$.Link}}/associate">
-								{{.CsrfTokenHtml}}
-								{{range .Pointers}}
-									{{if .Associatable}}
-										<input type="hidden" name="oid" value="{{.Oid}} {{.Size}}">
-									{{end}}
-								{{end}}
-								<button class="ui green button">{{$.locale.Tr "repo.settings.lfs_pointers.associateAccessible" $.NumAssociatable}}</button>
-							</form>
-						</div>
-					{{end}}
-				</h4>
-				<div class="ui attached segment">
-					<table id="lfs-files-table" class="ui fixed single line table">
-						<thead>
-							<tr>
-								<th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th>
-								<th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th>
-								<th class="three wide"></th>
-								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th>
-								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th>
-								<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th>
-							</tr>
-						</thead>
-						<tbody>
-							{{range .Pointers}}
-								<tr>
-									<td>
-										<span class="text sha label" title="{{.SHA}}">
-											<a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" class="ui detail icon button truncate">
-												{{ShortSha .SHA}}
-											</a>
-										</span>
-									</td>
-									<td>
-										<span class="text sha label" title="{{.Oid}}">
-											{{if and .Exists .InRepo}}
-												<a href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank" class="ui text detail icon button brown truncate">
-													{{ShortSha .Oid}}
-												</a>
-											{{else}}
-												<button class="ui detail icon button brown disabled truncate">
-													{{ShortSha .Oid}}
-												</button>
-											{{end}}
-										</span>
-									</td>
-									<td>
-										<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-									</td>
-									<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-									<td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
-								</tr>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
+			{{if gt .NumAssociatable 0}}
+				<div class="ui right">
+					<form class="ui form" method="post" action="{{$.Link}}/associate">
+						{{.CsrfTokenHtml}}
+						{{range .Pointers}}
+							{{if .Associatable}}
+								<input type="hidden" name="oid" value="{{.Oid}} {{.Size}}">
 							{{end}}
-						</tbody>
-					</table>
+						{{end}}
+						<button class="ui green button">{{$.locale.Tr "repo.settings.lfs_pointers.associateAccessible" $.NumAssociatable}}</button>
+					</form>
 				</div>
-			</div>
+			{{end}}
+		</h4>
+		<div class="ui attached segment">
+			<table id="lfs-files-table" class="ui fixed single line table">
+				<thead>
+					<tr>
+						<th class="three wide">{{.locale.Tr "repo.settings.lfs_pointers.sha"}}</th>
+						<th class="four wide">{{.locale.Tr "repo.settings.lfs_pointers.oid"}}</th>
+						<th class="three wide"></th>
+						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.inRepo"}}</th>
+						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.exists"}}</th>
+						<th class="two wide">{{.locale.Tr "repo.settings.lfs_pointers.accessible"}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					{{range .Pointers}}
+						<tr>
+							<td>
+								<span class="text sha label" title="{{.SHA}}">
+									<a href="{{$.RepoLink}}/raw/blob/{{.SHA}}" rel="nofollow" target="_blank" class="ui detail icon button truncate">
+										{{ShortSha .SHA}}
+									</a>
+								</span>
+							</td>
+							<td>
+								<span class="text sha label" title="{{.Oid}}">
+									{{if and .Exists .InRepo}}
+										<a href="{{$.LFSFilesLink}}/show/{{.Oid}}" rel="nofollow" target="_blank" class="ui text detail icon button brown truncate">
+											{{ShortSha .Oid}}
+										</a>
+									{{else}}
+										<button class="ui detail icon button brown disabled truncate">
+											{{ShortSha .Oid}}
+										</button>
+									{{end}}
+								</span>
+							</td>
+							<td>
+								<a class="ui primary button" href="{{$.LFSFilesLink}}/find?oid={{.Oid}}&size={{.Size}}&sha={{.SHA}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+							</td>
+							<td>{{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+							<td>{{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 962679bd62e3..f402401e2659 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,808 +1,801 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings options">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.basic_settings"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="action" value="update">
-						<div class="required field {{if .Err_RepoName}}error{{end}}">
-							<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
-							<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
-						</div>
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.repo_size"}}</label>
-							<span>{{FileSize .Repository.Size}}</span>
-						</div>
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.template"}}</label>
-							<div class="ui checkbox">
-								<input name="template" type="checkbox" {{if .Repository.IsTemplate}}checked{{end}}>
-								<label>{{.locale.Tr "repo.template_helper"}}</label>
-							</div>
-						</div>
-						{{if not .Repository.IsFork}}
-							<div class="inline field">
-								<label>{{.locale.Tr "repo.visibility"}}</label>
-								<div class="ui checkbox">
-									{{if .IsAdmin}}
-									<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}>
-									{{else}}
-									<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>
-									{{end}}
-									<label>{{.locale.Tr "repo.visibility_helper" | Safe}} {{if .Repository.NumForks}}<span class="text red">{{.locale.Tr "repo.visibility_fork_helper"}}</span>{{end}}</label>
-								</div>
-							</div>
-						{{end}}
-						<div class="field {{if .Err_Description}}error{{end}}">
-							<label for="description">{{$.locale.Tr "repo.repo_desc"}}</label>
-							<textarea id="description" name="description" rows="2" maxlength="2048">{{.Repository.Description}}</textarea>
-						</div>
-						<div class="field {{if .Err_Website}}error{{end}}">
-							<label for="website">{{.locale.Tr "repo.settings.site"}}</label>
-							<input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}">
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings options")}}
+	<div class="twelve wide column">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.basic_settings"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="action" value="update">
+				<div class="required field {{if .Err_RepoName}}error{{end}}">
+					<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
+					<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
+				</div>
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.repo_size"}}</label>
+					<span>{{FileSize .Repository.Size}}</span>
+				</div>
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.template"}}</label>
+					<div class="ui checkbox">
+						<input name="template" type="checkbox" {{if .Repository.IsTemplate}}checked{{end}}>
+						<label>{{.locale.Tr "repo.template_helper"}}</label>
+					</div>
+				</div>
+				{{if not .Repository.IsFork}}
+					<div class="inline field">
+						<label>{{.locale.Tr "repo.visibility"}}</label>
+						<div class="ui checkbox">
+							{{if .IsAdmin}}
+							<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}>
+							{{else}}
+							<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}{{if and $.ForcePrivate .Repository.IsPrivate}} readonly{{end}}>
+							{{end}}
+							<label>{{.locale.Tr "repo.visibility_helper" | Safe}} {{if .Repository.NumForks}}<span class="text red">{{.locale.Tr "repo.visibility_fork_helper"}}</span>{{end}}</label>
 						</div>
+					</div>
+				{{end}}
+				<div class="field {{if .Err_Description}}error{{end}}">
+					<label for="description">{{$.locale.Tr "repo.repo_desc"}}</label>
+					<textarea id="description" name="description" rows="2" maxlength="2048">{{.Repository.Description}}</textarea>
+				</div>
+				<div class="field {{if .Err_Website}}error{{end}}">
+					<label for="website">{{.locale.Tr "repo.settings.site"}}</label>
+					<input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}">
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+				</div>
+			</form>
 
-					<div class="ui divider"></div>
+			<div class="ui divider"></div>
 
-					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-						{{.CsrfTokenHtml}}
-						<div class="inline field">
-							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-							<input name="avatar" type="file" >
-						</div>
+			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+				{{.CsrfTokenHtml}}
+				<div class="inline field">
+					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+					<input name="avatar" type="file" >
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
-						</div>
-					</form>
-
-				</div>
-
-				{{if .MirrorsEnabled}}
-					<h4 class="ui top attached header">
-						{{.locale.Tr "repo.settings.mirror_settings"}}
-					</h4>
-					<div class="ui attached segment">
-						{{$.locale.Tr "repo.settings.mirror_settings.docs" | Safe}}
-						<table class="ui table">
-							{{if or .Repository.IsMirror .PushMirrors}}
-							<thead>
-								<tr>
-									<th style="width:40%">{{$.locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
-									<th>{{$.locale.Tr "repo.settings.mirror_settings.direction"}}</th>
-									<th>{{$.locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
-									<th></th>
-								</tr>
-							</thead>
-							{{end}}
-							{{if .Repository.IsMirror}}
-							<tbody>
-								<tr>
-									<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
-									<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
-									<td>{{template "shared/datetime/full" (dict "Datetime" .Mirror.UpdatedUnix.FormatLong "Fallback" .Mirror.UpdatedUnix.AsTime)}}</td>
-									<td class="right aligned">
-										<form method="post" style="display: inline-block">
-											{{.CsrfTokenHtml}}
-											<input type="hidden" name="action" value="mirror-sync">
-											<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
-										</form>
-									</td>
-								</tr>
-								<tr>
-									<td colspan="4">
-										<form class="ui form" method="post">
-											{{template "base/disable_form_autofill"}}
-											{{.CsrfTokenHtml}}
-											<input type="hidden" name="action" value="mirror">
-											<div class="inline field {{if .Err_EnablePrune}}error{{end}}">
-												<label>{{.locale.Tr "repo.mirror_prune"}}</label>
-												<div class="ui checkbox">
-											<input id="enable_prune" name="enable_prune" type="checkbox" {{if .MirrorEnablePrune}}checked{{end}}>
-											<label>{{.locale.Tr "repo.mirror_prune_desc"}}</label>
-												</div>
-											</div>
-											<div class="inline field {{if .Err_Interval}}error{{end}}">
-												<label for="interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-												<input id="interval" name="interval" value="{{.MirrorInterval}}">
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
+				</div>
+			</form>
+
+		</div>
+
+		{{if .MirrorsEnabled}}
+			<h4 class="ui top attached header">
+				{{.locale.Tr "repo.settings.mirror_settings"}}
+			</h4>
+			<div class="ui attached segment">
+				{{$.locale.Tr "repo.settings.mirror_settings.docs" | Safe}}
+				<table class="ui table">
+					{{if or .Repository.IsMirror .PushMirrors}}
+					<thead>
+						<tr>
+							<th style="width:40%">{{$.locale.Tr "repo.settings.mirror_settings.mirrored_repository"}}</th>
+							<th>{{$.locale.Tr "repo.settings.mirror_settings.direction"}}</th>
+							<th>{{$.locale.Tr "repo.settings.mirror_settings.last_update"}}</th>
+							<th></th>
+						</tr>
+					</thead>
+					{{end}}
+					{{if .Repository.IsMirror}}
+					<tbody>
+						<tr>
+							<td>{{(MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false).Address}}</td>
+							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}}</td>
+							<td>{{template "shared/datetime/full" (dict "Datetime" .Mirror.UpdatedUnix.FormatLong "Fallback" .Mirror.UpdatedUnix.AsTime)}}</td>
+							<td class="right aligned">
+								<form method="post" style="display: inline-block">
+									{{.CsrfTokenHtml}}
+									<input type="hidden" name="action" value="mirror-sync">
+									<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
+								</form>
+							</td>
+						</tr>
+						<tr>
+							<td colspan="4">
+								<form class="ui form" method="post">
+									{{template "base/disable_form_autofill"}}
+									{{.CsrfTokenHtml}}
+									<input type="hidden" name="action" value="mirror">
+									<div class="inline field {{if .Err_EnablePrune}}error{{end}}">
+										<label>{{.locale.Tr "repo.mirror_prune"}}</label>
+										<div class="ui checkbox">
+									<input id="enable_prune" name="enable_prune" type="checkbox" {{if .MirrorEnablePrune}}checked{{end}}>
+									<label>{{.locale.Tr "repo.mirror_prune_desc"}}</label>
+										</div>
+									</div>
+									<div class="inline field {{if .Err_Interval}}error{{end}}">
+										<label for="interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+										<input id="interval" name="interval" value="{{.MirrorInterval}}">
+									</div>
+									{{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false}}
+									<div class="field {{if .Err_MirrorAddress}}error{{end}}">
+										<label for="mirror_address">{{.locale.Tr "repo.mirror_address"}}</label>
+										<input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required>
+										<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
+									</div>
+									<details class="ui optional field" {{if or .Err_Auth $address.Username}}open{{end}}>
+										<summary class="gt-p-2">
+											{{.locale.Tr "repo.need_auth"}}
+										</summary>
+										<div class="gt-p-2">
+											<div class="inline field {{if .Err_Auth}}error{{end}}">
+												<label for="mirror_username">{{.locale.Tr "username"}}</label>
+												<input id="mirror_username" name="mirror_username" value="{{$address.Username}}" {{if not .mirror_username}}data-need-clear="true"{{end}}>
 											</div>
-											{{$address := MirrorRemoteAddress $.Context .Repository .Mirror.GetRemoteName false}}
-											<div class="field {{if .Err_MirrorAddress}}error{{end}}">
-												<label for="mirror_address">{{.locale.Tr "repo.mirror_address"}}</label>
-												<input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required>
-												<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
+											<div class="inline field {{if .Err_Auth}}error{{end}}">
+												<label for="mirror_password">{{.locale.Tr "password"}}</label>
+												<input id="mirror_password" name="mirror_password" type="password" placeholder="{{if $address.Password}}{{.locale.Tr "repo.mirror_password_placeholder"}}{{else}}{{.locale.Tr "repo.mirror_password_blank_placeholder"}}{{end}}" value="" {{if not .mirror_password}}data-need-clear="true"{{end}} autocomplete="off">
 											</div>
-											<details class="ui optional field" {{if or .Err_Auth $address.Username}}open{{end}}>
-												<summary class="gt-p-2">
-													{{.locale.Tr "repo.need_auth"}}
-												</summary>
-												<div class="gt-p-2">
-													<div class="inline field {{if .Err_Auth}}error{{end}}">
-														<label for="mirror_username">{{.locale.Tr "username"}}</label>
-														<input id="mirror_username" name="mirror_username" value="{{$address.Username}}" {{if not .mirror_username}}data-need-clear="true"{{end}}>
-													</div>
-													<div class="inline field {{if .Err_Auth}}error{{end}}">
-														<label for="mirror_password">{{.locale.Tr "password"}}</label>
-														<input id="mirror_password" name="mirror_password" type="password" placeholder="{{if $address.Password}}{{.locale.Tr "repo.mirror_password_placeholder"}}{{else}}{{.locale.Tr "repo.mirror_password_blank_placeholder"}}{{end}}" value="" {{if not .mirror_password}}data-need-clear="true"{{end}} autocomplete="off">
-													</div>
-													<p class="help">{{.locale.Tr "repo.mirror_password_help"}}</p>
+											<p class="help">{{.locale.Tr "repo.mirror_password_help"}}</p>
+										</div>
+									</details>
+
+									{{if .LFSStartServer}}
+									<div class="inline field">
+										<label>{{.locale.Tr "repo.mirror_lfs"}}</label>
+										<div class="ui checkbox">
+											<input id="mirror_lfs" name="mirror_lfs" type="checkbox" {{if .Mirror.LFS}}checked{{end}}>
+											<label>{{.locale.Tr "repo.mirror_lfs_desc"}}</label>
+										</div>
+									</div>
+									<div class="field {{if .Err_LFSEndpoint}}error{{end}}">
+										<label for="mirror_lfs_endpoint">{{.locale.Tr "repo.mirror_lfs_endpoint"}}</label>
+										<input id="mirror_lfs_endpoint" name="mirror_lfs_endpoint" value="{{.Mirror.LFSEndpoint}}" placeholder="{{.locale.Tr "repo.migrate_options_lfs_endpoint.placeholder"}}">
+										<p class="help">{{.locale.Tr "repo.mirror_lfs_endpoint_desc" "https://github.com/git-lfs/git-lfs/blob/main/docs/api/server-discovery.md#server-discovery" | Str2html}}</p>
+									</div>
+									{{end}}
+									<div class="field">
+										<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+									</div>
+								</form>
+							</td>
+						</tr>
+					</tbody>
+					<thead><tr><th colspan="4"></th></tr></thead>
+					{{end}}
+					<tbody>
+						{{range .PushMirrors}}
+						<tr>
+							{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
+							<td>{{$address.Address}}</td>
+							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
+							<td>{{if .LastUpdateUnix}}{{template "shared/datetime/full" (dict "Datetime" .LastUpdateUnix.FormatLong "Fallback" .LastUpdateUnix.AsTime)}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
+							<td class="right aligned">
+								<form method="post" style="display: inline-block">
+									{{$.CsrfTokenHtml}}
+									<input type="hidden" name="action" value="push-mirror-remove">
+									<input type="hidden" name="push_mirror_id" value="{{.ID}}">
+									<button class="ui basic red tiny button inline text-thin">{{$.locale.Tr "remove"}}</button>
+								</form>
+								<form method="post" style="display: inline-block">
+									{{$.CsrfTokenHtml}}
+									<input type="hidden" name="action" value="push-mirror-sync">
+									<input type="hidden" name="push_mirror_id" value="{{.ID}}">
+									<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
+								</form>
+							</td>
+						</tr>
+						{{else}}
+						<tr>
+							<td>{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.none"}}</td>
+						</tr>
+						{{end}}
+						{{if (not .DisableNewPushMirrors)}}
+							<tr>
+								<td colspan="4">
+									<form class="ui form" method="post">
+										{{template "base/disable_form_autofill"}}
+										{{.CsrfTokenHtml}}
+										<input type="hidden" name="action" value="push-mirror-add">
+										<div class="field {{if .Err_PushMirrorAddress}}error{{end}}">
+											<label for="push_mirror_address">{{.locale.Tr "repo.settings.mirror_settings.push_mirror.remote_url"}}</label>
+											<input id="push_mirror_address" name="push_mirror_address" value="{{.push_mirror_address}}" required>
+											<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
+										</div>
+										<details class="ui optional field" {{if or .Err_PushMirrorAuth .push_mirror_username}}open{{end}}>
+											<summary class="gt-p-2">
+												{{.locale.Tr "repo.need_auth"}}
+											</summary>
+											<div class="gt-p-2">
+												<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
+													<label for="push_mirror_username">{{.locale.Tr "username"}}</label>
+													<input id="push_mirror_username" name="push_mirror_username" value="{{.push_mirror_username}}">
 												</div>
-											</details>
-
-											{{if .LFSStartServer}}
-											<div class="inline field">
-												<label>{{.locale.Tr "repo.mirror_lfs"}}</label>
-												<div class="ui checkbox">
-													<input id="mirror_lfs" name="mirror_lfs" type="checkbox" {{if .Mirror.LFS}}checked{{end}}>
-													<label>{{.locale.Tr "repo.mirror_lfs_desc"}}</label>
+												<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
+													<label for="push_mirror_password">{{.locale.Tr "password"}}</label>
+													<input id="push_mirror_password" name="push_mirror_password" type="password" value="{{.push_mirror_password}}" autocomplete="off">
 												</div>
 											</div>
-											<div class="field {{if .Err_LFSEndpoint}}error{{end}}">
-												<label for="mirror_lfs_endpoint">{{.locale.Tr "repo.mirror_lfs_endpoint"}}</label>
-												<input id="mirror_lfs_endpoint" name="mirror_lfs_endpoint" value="{{.Mirror.LFSEndpoint}}" placeholder="{{.locale.Tr "repo.migrate_options_lfs_endpoint.placeholder"}}">
-												<p class="help">{{.locale.Tr "repo.mirror_lfs_endpoint_desc" "https://github.com/git-lfs/git-lfs/blob/main/docs/api/server-discovery.md#server-discovery" | Str2html}}</p>
+										</details>
+										<div class="field">
+											<div class="ui checkbox">
+												<input id="push_mirror_sync_on_commit" name="push_mirror_sync_on_commit" type="checkbox" {{if .push_mirror_sync_on_commit}}checked{{end}}>
+												<label for="push_mirror_sync_on_commit">{{.locale.Tr "repo.mirror_sync_on_commit"}}</label>
 											</div>
-											{{end}}
-											<div class="field">
-												<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
-											</div>
-										</form>
-									</td>
-								</tr>
-							</tbody>
-							<thead><tr><th colspan="4"></th></tr></thead>
-							{{end}}
-							<tbody>
-								{{range .PushMirrors}}
-								<tr>
-									{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
-									<td>{{$address.Address}}</td>
-									<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
-									<td>{{if .LastUpdateUnix}}{{template "shared/datetime/full" (dict "Datetime" .LastUpdateUnix.FormatLong "Fallback" .LastUpdateUnix.AsTime)}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
-									<td class="right aligned">
-										<form method="post" style="display: inline-block">
-											{{$.CsrfTokenHtml}}
-											<input type="hidden" name="action" value="push-mirror-remove">
-											<input type="hidden" name="push_mirror_id" value="{{.ID}}">
-											<button class="ui basic red tiny button inline text-thin">{{$.locale.Tr "remove"}}</button>
-										</form>
-										<form method="post" style="display: inline-block">
-											{{$.CsrfTokenHtml}}
-											<input type="hidden" name="action" value="push-mirror-sync">
-											<input type="hidden" name="push_mirror_id" value="{{.ID}}">
-											<button class="ui primary tiny button inline text-thin">{{$.locale.Tr "repo.settings.sync_mirror"}}</button>
-										</form>
-									</td>
-								</tr>
-								{{else}}
-								<tr>
-									<td>{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.none"}}</td>
-								</tr>
-								{{end}}
-								{{if (not .DisableNewPushMirrors)}}
-									<tr>
-										<td colspan="4">
-											<form class="ui form" method="post">
-												{{template "base/disable_form_autofill"}}
-												{{.CsrfTokenHtml}}
-												<input type="hidden" name="action" value="push-mirror-add">
-												<div class="field {{if .Err_PushMirrorAddress}}error{{end}}">
-													<label for="push_mirror_address">{{.locale.Tr "repo.settings.mirror_settings.push_mirror.remote_url"}}</label>
-													<input id="push_mirror_address" name="push_mirror_address" value="{{.push_mirror_address}}" required>
-													<p class="help">{{.locale.Tr "repo.mirror_address_desc"}}</p>
-												</div>
-												<details class="ui optional field" {{if or .Err_PushMirrorAuth .push_mirror_username}}open{{end}}>
-													<summary class="gt-p-2">
-														{{.locale.Tr "repo.need_auth"}}
-													</summary>
-													<div class="gt-p-2">
-														<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
-															<label for="push_mirror_username">{{.locale.Tr "username"}}</label>
-															<input id="push_mirror_username" name="push_mirror_username" value="{{.push_mirror_username}}">
-														</div>
-														<div class="inline field {{if .Err_PushMirrorAuth}}error{{end}}">
-															<label for="push_mirror_password">{{.locale.Tr "password"}}</label>
-															<input id="push_mirror_password" name="push_mirror_password" type="password" value="{{.push_mirror_password}}" autocomplete="off">
-														</div>
-													</div>
-												</details>
-												<div class="field">
-													<div class="ui checkbox">
-														<input id="push_mirror_sync_on_commit" name="push_mirror_sync_on_commit" type="checkbox" {{if .push_mirror_sync_on_commit}}checked{{end}}>
-														<label for="push_mirror_sync_on_commit">{{.locale.Tr "repo.mirror_sync_on_commit"}}</label>
-													</div>
-												</div>
-												<div class="inline field {{if .Err_PushMirrorInterval}}error{{end}}">
-													<label for="push_mirror_interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-													<input id="push_mirror_interval" name="push_mirror_interval" value="{{if .push_mirror_interval}}{{.push_mirror_interval}}{{else}}{{.DefaultMirrorInterval}}{{end}}">
-												</div>
-												<div class="field">
-													<button class="ui green button">{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.add"}}</button>
-												</div>
-											</form>
-										</td>
-									</tr>
-								{{end}}
-							</tbody>
-						</table>
+										</div>
+										<div class="inline field {{if .Err_PushMirrorInterval}}error{{end}}">
+											<label for="push_mirror_interval">{{.locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
+											<input id="push_mirror_interval" name="push_mirror_interval" value="{{if .push_mirror_interval}}{{.push_mirror_interval}}{{else}}{{.DefaultMirrorInterval}}{{end}}">
+										</div>
+										<div class="field">
+											<button class="ui green button">{{$.locale.Tr "repo.settings.mirror_settings.push_mirror.add"}}</button>
+										</div>
+									</form>
+								</td>
+							</tr>
+						{{end}}
+					</tbody>
+				</table>
+			</div>
+		{{end}}
+
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.advanced_settings"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" method="post">
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="action" value="advanced">
+
+				{{$isCodeEnabled := .Repository.UnitEnabled $.Context $.UnitTypeCode}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.code"}}</label>
+					{{if .UnitTypeCode.UnitGlobalDisabled}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_code" type="checkbox"{{if $isCodeEnabled}} checked{{end}}>
+						<label>{{.locale.Tr "repo.code.desc"}}</label>
 					</div>
-				{{end}}
+				</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.advanced_settings"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" method="post">
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="action" value="advanced">
-
-						{{$isCodeEnabled := .Repository.UnitEnabled $.Context $.UnitTypeCode}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.code"}}</label>
-							{{if .UnitTypeCode.UnitGlobalDisabled}}
-							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
-							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_code" type="checkbox"{{if $isCodeEnabled}} checked{{end}}>
-								<label>{{.locale.Tr "repo.code.desc"}}</label>
-							</div>
+				{{$isWikiEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeWiki) (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.wiki"}}</label>
+					{{if and (.UnitTypeWiki.UnitGlobalDisabled) (.UnitTypeExternalWiki.UnitGlobalDisabled)}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_wiki" type="checkbox" data-target="#wiki_box" {{if $isWikiEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.wiki_desc"}}</label>
+					</div>
+				</div>
+				<div class="field {{if not $isWikiEnabled}}disabled{{end}}" id="wiki_box">
+					<div class="field">
+						{{if .UnitTypeWiki.UnitGlobalDisabled}}
+						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+						{{else}}
+						<div class="ui radio checkbox">
+						{{end}}
+							<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="false" data-target="#external_wiki_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.use_internal_wiki"}}</label>
+						</div>
+					</div>
+					<div class="field">
+						{{if .UnitTypeExternalWiki.UnitGlobalDisabled}}
+						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+						{{else}}
+						<div class="ui radio checkbox">
+						{{end}}
+							<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="true" data-target="#external_wiki_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalWiki}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.use_external_wiki"}}</label>
 						</div>
+					</div>
+					<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}disabled{{end}}" id="external_wiki_box">
+						<label for="external_wiki_url">{{.locale.Tr "repo.settings.external_wiki_url"}}</label>
+						<input id="external_wiki_url" name="external_wiki_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}">
+						<p class="help">{{.locale.Tr "repo.settings.external_wiki_url_desc"}}</p>
+					</div>
+				</div>
 
-						{{$isWikiEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeWiki) (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.wiki"}}</label>
-							{{if and (.UnitTypeWiki.UnitGlobalDisabled) (.UnitTypeExternalWiki.UnitGlobalDisabled)}}
-							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
-							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_wiki" type="checkbox" data-target="#wiki_box" {{if $isWikiEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.wiki_desc"}}</label>
-							</div>
+				<div class="ui divider"></div>
+
+				{{$isIssuesEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeIssues) (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.issues"}}</label>
+					{{if and (.UnitTypeIssues.UnitGlobalDisabled) (.UnitTypeExternalTracker.UnitGlobalDisabled)}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_issues" type="checkbox" data-target="#issue_box" {{if $isIssuesEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.issues_desc"}}</label>
+					</div>
+				</div>
+				<div class="field {{if not $isIssuesEnabled}}disabled{{end}}" id="issue_box">
+					<div class="field">
+						{{if .UnitTypeIssues.UnitGlobalDisabled}}
+						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+						{{else}}
+						<div class="ui radio checkbox">
+						{{end}}
+							<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="false" data-context="#internal_issue_box" data-target="#external_issue_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.use_internal_issue_tracker"}}</label>
 						</div>
-						<div class="field {{if not $isWikiEnabled}}disabled{{end}}" id="wiki_box">
+					</div>
+					<div class="field {{if (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="internal_issue_box">
+						{{if .Repository.CanEnableTimetracker}}
 							<div class="field">
-								{{if .UnitTypeWiki.UnitGlobalDisabled}}
-								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
-								<div class="ui radio checkbox">
-								{{end}}
-									<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="false" data-target="#external_wiki_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.use_internal_wiki"}}</label>
+								<div class="ui checkbox">
+									<input name="enable_timetracker" class="enable-system" data-target="#only_contributors" type="checkbox" {{if .Repository.IsTimetrackerEnabled $.Context}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.enable_timetracker"}}</label>
 								</div>
 							</div>
-							<div class="field">
-								{{if .UnitTypeExternalWiki.UnitGlobalDisabled}}
-								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
-								<div class="ui radio checkbox">
-								{{end}}
-									<input class="enable-system-radio" tabindex="0" name="enable_external_wiki" type="radio" value="true" data-target="#external_wiki_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalWiki}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.use_external_wiki"}}</label>
+							<div class="field {{if not (.Repository.IsTimetrackerEnabled $.Context)}}disabled{{end}}" id="only_contributors">
+								<div class="ui checkbox">
+									<input name="allow_only_contributors_to_track_time" type="checkbox" {{if .Repository.AllowOnlyContributorsToTrackTime $.Context}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.allow_only_contributors_to_track_time"}}</label>
 								</div>
 							</div>
-							<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalWiki)}}disabled{{end}}" id="external_wiki_box">
-								<label for="external_wiki_url">{{.locale.Tr "repo.settings.external_wiki_url"}}</label>
-								<input id="external_wiki_url" name="external_wiki_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}">
-								<p class="help">{{.locale.Tr "repo.settings.external_wiki_url_desc"}}</p>
-							</div>
-						</div>
-
-						<div class="ui divider"></div>
-
-						{{$isIssuesEnabled := or (.Repository.UnitEnabled $.Context $.UnitTypeIssues) (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.issues"}}</label>
-							{{if and (.UnitTypeIssues.UnitGlobalDisabled) (.UnitTypeExternalTracker.UnitGlobalDisabled)}}
-							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
+						{{end}}
+						<div class="field">
 							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_issues" type="checkbox" data-target="#issue_box" {{if $isIssuesEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.issues_desc"}}</label>
+								<input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.IsDependenciesEnabled $.Context)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.issues.dependency.setting"}}</label>
 							</div>
 						</div>
-						<div class="field {{if not $isIssuesEnabled}}disabled{{end}}" id="issue_box">
+						<div class="ui checkbox">
+							<input name="enable_close_issues_via_commit_in_any_branch" type="checkbox" {{if .Repository.CloseIssuesViaCommitInAnyBranch}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.admin_enable_close_issues_via_commit_in_any_branch"}}</label>
+						</div>
+					</div>
+					<div class="field">
+						{{if .UnitTypeExternalTracker.UnitGlobalDisabled}}
+						<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+						{{else}}
+						<div class="ui radio checkbox">
+						{{end}}
+							<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="true" data-context="#internal_issue_box" data-target="#external_issue_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalTracker}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.use_external_issue_tracker"}}</label>
+						</div>
+					</div>
+					<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="external_issue_box">
+						<div class="field">
+							<label for="external_tracker_url">{{.locale.Tr "repo.settings.external_tracker_url"}}</label>
+							<input id="external_tracker_url" name="external_tracker_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerURL}}">
+							<p class="help">{{.locale.Tr "repo.settings.external_tracker_url_desc"}}</p>
+						</div>
+						<div class="field">
+							<label for="tracker_url_format">{{.locale.Tr "repo.settings.tracker_url_format"}}</label>
+							<input id="tracker_url_format" name="tracker_url_format" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerFormat}}" placeholder="e.g. https://github.com/{user}/{repo}/issues/{index}">
+							<p class="help">{{.locale.Tr "repo.settings.tracker_url_format_desc" | Str2html}}</p>
+						</div>
+						<div class="inline fields">
+							<label for="issue_style">{{.locale.Tr "repo.settings.tracker_issue_style"}}</label>
 							<div class="field">
-								{{if .UnitTypeIssues.UnitGlobalDisabled}}
-								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
 								<div class="ui radio checkbox">
-								{{end}}
-									<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="false" data-context="#internal_issue_box" data-target="#external_issue_box" {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.use_internal_issue_tracker"}}</label>
-								</div>
-							</div>
-							<div class="field {{if (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="internal_issue_box">
-								{{if .Repository.CanEnableTimetracker}}
-									<div class="field">
-										<div class="ui checkbox">
-											<input name="enable_timetracker" class="enable-system" data-target="#only_contributors" type="checkbox" {{if .Repository.IsTimetrackerEnabled $.Context}}checked{{end}}>
-											<label>{{.locale.Tr "repo.settings.enable_timetracker"}}</label>
-										</div>
-									</div>
-									<div class="field {{if not (.Repository.IsTimetrackerEnabled $.Context)}}disabled{{end}}" id="only_contributors">
-										<div class="ui checkbox">
-											<input name="allow_only_contributors_to_track_time" type="checkbox" {{if .Repository.AllowOnlyContributorsToTrackTime $.Context}}checked{{end}}>
-											<label>{{.locale.Tr "repo.settings.allow_only_contributors_to_track_time"}}</label>
-										</div>
-									</div>
-								{{end}}
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="enable_issue_dependencies" type="checkbox" {{if (.Repository.IsDependenciesEnabled $.Context)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.issues.dependency.setting"}}</label>
-									</div>
-								</div>
-								<div class="ui checkbox">
-									<input name="enable_close_issues_via_commit_in_any_branch" type="checkbox" {{if .Repository.CloseIssuesViaCommitInAnyBranch}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.admin_enable_close_issues_via_commit_in_any_branch"}}</label>
+								{{$externalTracker := (.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker)}}
+								{{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}}
+									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="numeric" {{if eq $externalTrackerStyle "numeric"}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.tracker_issue_style.numeric"}} <span class="ui light grey text">#1234</span></label>
 								</div>
 							</div>
 							<div class="field">
-								{{if .UnitTypeExternalTracker.UnitGlobalDisabled}}
-								<div class="ui radio checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
 								<div class="ui radio checkbox">
-								{{end}}
-									<input class="enable-system-radio" tabindex="0" name="enable_external_tracker" type="radio" value="true" data-context="#internal_issue_box" data-target="#external_issue_box" {{if .Repository.UnitEnabled $.Context $.UnitTypeExternalTracker}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.use_external_issue_tracker"}}</label>
+									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="alphanumeric" {{if eq $externalTrackerStyle "alphanumeric"}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.tracker_issue_style.alphanumeric"}} <span class="ui light grey text">ABC-123 , DEFG-234</span></label>
 								</div>
 							</div>
-							<div class="field {{if not (.Repository.UnitEnabled $.Context $.UnitTypeExternalTracker)}}disabled{{end}}" id="external_issue_box">
-								<div class="field">
-									<label for="external_tracker_url">{{.locale.Tr "repo.settings.external_tracker_url"}}</label>
-									<input id="external_tracker_url" name="external_tracker_url" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerURL}}">
-									<p class="help">{{.locale.Tr "repo.settings.external_tracker_url_desc"}}</p>
-								</div>
-								<div class="field">
-									<label for="tracker_url_format">{{.locale.Tr "repo.settings.tracker_url_format"}}</label>
-									<input id="tracker_url_format" name="tracker_url_format" type="url" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerFormat}}" placeholder="e.g. https://github.com/{user}/{repo}/issues/{index}">
-									<p class="help">{{.locale.Tr "repo.settings.tracker_url_format_desc" | Str2html}}</p>
-								</div>
-								<div class="inline fields">
-									<label for="issue_style">{{.locale.Tr "repo.settings.tracker_issue_style"}}</label>
-									<div class="field">
-										<div class="ui radio checkbox">
-										{{$externalTracker := (.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker)}}
-										{{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}}
-											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="numeric" {{if eq $externalTrackerStyle "numeric"}}checked{{end}}>
-											<label>{{.locale.Tr "repo.settings.tracker_issue_style.numeric"}} <span class="ui light grey text">#1234</span></label>
-										</div>
-									</div>
-									<div class="field">
-										<div class="ui radio checkbox">
-											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="alphanumeric" {{if eq $externalTrackerStyle "alphanumeric"}}checked{{end}}>
-											<label>{{.locale.Tr "repo.settings.tracker_issue_style.alphanumeric"}} <span class="ui light grey text">ABC-123 , DEFG-234</span></label>
-										</div>
-									</div>
-									<div class="field">
-										<div class="ui radio checkbox">
-											<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="regexp" {{if eq $externalTrackerStyle "regexp"}}checked{{end}}>
-											<label>{{.locale.Tr "repo.settings.tracker_issue_style.regexp"}} <span class="ui light grey text">(ISSUE-\d+) , ISSUE-(\d+)</span></label>
-										</div>
-									</div>
-								</div>
-								<div class="field {{if ne $externalTrackerStyle "regexp"}}disabled{{end}}" id="tracker-issue-style-regex-box">
-									<label for="external_tracker_regexp_pattern">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern"}}</label>
-									<input id="external_tracker_regexp_pattern" name="external_tracker_regexp_pattern" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerRegexpPattern}}">
-									<p class="help">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern_desc" | Str2html}}</p>
+							<div class="field">
+								<div class="ui radio checkbox">
+									<input class="js-tracker-issue-style" name="tracker_issue_style" type="radio" value="regexp" {{if eq $externalTrackerStyle "regexp"}}checked{{end}}>
+									<label>{{.locale.Tr "repo.settings.tracker_issue_style.regexp"}} <span class="ui light grey text">(ISSUE-\d+) , ISSUE-(\d+)</span></label>
 								</div>
 							</div>
 						</div>
+						<div class="field {{if ne $externalTrackerStyle "regexp"}}disabled{{end}}" id="tracker-issue-style-regex-box">
+							<label for="external_tracker_regexp_pattern">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern"}}</label>
+							<input id="external_tracker_regexp_pattern" name="external_tracker_regexp_pattern" value="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalTracker).ExternalTrackerConfig.ExternalTrackerRegexpPattern}}">
+							<p class="help">{{.locale.Tr "repo.settings.tracker_issue_style.regexp_pattern_desc" | Str2html}}</p>
+						</div>
+					</div>
+				</div>
+
+				<div class="ui divider"></div>
 
-						<div class="ui divider"></div>
+				{{$isProjectsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeProjects}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.project_board"}}</label>
+					{{if .UnitTypeProjects.UnitGlobalDisabled}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_projects" type="checkbox" {{if $isProjectsEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.projects_desc"}}</label>
+					</div>
+				</div>
 
-						{{$isProjectsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeProjects}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.project_board"}}</label>
-							{{if .UnitTypeProjects.UnitGlobalDisabled}}
+				{{$isReleasesEnabled := .Repository.UnitEnabled $.Context $.UnitTypeReleases}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.releases"}}</label>
+					{{if .UnitTypeReleases.UnitGlobalDisabled}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_releases" type="checkbox" {{if $isReleasesEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.releases_desc"}}</label>
+					</div>
+				</div>
+
+				{{$isPackagesEnabled := .Repository.UnitEnabled $.Context $.UnitTypePackages}}
+				<div class="inline field">
+					<label>{{.locale.Tr "repo.packages"}}</label>
+					{{if .UnitTypePackages.UnitGlobalDisabled}}
+					<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+					{{else}}
+					<div class="ui checkbox">
+					{{end}}
+						<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.packages_desc"}}</label>
+					</div>
+				</div>
+
+				{{if .EnableActions}}
+					{{$isActionsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeActions}}
+					<div class="inline field">
+						<label>{{.locale.Tr "actions.actions"}}</label>
+						{{if .UnitTypeActions.UnitGlobalDisabled}}
 							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
+						{{else}}
 							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_projects" type="checkbox" {{if $isProjectsEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.projects_desc"}}</label>
-							</div>
+						{{end}}
+							<input class="enable-system" name="enable_actions" type="checkbox" {{if $isActionsEnabled}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.actions_desc"}}</label>
 						</div>
+					</div>
+				{{end}}
 
-						{{$isReleasesEnabled := .Repository.UnitEnabled $.Context $.UnitTypeReleases}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.releases"}}</label>
-							{{if .UnitTypeReleases.UnitGlobalDisabled}}
-							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
+				{{if not .IsMirror}}
+					<div class="ui divider"></div>
+					{{$pullRequestEnabled := .Repository.UnitEnabled $.Context $.UnitTypePullRequests}}
+					{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
+					<div class="inline field">
+						<label>{{.locale.Tr "repo.pulls"}}</label>
+						{{if .UnitTypePullRequests.UnitGlobalDisabled}}
+						<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
+						{{else}}
+						<div class="ui checkbox">
+						{{end}}
+							<input class="enable-system" name="enable_pulls" type="checkbox" data-target="#pull_box" {{if $pullRequestEnabled}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.pulls_desc"}}</label>
+						</div>
+					</div>
+					<div class="field{{if not $pullRequestEnabled}} disabled{{end}}" id="pull_box">
+						<div class="field">
+							<p>
+								{{.locale.Tr "repo.settings.merge_style_desc"}}
+							</p>
+						</div>
+						<div class="field">
 							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_releases" type="checkbox" {{if $isReleasesEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.releases_desc"}}</label>
+								<input name="pulls_allow_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowMerge)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.pulls.merge_pull_request"}}</label>
 							</div>
 						</div>
-
-						{{$isPackagesEnabled := .Repository.UnitEnabled $.Context $.UnitTypePackages}}
-						<div class="inline field">
-							<label>{{.locale.Tr "repo.packages"}}</label>
-							{{if .UnitTypePackages.UnitGlobalDisabled}}
-							<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-							{{else}}
+						<div class="field">
 							<div class="ui checkbox">
-							{{end}}
-								<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.packages_desc"}}</label>
+								<input name="pulls_allow_rebase" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebase)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</label>
 							</div>
 						</div>
-
-						{{if .EnableActions}}
-							{{$isActionsEnabled := .Repository.UnitEnabled $.Context $.UnitTypeActions}}
-							<div class="inline field">
-								<label>{{.locale.Tr "actions.actions"}}</label>
-								{{if .UnitTypeActions.UnitGlobalDisabled}}
-									<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
-									<div class="ui checkbox">
-								{{end}}
-									<input class="enable-system" name="enable_actions" type="checkbox" {{if $isActionsEnabled}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.actions_desc"}}</label>
-								</div>
-							</div>
-						{{end}}
-
-						{{if not .IsMirror}}
-							<div class="ui divider"></div>
-							{{$pullRequestEnabled := .Repository.UnitEnabled $.Context $.UnitTypePullRequests}}
-							{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
-							<div class="inline field">
-								<label>{{.locale.Tr "repo.pulls"}}</label>
-								{{if .UnitTypePullRequests.UnitGlobalDisabled}}
-								<div class="ui checkbox disabled" data-tooltip-content="{{.locale.Tr "repo.unit_disabled"}}">
-								{{else}}
-								<div class="ui checkbox">
-								{{end}}
-									<input class="enable-system" name="enable_pulls" type="checkbox" data-target="#pull_box" {{if $pullRequestEnabled}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.pulls_desc"}}</label>
-								</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</label>
 							</div>
-							<div class="field{{if not $pullRequestEnabled}} disabled{{end}}" id="pull_box">
-								<div class="field">
-									<p>
-										{{.locale.Tr "repo.settings.merge_style_desc"}}
-									</p>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowMerge)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.pulls.merge_pull_request"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_rebase" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebase)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_rebase_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseMerge)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowManualMerge)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.pulls.merge_manually"}}</label>
-									</div>
-								</div>
-
-								<div class="field">
-									<p>
-										{{.locale.Tr "repo.settings.default_merge_style_desc"}}
-									</p>
-									<div class="ui dropdown selection" tabindex="0">
-										<select name="pulls_default_merge_style">
-											<option value="merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.merge_pull_request"}}</option>
-											<option value="rebase" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</option>
-											<option value="rebase-merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</option>
-											<option value="squash" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}selected{{end}}>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</option>
-										</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-										<div class="default text">
-											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}
-												{{.locale.Tr "repo.pulls.merge_pull_request"}}
-											{{end}}
-											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}
-												{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}
-											{{end}}
-											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}
-												{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
-											{{end}}
-											{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}
-												{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}
-											{{end}}
-										</div>
-										<div class="menu">
-											<div class="item" data-value="merge">{{.locale.Tr "repo.pulls.merge_pull_request"}}</div>
-											<div class="item" data-value="rebase">{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
-											<div class="item" data-value="rebase-merge">{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
-											<div class="item" data-value="squash">{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</div>
-										</div>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="default_allow_maintainer_edit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultAllowMaintainerEdit)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.settings.pulls.default_allow_edits_from_maintainers"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_allow_rebase_update" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseUpdate)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.settings.pulls.allow_rebase_update"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="enable_autodetect_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AutodetectManualMerge)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.settings.pulls.enable_autodetect_manual_merge"}}</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input name="pulls_ignore_whitespace" type="checkbox" {{if and $pullRequestEnabled ($prUnit.PullRequestsConfig.IgnoreWhitespaceConflicts)}}checked{{end}}>
-										<label>{{.locale.Tr "repo.settings.pulls.ignore_whitespace"}}</label>
-									</div>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input name="pulls_allow_squash" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowSquash)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</label>
 							</div>
-						{{end}}
-
-						<div class="ui divider"></div>
+						</div>
 						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+							<div class="ui checkbox">
+								<input name="pulls_allow_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowManualMerge)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.pulls.merge_manually"}}</label>
+							</div>
 						</div>
-					</form>
-				</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.signing_settings"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" method="post">
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="action" value="signing">
 						<div class="field">
-							<label>{{.locale.Tr "repo.settings.trust_model"}}</label><br>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input type="radio" id="trust_model_default" name="trust_model" {{if eq .Repository.TrustModel.String "default"}}checked="checked"{{end}} value="default">
-									<label for="trust_model_default">{{.locale.Tr "repo.settings.trust_model.default"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.trust_model.default.desc"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input type="radio" id="trust_model_collaborator" name="trust_model" {{if eq .Repository.TrustModel.String "collaborator"}}checked="checked"{{end}} value="collaborator">
-									<label for="trust_model_collaborator">{{.locale.Tr "repo.settings.trust_model.collaborator.long"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.trust_model.collaborator.desc"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input type="radio" name="trust_model" id="trust_model_committer" {{if eq .Repository.TrustModel.String "committer"}}checked="checked"{{end}} value="committer">
-									<label for="trust_model_committer">{{.locale.Tr "repo.settings.trust_model.committer.long"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.trust_model.committer.desc"}}</p>
+							<p>
+								{{.locale.Tr "repo.settings.default_merge_style_desc"}}
+							</p>
+							<div class="ui dropdown selection" tabindex="0">
+								<select name="pulls_default_merge_style">
+									<option value="merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.merge_pull_request"}}</option>
+									<option value="rebase" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</option>
+									<option value="rebase-merge" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}selected{{end}}>{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</option>
+									<option value="squash" {{if or (not $pullRequestEnabled) (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}selected{{end}}>{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</option>
+								</select>{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="default text">
+									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "merge")}}
+										{{.locale.Tr "repo.pulls.merge_pull_request"}}
+									{{end}}
+									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase")}}
+										{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}
+									{{end}}
+									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "rebase-merge")}}
+										{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
+									{{end}}
+									{{if (eq $prUnit.PullRequestsConfig.DefaultMergeStyle "squash")}}
+										{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}
+									{{end}}
 								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input type="radio" name="trust_model" id="trust_model_collaboratorcommitter" {{if eq .Repository.TrustModel.String "collaboratorcommitter"}}checked="checked"{{end}} value="collaboratorcommitter">
-									<label for="trust_model_collaboratorcommitter">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.long"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.desc"}}</p>
+								<div class="menu">
+									<div class="item" data-value="merge">{{.locale.Tr "repo.pulls.merge_pull_request"}}</div>
+									<div class="item" data-value="rebase">{{.locale.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
+									<div class="item" data-value="rebase-merge">{{.locale.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
+									<div class="item" data-value="squash">{{.locale.Tr "repo.pulls.squash_merge_pull_request"}}</div>
 								</div>
 							</div>
 						</div>
-
-						<div class="ui divider"></div>
 						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+							<div class="ui checkbox">
+								<input name="default_allow_maintainer_edit" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultAllowMaintainerEdit)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.pulls.default_allow_edits_from_maintainers"}}</label>
+							</div>
 						</div>
-					</form>
-				</div>
-
-				{{if .IsAdmin}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "repo.settings.admin_settings"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" method="post">
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="action" value="admin">
 						<div class="field">
 							<div class="ui checkbox">
-								<input name="enable_health_check" type="checkbox" {{if .Repository.IsFsckEnabled}}checked{{end}}>
-								<label>{{.locale.Tr "repo.settings.admin_enable_health_check"}}</label>
+								<input name="pulls_allow_rebase_update" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AllowRebaseUpdate)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.pulls.allow_rebase_update"}}</label>
 							</div>
 						</div>
-
 						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+							<div class="ui checkbox">
+								<input name="default_delete_branch_after_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.pulls.default_delete_branch_after_merge"}}</label>
+							</div>
 						</div>
-					</form>
-
-					<div class="ui divider"></div>
-					<form class="ui form" method="post">
-						{{.CsrfTokenHtml}}
-						<input type="hidden" name="action" value="admin_index">
-						{{if .CodeIndexerEnabled}}
-							<h4 class="ui header">{{.locale.Tr "repo.settings.admin_code_indexer"}}</h4>
-							<div class="inline fields">
-								<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
-								<span class="field">
-									{{if .CodeIndexerStatus}}
-										<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
-											<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
-										</a>
-									{{else}}
-											<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
-									{{end}}
-								</span>
-								<div class="field">
-									<button class="ui green button" name="request_reindex_type" value="code">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
-								</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input name="enable_autodetect_manual_merge" type="checkbox" {{if or (not $pullRequestEnabled) ($prUnit.PullRequestsConfig.AutodetectManualMerge)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.pulls.enable_autodetect_manual_merge"}}</label>
 							</div>
-						{{end}}
-						<h4 class="ui header">{{.locale.Tr "repo.settings.admin_stats_indexer"}}</h4>
-						<div class="inline fields">
-							<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
-							<span class="field">
-								{{if .StatsIndexerStatus}}
-									<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
-										<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
-									</a>
-								{{else}}
-									<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
-								{{end}}
-							</span>
-							<div class="field">
-								<button class="ui green button" name="request_reindex_type" value="stats">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input name="pulls_ignore_whitespace" type="checkbox" {{if and $pullRequestEnabled ($prUnit.PullRequestsConfig.IgnoreWhitespaceConflicts)}}checked{{end}}>
+								<label>{{.locale.Tr "repo.settings.pulls.ignore_whitespace"}}</label>
 							</div>
 						</div>
-					</form>
-				</div>
+					</div>
 				{{end}}
 
-				{{if .Permission.IsOwner}}
-				<h4 class="ui top attached error header">
-					{{.locale.Tr "repo.settings.danger_zone"}}
-				</h4>
-				<div class="ui attached error table danger segment">
-					{{if .Repository.IsMirror}}
-						<div class="item">
-							<div class="ui right">
-								<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
-							</div>
-							<div>
-								<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
-								<p>{{.locale.Tr "repo.settings.convert_desc"}}</p>
-							</div>
+				<div class="ui divider"></div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+				</div>
+			</form>
+		</div>
+
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.signing_settings"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" method="post">
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="action" value="signing">
+				<div class="field">
+					<label>{{.locale.Tr "repo.settings.trust_model"}}</label><br>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input type="radio" id="trust_model_default" name="trust_model" {{if eq .Repository.TrustModel.String "default"}}checked="checked"{{end}} value="default">
+							<label for="trust_model_default">{{.locale.Tr "repo.settings.trust_model.default"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.trust_model.default.desc"}}</p>
 						</div>
-						<div class="ui divider"></div>
-					{{end}}
-					{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
-						<div class="item">
-							<div class="ui right">
-								<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
-							</div>
-							<div>
-								<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
-								<p>{{.locale.Tr "repo.settings.convert_fork_desc"}}</p>
-							</div>
+					</div>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input type="radio" id="trust_model_collaborator" name="trust_model" {{if eq .Repository.TrustModel.String "collaborator"}}checked="checked"{{end}} value="collaborator">
+							<label for="trust_model_collaborator">{{.locale.Tr "repo.settings.trust_model.collaborator.long"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.trust_model.collaborator.desc"}}</p>
 						</div>
-						<div class="ui divider"></div>
-					{{end}}
-					<div class="item">
-						<div class="ui right">
-							{{if .RepoTransfer}}
-								<form class="ui form" action="{{.Link}}" method="post">
-									{{.CsrfTokenHtml}}
-									<input type="hidden" name="action" value="cancel_transfer">
-									<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
-								</form>
-							{{else}}
-								<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
-							{{end}}
+					</div>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input type="radio" name="trust_model" id="trust_model_committer" {{if eq .Repository.TrustModel.String "committer"}}checked="checked"{{end}} value="committer">
+							<label for="trust_model_committer">{{.locale.Tr "repo.settings.trust_model.committer.long"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.trust_model.committer.desc"}}</p>
 						</div>
-						<div>
-							<h5>{{.locale.Tr "repo.settings.transfer"}}</h5>
-							{{if .RepoTransfer}}
-								<p>{{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}</p>
-							{{else}}
-								<p>{{.locale.Tr "repo.settings.transfer_desc"}}</p>
-							{{end}}
+					</div>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input type="radio" name="trust_model" id="trust_model_collaboratorcommitter" {{if eq .Repository.TrustModel.String "collaboratorcommitter"}}checked="checked"{{end}} value="collaboratorcommitter">
+							<label for="trust_model_collaboratorcommitter">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.long"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.trust_model.collaboratorcommitter.desc"}}</p>
 						</div>
 					</div>
+				</div>
+
+				<div class="ui divider"></div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+				</div>
+			</form>
+		</div>
 
-					{{if .Permission.CanRead $.UnitTypeWiki}}
-						<div class="ui divider"></div>
+		{{if .IsAdmin}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "repo.settings.admin_settings"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" method="post">
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="action" value="admin">
+				<div class="field">
+					<div class="ui checkbox">
+						<input name="enable_health_check" type="checkbox" {{if .Repository.IsFsckEnabled}}checked{{end}}>
+						<label>{{.locale.Tr "repo.settings.admin_enable_health_check"}}</label>
+					</div>
+				</div>
 
-						<div class="item">
-							<div class="ui right">
-								<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
-							</div>
-							<div>
-								<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
-								<p>{{.locale.Tr "repo.settings.wiki_delete_desc"}}</p>
-							</div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
+				</div>
+			</form>
+
+			<div class="ui divider"></div>
+			<form class="ui form" method="post">
+				{{.CsrfTokenHtml}}
+				<input type="hidden" name="action" value="admin_index">
+				{{if .CodeIndexerEnabled}}
+					<h4 class="ui header">{{.locale.Tr "repo.settings.admin_code_indexer"}}</h4>
+					<div class="inline fields">
+						<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
+						<span class="field">
+							{{if .CodeIndexerStatus}}
+								<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
+									<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
+								</a>
+							{{else}}
+									<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
+							{{end}}
+						</span>
+						<div class="field">
+							<button class="ui green button" name="request_reindex_type" value="code">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
 						</div>
+					</div>
+				{{end}}
+				<h4 class="ui header">{{.locale.Tr "repo.settings.admin_stats_indexer"}}</h4>
+				<div class="inline fields">
+					<label>{{.locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
+					<span class="field">
+						{{if .StatsIndexerStatus}}
+							<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
+								<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
+							</a>
+						{{else}}
+							<span>{{.locale.Tr "repo.settings.admin_indexer_unindexed"}}</span>
+						{{end}}
+					</span>
+					<div class="field">
+						<button class="ui green button" name="request_reindex_type" value="stats">{{$.locale.Tr "repo.settings.reindex_button"}}</button>
+					</div>
+				</div>
+			</form>
+		</div>
+		{{end}}
+
+		{{if .Permission.IsOwner}}
+		<h4 class="ui top attached error header">
+			{{.locale.Tr "repo.settings.danger_zone"}}
+		</h4>
+		<div class="ui attached error table danger segment">
+			{{if .Repository.IsMirror}}
+				<div class="item">
+					<div class="ui right">
+						<button class="ui basic red show-modal button" data-modal="#convert-mirror-repo-modal">{{.locale.Tr "repo.settings.convert"}}</button>
+					</div>
+					<div>
+						<h5>{{.locale.Tr "repo.settings.convert"}}</h5>
+						<p>{{.locale.Tr "repo.settings.convert_desc"}}</p>
+					</div>
+				</div>
+				<div class="ui divider"></div>
+			{{end}}
+			{{if and .Repository.IsFork .Repository.Owner.CanCreateRepo}}
+				<div class="item">
+					<div class="ui right">
+						<button class="ui basic red show-modal button" data-modal="#convert-fork-repo-modal">{{.locale.Tr "repo.settings.convert_fork"}}</button>
+					</div>
+					<div>
+						<h5>{{.locale.Tr "repo.settings.convert_fork"}}</h5>
+						<p>{{.locale.Tr "repo.settings.convert_fork_desc"}}</p>
+					</div>
+				</div>
+				<div class="ui divider"></div>
+			{{end}}
+			<div class="item">
+				<div class="ui right">
+					{{if .RepoTransfer}}
+						<form class="ui form" action="{{.Link}}" method="post">
+							{{.CsrfTokenHtml}}
+							<input type="hidden" name="action" value="cancel_transfer">
+							<button class="ui red button">{{.locale.Tr "repo.settings.transfer_abort"}}</button>
+						</form>
+					{{else}}
+						<button class="ui basic red show-modal button" data-modal="#transfer-repo-modal">{{.locale.Tr "repo.settings.transfer"}}</button>
+					{{end}}
+				</div>
+				<div>
+					<h5>{{.locale.Tr "repo.settings.transfer"}}</h5>
+					{{if .RepoTransfer}}
+						<p>{{.locale.Tr "repo.settings.transfer_started" .RepoTransfer.Recipient.DisplayName}}</p>
+					{{else}}
+						<p>{{.locale.Tr "repo.settings.transfer_desc"}}</p>
 					{{end}}
+				</div>
+			</div>
 
-					<div class="ui divider"></div>
+			{{if .Permission.CanRead $.UnitTypeWiki}}
+				<div class="ui divider"></div>
 
-					<div class="item">
-						<div class="ui right">
-							<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
-						</div>
-						<div>
-							<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
-							<p>{{.locale.Tr "repo.settings.delete_desc"}}</p>
-						</div>
+				<div class="item">
+					<div class="ui right">
+						<button class="ui basic red show-modal button" data-modal="#delete-wiki-modal">{{.locale.Tr "repo.settings.wiki_delete"}}</button>
+					</div>
+					<div>
+						<h5>{{.locale.Tr "repo.settings.wiki_delete"}}</h5>
+						<p>{{.locale.Tr "repo.settings.wiki_delete_desc"}}</p>
 					</div>
+				</div>
+			{{end}}
 
-					{{if not .Repository.IsMirror}}
-						<div class="ui divider"></div>
+			<div class="ui divider"></div>
 
-						<div class="item">
-							<div class="ui right">
-								<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
-									{{if .Repository.IsArchived}}
-										{{.locale.Tr "repo.settings.unarchive.button"}}
-									{{else}}
-										{{.locale.Tr "repo.settings.archive.button"}}
-									{{end}}
-								</button>
-							</div>
-							<div>
-								{{if .Repository.IsArchived}}
-									<h5>{{.locale.Tr "repo.settings.unarchive.header"}}</h5>
-									<p>{{.locale.Tr "repo.settings.unarchive.text"}}</p>
-								{{else}}
-									<h5>{{.locale.Tr "repo.settings.archive.header"}}</h5>
-									<p>{{.locale.Tr "repo.settings.archive.text"}}</p>
-								{{end}}
-							</div>
-						</div>
-					{{end}}
+			<div class="item">
+				<div class="ui right">
+					<button class="ui basic red show-modal button" data-modal="#delete-repo-modal">{{.locale.Tr "repo.settings.delete"}}</button>
+				</div>
+				<div>
+					<h5>{{.locale.Tr "repo.settings.delete"}}</h5>
+					<p>{{.locale.Tr "repo.settings.delete_desc"}}</p>
 				</div>
-				{{end}}
 			</div>
+
+			{{if not .Repository.IsMirror}}
+				<div class="ui divider"></div>
+
+				<div class="item">
+					<div class="ui right">
+						<button class="ui basic red show-modal button" data-modal="#archive-repo-modal">
+							{{if .Repository.IsArchived}}
+								{{.locale.Tr "repo.settings.unarchive.button"}}
+							{{else}}
+								{{.locale.Tr "repo.settings.archive.button"}}
+							{{end}}
+						</button>
+					</div>
+					<div>
+						{{if .Repository.IsArchived}}
+							<h5>{{.locale.Tr "repo.settings.unarchive.header"}}</h5>
+							<p>{{.locale.Tr "repo.settings.unarchive.text"}}</p>
+						{{else}}
+							<h5>{{.locale.Tr "repo.settings.archive.header"}}</h5>
+							<p>{{.locale.Tr "repo.settings.archive.text"}}</p>
+						{{end}}
+					</div>
+				</div>
+			{{end}}
 		</div>
+		{{end}}
 	</div>
-</div>
+{{template "repo/settings/layout_footer" .}}
 
 {{if .Permission.IsOwner}}
 	{{if .Repository.IsMirror}}
@@ -997,5 +990,3 @@
 		</div>
 	{{end}}
 {{end}}
-
-{{template "base/footer" .}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 7657d4bddea3..1f422b102b40 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,268 +1,260 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings branches">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<form class="ui form" action="{{.Link}}" method="post">
-					<h4 class="ui top attached header">
-						{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
-					</h4>
-					<div class="ui attached segment branch-protection">
-						<div class="field">
-							<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_branch_name_pattern"}}</label>
-							<input name="rule_name" type="text" value="{{.Rule.RuleName}}">
-							<input name="rule_id" type="hidden" value="{{.Rule.ID}}">
-						</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings branches")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<form class="ui form" action="{{.Link}}" method="post">
+			<h4 class="ui top attached header">
+				{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
+			</h4>
+			<div class="ui attached segment branch-protection">
+				<div class="field">
+					<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_branch_name_pattern"}}</label>
+					<input name="rule_name" type="text" value="{{.Rule.RuleName}}">
+					<input name="rule_id" type="hidden" value="{{.Rule.ID}}">
+				</div>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						{{.CsrfTokenHtml}}
-						<div id="protection_box" class="fields">
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input name="enable_push" type="radio" value="none" class="disable-whitelist" data-target="#whitelist_box" {{if not .Rule.CanPush}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_disable_push"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_disable_push_desc"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input name="enable_push" type="radio" value="all" class="disable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (not .Rule.EnableWhitelist)}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_enable_push"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_enable_push_desc"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui radio checkbox">
-									<input name="enable_push" type="radio" value="whitelist" class="enable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (.Rule.EnableWhitelist)}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_whitelist_committers"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_whitelist_committers_desc"}}</p>
-								</div>
-							</div>
-							<div id="whitelist_box" class="fields {{if not .Rule.EnableWhitelist}}disabled{{end}}">
-								<div class="whitelist field">
-									<label>{{.locale.Tr "repo.settings.protect_whitelist_users"}}</label>
-									<div class="ui multiple search selection dropdown">
-										<input type="hidden" name="whitelist_users" value="{{.whitelist_users}}">
-										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-										<div class="menu">
-											{{range .Users}}
-												<div class="item" data-value="{{.ID}}">
-													{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
-												</div>
-											{{end}}
-										</div>
-									</div>
-								</div>
-								{{if .Owner.IsOrganization}}
-									<br>
-									<div class="whitelist field">
-										<label>{{.locale.Tr "repo.settings.protect_whitelist_teams"}}</label>
-										<div class="ui multiple search selection dropdown">
-											<input type="hidden" name="whitelist_teams" value="{{.whitelist_teams}}">
-											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-											<div class="menu">
-												{{range .Teams}}
-													<div class="item" data-value="{{.ID}}">
-														{{svg "octicon-people"}}
-														{{.Name}}
-													</div>
-												{{end}}
-											</div>
+				{{.CsrfTokenHtml}}
+				<div id="protection_box" class="fields">
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input name="enable_push" type="radio" value="none" class="disable-whitelist" data-target="#whitelist_box" {{if not .Rule.CanPush}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_disable_push"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_disable_push_desc"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input name="enable_push" type="radio" value="all" class="disable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (not .Rule.EnableWhitelist)}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_enable_push"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_enable_push_desc"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui radio checkbox">
+							<input name="enable_push" type="radio" value="whitelist" class="enable-whitelist" data-target="#whitelist_box" {{if and (.Rule.CanPush) (.Rule.EnableWhitelist)}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_whitelist_committers"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_whitelist_committers_desc"}}</p>
+						</div>
+					</div>
+					<div id="whitelist_box" class="fields {{if not .Rule.EnableWhitelist}}disabled{{end}}">
+						<div class="whitelist field">
+							<label>{{.locale.Tr "repo.settings.protect_whitelist_users"}}</label>
+							<div class="ui multiple search selection dropdown">
+								<input type="hidden" name="whitelist_users" value="{{.whitelist_users}}">
+								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+								<div class="menu">
+									{{range .Users}}
+										<div class="item" data-value="{{.ID}}">
+											{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
 										</div>
-									</div>
-								{{end}}
-								<br>
-								<div class="whitelist field">
-									<div class="ui checkbox">
-										<input type="checkbox" name="whitelist_deploy_keys" {{if .Rule.WhitelistDeployKeys}}checked{{end}}>
-										<label for="whitelist_deploy_keys">{{.locale.Tr "repo.settings.protect_whitelist_deploy_keys"}}</label>
-									</div>
-								</div>
-							</div>
-
-							<div class="ui divider"></div>
-
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-whitelist" name="enable_merge_whitelist" type="checkbox" data-target="#merge_whitelist_box" {{if .Rule.EnableMergeWhitelist}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_committers"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_merge_whitelist_committers_desc"}}</p>
+									{{end}}
 								</div>
 							</div>
-							<div id="merge_whitelist_box" class="fields {{if not .Rule.EnableMergeWhitelist}}disabled{{end}}">
-								<div class="whitelist field">
-									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_users"}}</label>
-									<div class="ui multiple search selection dropdown">
-										<input type="hidden" name="merge_whitelist_users" value="{{.merge_whitelist_users}}">
-										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-										<div class="menu">
-										{{range .Users}}
-											<div class="item" data-value="{{.ID}}">
-												{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
-											</div>
-										{{end}}
-										</div>
-									</div>
-								</div>
-							{{if .Owner.IsOrganization}}
-								<br>
-								<div class="whitelist field">
-									<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_teams"}}</label>
-									<div class="ui multiple search selection dropdown">
-										<input type="hidden" name="merge_whitelist_teams" value="{{.merge_whitelist_teams}}">
-										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-										<div class="menu">
+						</div>
+						{{if .Owner.IsOrganization}}
+							<br>
+							<div class="whitelist field">
+								<label>{{.locale.Tr "repo.settings.protect_whitelist_teams"}}</label>
+								<div class="ui multiple search selection dropdown">
+									<input type="hidden" name="whitelist_teams" value="{{.whitelist_teams}}">
+									<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+									<div class="menu">
 										{{range .Teams}}
 											<div class="item" data-value="{{.ID}}">
 												{{svg "octicon-people"}}
-											{{.Name}}
+												{{.Name}}
 											</div>
 										{{end}}
-										</div>
 									</div>
 								</div>
-							{{end}}
 							</div>
-
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-statuscheck" name="enable_status_check" type="checkbox" data-target="#statuscheck_contexts_box" {{if eq (len .branch_status_check_contexts) 0}}disabled{{end}} {{if .Rule.EnableStatusCheck}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_check_status_contexts"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_check_status_contexts_desc"}}</p>
-								</div>
+						{{end}}
+						<br>
+						<div class="whitelist field">
+							<div class="ui checkbox">
+								<input type="checkbox" name="whitelist_deploy_keys" {{if .Rule.WhitelistDeployKeys}}checked{{end}}>
+								<label for="whitelist_deploy_keys">{{.locale.Tr "repo.settings.protect_whitelist_deploy_keys"}}</label>
 							</div>
+						</div>
+					</div>
 
-							<div id="statuscheck_contexts_box" class="fields {{if not .Rule.EnableStatusCheck}}disabled{{end}}">
-								<div class="field">
-									<table class="ui celled table six column">
-										<thead>
-											<tr><th>
-												{{.locale.Tr "repo.settings.protect_check_status_contexts_list"}}
-											</th>
-											</tr>
-										</thead>
-										<tbody>
-										{{range $.branch_status_check_contexts}}
-											<tr><td>
-												<span class="ui checkbox">
-													<input class="enable-whitelist" name="status_check_contexts" value="{{.}}" type="checkbox" {{if $.is_context_required}}{{if call $.is_context_required .}}checked{{end}}{{end}}>
-												</span>
-												{{.}}
-												{{if $.is_context_required}}{{if call $.is_context_required .}}<div class="ui label right">Required</div>{{end}}{{end}}
-											</td></tr>
-										{{end}}
-										</tbody>
-									</table>
-								</div>
-							</div>
+					<div class="ui divider"></div>
 
-							<div class="field">
-								<label for="required-approvals">{{.locale.Tr "repo.settings.protect_required_approvals"}}</label>
-								<input name="required_approvals" id="required-approvals" type="number" value="{{.Rule.RequiredApprovals}}">
-								<p class="help">{{.locale.Tr "repo.settings.protect_required_approvals_desc"}}</p>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-whitelist" name="enable_approvals_whitelist" type="checkbox" data-target="#approvals_whitelist_box" {{if .Rule.EnableApprovalsWhitelist}}checked{{end}}>
-									<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled_desc"}}</p>
-								</div>
-							</div>
-							<div id="approvals_whitelist_box" class="fields {{if not .Rule.EnableApprovalsWhitelist}}disabled{{end}}">
-								<div class="whitelist field">
-									<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_users"}}</label>
-									<div class="ui multiple search selection dropdown">
-										<input type="hidden" name="approvals_whitelist_users" value="{{.approvals_whitelist_users}}">
-										<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
-										<div class="menu">
-										{{range .Users}}
-											<div class="item" data-value="{{.ID}}">
-												{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
-											</div>
-										{{end}}
-										</div>
-									</div>
-								</div>
-								{{if .Owner.IsOrganization}}
-									<br>
-									<div class="whitelist field">
-										<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label>
-										<div class="ui multiple search selection dropdown">
-											<input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}">
-											<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
-											<div class="menu">
-											{{range .Teams}}
-												<div class="item" data-value="{{.ID}}">
-													{{svg "octicon-people"}}
-												{{.Name}}
-												</div>
-											{{end}}
-											</div>
-										</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-whitelist" name="enable_merge_whitelist" type="checkbox" data-target="#merge_whitelist_box" {{if .Rule.EnableMergeWhitelist}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_committers"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_merge_whitelist_committers_desc"}}</p>
+						</div>
+					</div>
+					<div id="merge_whitelist_box" class="fields {{if not .Rule.EnableMergeWhitelist}}disabled{{end}}">
+						<div class="whitelist field">
+							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_users"}}</label>
+							<div class="ui multiple search selection dropdown">
+								<input type="hidden" name="merge_whitelist_users" value="{{.merge_whitelist_users}}">
+								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+								<div class="menu">
+								{{range .Users}}
+									<div class="item" data-value="{{.ID}}">
+										{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
 									</div>
 								{{end}}
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input name="block_on_rejected_reviews" type="checkbox" {{if .Rule.BlockOnRejectedReviews}}checked{{end}}>
-									<label for="block_on_rejected_reviews">{{.locale.Tr "repo.settings.block_rejected_reviews"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.block_rejected_reviews_desc"}}</p>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input name="block_on_official_review_requests" type="checkbox" {{if .Rule.BlockOnOfficialReviewRequests}}checked{{end}}>
-									<label for="block_on_official_review_requests">{{.locale.Tr "repo.settings.block_on_official_review_requests"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.block_on_official_review_requests_desc"}}</p>
 								</div>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input name="dismiss_stale_approvals" type="checkbox" {{if .Rule.DismissStaleApprovals}}checked{{end}}>
-									<label for="dismiss_stale_approvals">{{.locale.Tr "repo.settings.dismiss_stale_approvals"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.dismiss_stale_approvals_desc"}}</p>
+						</div>
+					{{if .Owner.IsOrganization}}
+						<br>
+						<div class="whitelist field">
+							<label>{{.locale.Tr "repo.settings.protect_merge_whitelist_teams"}}</label>
+							<div class="ui multiple search selection dropdown">
+								<input type="hidden" name="merge_whitelist_teams" value="{{.merge_whitelist_teams}}">
+								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+								<div class="menu">
+								{{range .Teams}}
+									<div class="item" data-value="{{.ID}}">
+										{{svg "octicon-people"}}
+									{{.Name}}
+									</div>
+								{{end}}
 								</div>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input name="require_signed_commits" type="checkbox" {{if .Rule.RequireSignedCommits}}checked{{end}}>
-									<label for="require_signed_commits">{{.locale.Tr "repo.settings.require_signed_commits"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.require_signed_commits_desc"}}</p>
+						</div>
+					{{end}}
+					</div>
+
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-statuscheck" name="enable_status_check" type="checkbox" data-target="#statuscheck_contexts_box" {{if eq (len .branch_status_check_contexts) 0}}disabled{{end}} {{if .Rule.EnableStatusCheck}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_check_status_contexts"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_check_status_contexts_desc"}}</p>
+						</div>
+					</div>
+
+					<div id="statuscheck_contexts_box" class="fields {{if not .Rule.EnableStatusCheck}}disabled{{end}}">
+						<div class="field">
+							<table class="ui celled table six column">
+								<thead>
+									<tr><th>
+										{{.locale.Tr "repo.settings.protect_check_status_contexts_list"}}
+									</th>
+									</tr>
+								</thead>
+								<tbody>
+								{{range $.branch_status_check_contexts}}
+									<tr><td>
+										<span class="ui checkbox">
+											<input class="enable-whitelist" name="status_check_contexts" value="{{.}}" type="checkbox" {{if $.is_context_required}}{{if call $.is_context_required .}}checked{{end}}{{end}}>
+										</span>
+										{{.}}
+										{{if $.is_context_required}}{{if call $.is_context_required .}}<div class="ui label right">Required</div>{{end}}{{end}}
+									</td></tr>
+								{{end}}
+								</tbody>
+							</table>
+						</div>
+					</div>
+
+					<div class="field">
+						<label for="required-approvals">{{.locale.Tr "repo.settings.protect_required_approvals"}}</label>
+						<input name="required_approvals" id="required-approvals" type="number" value="{{.Rule.RequiredApprovals}}">
+						<p class="help">{{.locale.Tr "repo.settings.protect_required_approvals_desc"}}</p>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-whitelist" name="enable_approvals_whitelist" type="checkbox" data-target="#approvals_whitelist_box" {{if .Rule.EnableApprovalsWhitelist}}checked{{end}}>
+							<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.protect_approvals_whitelist_enabled_desc"}}</p>
+						</div>
+					</div>
+					<div id="approvals_whitelist_box" class="fields {{if not .Rule.EnableApprovalsWhitelist}}disabled{{end}}">
+						<div class="whitelist field">
+							<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_users"}}</label>
+							<div class="ui multiple search selection dropdown">
+								<input type="hidden" name="approvals_whitelist_users" value="{{.approvals_whitelist_users}}">
+								<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_users"}}</div>
+								<div class="menu">
+								{{range .Users}}
+									<div class="item" data-value="{{.ID}}">
+										{{avatar $.Context . 28 "mini"}}{{template "repo/search_name" .}}
+									</div>
+								{{end}}
 								</div>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input name="block_on_outdated_branch" type="checkbox" {{if .Rule.BlockOnOutdatedBranch}}checked{{end}}>
-									<label for="block_on_outdated_branch">{{.locale.Tr "repo.settings.block_outdated_branch"}}</label>
-									<p class="help">{{.locale.Tr "repo.settings.block_outdated_branch_desc"}}</p>
+						</div>
+						{{if .Owner.IsOrganization}}
+							<br>
+							<div class="whitelist field">
+								<label>{{.locale.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label>
+								<div class="ui multiple search selection dropdown">
+									<input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}">
+									<div class="default text">{{.locale.Tr "repo.settings.protect_whitelist_search_teams"}}</div>
+									<div class="menu">
+									{{range .Teams}}
+										<div class="item" data-value="{{.ID}}">
+											{{svg "octicon-people"}}
+										{{.Name}}
+										</div>
+									{{end}}
+									</div>
 								</div>
 							</div>
-							<div class="field">
-								<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_protected_file_patterns"}}</label>
-								<input name="protected_file_patterns" id="protected_file_patterns" type="text" value="{{.Rule.ProtectedFilePatterns}}">
-								<p class="help">{{.locale.Tr "repo.settings.protect_protected_file_patterns_desc" | Safe}}</p>
-							</div>
-							<div class="field">
-								<label for="unprotected_file_patterns">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns"}}</label>
-								<input name="unprotected_file_patterns" id="unprotected_file_patterns" type="text" value="{{.Rule.UnprotectedFilePatterns}}">
-								<p class="help">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns_desc" | Safe}}</p>
-							</div>
+						{{end}}
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input name="block_on_rejected_reviews" type="checkbox" {{if .Rule.BlockOnRejectedReviews}}checked{{end}}>
+							<label for="block_on_rejected_reviews">{{.locale.Tr "repo.settings.block_rejected_reviews"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.block_rejected_reviews_desc"}}</p>
 						</div>
-
-						<div class="ui divider"></div>
-
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "repo.settings.protected_branch.save_rule"}}</button>
-							<button class="ui gray button">{{$.locale.Tr "cancel"}}</button>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input name="block_on_official_review_requests" type="checkbox" {{if .Rule.BlockOnOfficialReviewRequests}}checked{{end}}>
+							<label for="block_on_official_review_requests">{{.locale.Tr "repo.settings.block_on_official_review_requests"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.block_on_official_review_requests_desc"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input name="dismiss_stale_approvals" type="checkbox" {{if .Rule.DismissStaleApprovals}}checked{{end}}>
+							<label for="dismiss_stale_approvals">{{.locale.Tr "repo.settings.dismiss_stale_approvals"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.dismiss_stale_approvals_desc"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input name="require_signed_commits" type="checkbox" {{if .Rule.RequireSignedCommits}}checked{{end}}>
+							<label for="require_signed_commits">{{.locale.Tr "repo.settings.require_signed_commits"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.require_signed_commits_desc"}}</p>
 						</div>
 					</div>
-				</form>
+					<div class="field">
+						<div class="ui checkbox">
+							<input name="block_on_outdated_branch" type="checkbox" {{if .Rule.BlockOnOutdatedBranch}}checked{{end}}>
+							<label for="block_on_outdated_branch">{{.locale.Tr "repo.settings.block_outdated_branch"}}</label>
+							<p class="help">{{.locale.Tr "repo.settings.block_outdated_branch_desc"}}</p>
+						</div>
+					</div>
+					<div class="field">
+						<label for="protected_file_patterns">{{.locale.Tr "repo.settings.protect_protected_file_patterns"}}</label>
+						<input name="protected_file_patterns" id="protected_file_patterns" type="text" value="{{.Rule.ProtectedFilePatterns}}">
+						<p class="help">{{.locale.Tr "repo.settings.protect_protected_file_patterns_desc" | Safe}}</p>
+					</div>
+					<div class="field">
+						<label for="unprotected_file_patterns">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns"}}</label>
+						<input name="unprotected_file_patterns" id="unprotected_file_patterns" type="text" value="{{.Rule.UnprotectedFilePatterns}}">
+						<p class="help">{{.locale.Tr "repo.settings.protect_unprotected_file_patterns_desc" | Safe}}</p>
+					</div>
+				</div>
+
+				<div class="ui divider"></div>
+
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "repo.settings.protected_branch.save_rule"}}</button>
+					<button class="ui gray button">{{$.locale.Tr "cancel"}}</button>
+				</div>
 			</div>
-		</div>
+		</form>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 38a103f3d92d..442db3a38b0b 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div class="page-content repository settings runners">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "shared/actions/runner_edit" .}}
-			</div>
-		</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "shared/actions/runner_edit" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index d649eb6082d7..da6778a1a591 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div class="page-content repository settings runners">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "shared/actions/runner_list" .}}
-			</div>
-		</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "shared/actions/runner_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index b439d117aefc..8ba40d643ddd 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,14 +1,6 @@
-{{template "base/head" .}}
-<div class="page-content repository settings">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "shared/secrets/add_list" .}}
-			</div>
-		</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "shared/secrets/add_list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 2e44ab9a2baf..00fccd04e830 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,8 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings edit">
-	{{template "repo/header" .}}
-	{{template "repo/settings/navbar" .}}
-	<div class="ui container">
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
+	<div class="twelve wide column content">
 		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
@@ -127,5 +124,4 @@
 			</div>
 		{{end}}
 	</div>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index b4f6873896b4..bbcd62e0eb1d 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings webhooks">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "repo/settings/webhook/list" .}}
-			</div>
-		</div>
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhooks")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "repo/settings/webhook/list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl
index 507f5e1f675b..b24159fccb58 100644
--- a/templates/repo/settings/webhook/list.tmpl
+++ b/templates/repo/settings/webhook/list.tmpl
@@ -1,4 +1,3 @@
-{{template "base/alert" .}}
 
 {{template "repo/settings/webhook/base_list" .}}
 
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index dfa315bcad2b..c50be164b614 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,56 +1,48 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository settings new webhook">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "repo/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-					<div class="ui right">
-						{{if eq .HookType "gitea"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-						{{else if eq .HookType "gogs"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-						{{else if eq .HookType "slack"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-						{{else if eq .HookType "discord"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-						{{else if eq .HookType "dingtalk"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-						{{else if eq .HookType "telegram"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-						{{else if eq .HookType "msteams"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-						{{else if eq .HookType "feishu"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-						{{else if eq .HookType "matrix"}}
-							{{svg "gitea-matrix" 26}}
-						{{else if eq .HookType "wechatwork"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-						{{else if eq .HookType "packagist"}}
-							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-						{{end}}
-					</div>
-				</h4>
-				<div class="ui attached segment">
-					{{template "repo/settings/webhook/gitea" .}}
-					{{template "repo/settings/webhook/gogs" .}}
-					{{template "repo/settings/webhook/slack" .}}
-					{{template "repo/settings/webhook/discord" .}}
-					{{template "repo/settings/webhook/dingtalk" .}}
-					{{template "repo/settings/webhook/telegram" .}}
-					{{template "repo/settings/webhook/msteams" .}}
-					{{template "repo/settings/webhook/feishu" .}}
-					{{template "repo/settings/webhook/matrix" .}}
-					{{template "repo/settings/webhook/wechatwork" .}}
-					{{template "repo/settings/webhook/packagist" .}}
-				</div>
-
-				{{template "repo/settings/webhook/history" .}}
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhook")}}
+	<div class="twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
+			<div class="ui right">
+				{{if eq .HookType "gitea"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+				{{else if eq .HookType "gogs"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+				{{else if eq .HookType "slack"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+				{{else if eq .HookType "discord"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+				{{else if eq .HookType "dingtalk"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+				{{else if eq .HookType "telegram"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+				{{else if eq .HookType "msteams"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+				{{else if eq .HookType "feishu"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+				{{else if eq .HookType "matrix"}}
+					{{svg "gitea-matrix" 26}}
+				{{else if eq .HookType "wechatwork"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+				{{else if eq .HookType "packagist"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+				{{end}}
 			</div>
+		</h4>
+		<div class="ui attached segment">
+			{{template "repo/settings/webhook/gitea" .}}
+			{{template "repo/settings/webhook/gogs" .}}
+			{{template "repo/settings/webhook/slack" .}}
+			{{template "repo/settings/webhook/discord" .}}
+			{{template "repo/settings/webhook/dingtalk" .}}
+			{{template "repo/settings/webhook/telegram" .}}
+			{{template "repo/settings/webhook/msteams" .}}
+			{{template "repo/settings/webhook/feishu" .}}
+			{{template "repo/settings/webhook/matrix" .}}
+			{{template "repo/settings/webhook/wechatwork" .}}
+			{{template "repo/settings/webhook/packagist" .}}
 		</div>
+
+		{{template "repo/settings/webhook/history" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/user/settings/hooks.tmpl b/templates/user/settings/hooks.tmpl
index 7fca43f81239..59ef98b7cad1 100644
--- a/templates/user/settings/hooks.tmpl
+++ b/templates/user/settings/hooks.tmpl
@@ -4,6 +4,7 @@
 		<div class="ui grid">
 			{{template "user/settings/navbar" .}}
 			<div class="twelve wide column content">
+				{{template "base/alert" .}}
 				{{template "repo/settings/webhook/list" .}}
 			</div>
 		</div>
diff --git a/web_src/css/admin.css b/web_src/css/admin.css
index eb3146e6665b..2015140e08a8 100644
--- a/web_src/css/admin.css
+++ b/web_src/css/admin.css
@@ -1,4 +1,4 @@
-.page-content.admin.grid {
+.admi.page-content.grid {
   margin-top: 0;
 }
 

From b5538c0ede162513bc5582f3f362b7da83cadd10 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 11:45:33 +0800
Subject: [PATCH 12/21] rework repo lfs settings

---
 templates/repo/settings/lfs_file.tmpl      | 102 ++++++++++----------
 templates/repo/settings/lfs_file_find.tmpl |  88 +++++++++--------
 templates/repo/settings/lfs_locks.tmpl     | 107 ++++++++++-----------
 3 files changed, 145 insertions(+), 152 deletions(-)

diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 15daf59a5034..03da5eac0e87 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,58 +1,56 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content">
-		<div class="ui container repository file list">
-			{{template "base/alert" .}}
-			<div class="tab-size-8 non-diff-file-content">
-				<h4 class="ui top attached header">
-					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
-					<div class="ui right">
-						{{if .EscapeStatus.Escaped}}
-							<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
-							<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
-						{{end}}
-						<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
-					</div>
-				</h4>
-				<div class="ui attached table unstackable segment">
-					{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
-					<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
-						{{if .IsMarkup}}
-							{{if .FileContent}}{{.FileContent | Safe}}{{end}}
-						{{else if .IsPlainText}}
-							<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
-						{{else if not .IsTextFile}}
-							<div class="view-raw ui center">
-								{{if .IsImageFile}}
-									<img src="{{$.RawFileLink}}">
-								{{else if .IsVideoFile}}
-									<video controls src="{{$.RawFileLink}}">
-										<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
-									</video>
-								{{else if .IsAudioFile}}
-									<audio controls src="{{$.RawFileLink}}">
-										<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
-									</audio>
-								{{else if .IsPDFFile}}
-									<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
+	<div class="twelve wide column content repository file list">
+		{{template "base/alert" .}}
+		<div class="tab-size-8 non-diff-file-content">
+			<h4 class="ui top attached header">
+				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
+				<div class="ui right">
+					{{if .EscapeStatus.Escaped}}
+						<a class="ui mini basic button unescape-button gt-hidden">{{.locale.Tr "repo.unescape_control_characters"}}</a>
+						<a class="ui mini basic button escape-button">{{.locale.Tr "repo.escape_control_characters"}}</a>
+					{{end}}
+					<a class="ui primary button" href="{{.LFSFilesLink}}/find?oid={{.LFSFile.Oid}}&size={{.LFSFile.Size}}">{{$.locale.Tr "repo.settings.lfs_findcommits"}}</a>
+				</div>
+			</h4>
+			<div class="ui attached table unstackable segment">
+				{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
+				<div class="file-view{{if .IsMarkup}} markup {{.MarkupType}}{{else if .IsPlainText}} plain-text{{else if .IsTextFile}} code-view{{end}}">
+					{{if .IsMarkup}}
+						{{if .FileContent}}{{.FileContent | Safe}}{{end}}
+					{{else if .IsPlainText}}
+						<pre>{{if .FileContent}}{{.FileContent | Safe}}{{end}}</pre>
+					{{else if not .IsTextFile}}
+						<div class="view-raw ui center">
+							{{if .IsImageFile}}
+								<img src="{{$.RawFileLink}}">
+							{{else if .IsVideoFile}}
+								<video controls src="{{$.RawFileLink}}">
+									<strong>{{.locale.Tr "repo.video_not_supported_in_browser"}}</strong>
+								</video>
+							{{else if .IsAudioFile}}
+								<audio controls src="{{$.RawFileLink}}">
+									<strong>{{.locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
+								</audio>
+							{{else if .IsPDFFile}}
+								<iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{$.RawFileLink}}"></iframe>
+							{{else}}
+								<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
+							{{end}}
+						</div>
+					{{else if .FileSize}}
+						<table>
+							<tbody>
+								<tr>
+								{{if .IsFileTooLarge}}
+									<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
 								{{else}}
-									<a href="{{$.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.locale.Tr "repo.file_view_raw"}}</a>
+									<td class="lines-num">{{.LineNums}}</td>
+									<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
 								{{end}}
-							</div>
-						{{else if .FileSize}}
-							<table>
-								<tbody>
-									<tr>
-									{{if .IsFileTooLarge}}
-										<td><strong>{{.locale.Tr "repo.file_too_large"}}</strong></td>
-									{{else}}
-										<td class="lines-num">{{.LineNums}}</td>
-										<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol>{{.FileContent}}</ol></code></pre></td>
-									{{end}}
-									</tr>
-								</tbody>
-							</table>
-						{{end}}
-					</div>
+								</tr>
+							</tbody>
+						</table>
+					{{end}}
 				</div>
 			</div>
 		</div>
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index b15bc4d1d61d..1c7b935790f8 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,50 +1,48 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content">
-		<div class="ui container repository file list">
-			{{template "base/alert" .}}
-			<div class="tab-size-8 non-diff-file-content">
-				<h4 class="ui top attached header">
-					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
-				</h4>
-				<table id="lfs-files-find-table" class="ui attached segment single line table">
-					<tbody>
-						{{range .Results}}
-							<tr>
-								<td>
-									{{svg "octicon-file"}}
-									<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
-								</td>
-								<td class="message">
-									<span class="truncate">
-										<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
-											{{.Summary | RenderEmoji $.Context}}
-										</a>
-									</span>
-								</td>
-								<td>
-									<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
-								</td>
-								<td>
-									{{if .ParentHashes}}
-										{{$.locale.Tr "repo.diff.parent"}}
-										{{range .ParentHashes}}
-											<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
-										{{end}}
+	<div class="twelve wide column content repository file list">
+		{{template "base/alert" .}}
+		<div class="tab-size-8 non-diff-file-content">
+			<h4 class="ui top attached header">
+				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
+			</h4>
+			<table id="lfs-files-find-table" class="ui attached segment single line table">
+				<tbody>
+					{{range .Results}}
+						<tr>
+							<td>
+								{{svg "octicon-file"}}
+								<a href="{{$.RepoLink}}/src/commit/{{.SHA}}/{{PathEscapeSegments .Name}}" title="{{.Name}}">{{.Name}}</a>
+							</td>
+							<td class="message">
+								<span class="truncate">
+									<a href="{{$.RepoLink}}/commit/{{.SHA}}" title="{{.Summary | RenderEmojiPlain}}">
+										{{.Summary | RenderEmoji $.Context}}
+									</a>
+								</span>
+							</td>
+							<td>
+								<span class="text grey">{{svg "octicon-git-branch"}}{{.BranchName}}</span>
+							</td>
+							<td>
+								{{if .ParentHashes}}
+									{{$.locale.Tr "repo.diff.parent"}}
+									{{range .ParentHashes}}
+										<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
 									{{end}}
-									<div class="mobile-only"></div>
-									{{$.locale.Tr "repo.diff.commit"}}
-									<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
-								</td>
-								<td>{{TimeSince .When $.locale}}</td>
-							</tr>
-						{{else}}
-							<tr>
-								<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
-							</tr>
-						{{end}}
-					</tbody>
-				</table>
-			</div>
+								{{end}}
+								<div class="mobile-only"></div>
+								{{$.locale.Tr "repo.diff.commit"}}
+								<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
+							</td>
+							<td>{{TimeSince .When $.locale}}</td>
+						</tr>
+					{{else}}
+						<tr>
+							<td colspan="5">{{.locale.Tr "repo.settings.lfs_lfs_file_no_commits"}}</td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
 		</div>
 	</div>
 {{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index a1395f70032c..2a15f0dd13d9 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,60 +1,57 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content">
-		<div class="ui container repository file list">
-			{{template "base/alert" .}}
-			<div class="tab-size-8 non-diff-file-content">
-				<h4 class="ui top attached header">
-					<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form ignore-dirty" method="POST">
-						{{$.CsrfTokenHtml}}
-						<div class="ui fluid action input">
-							<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
-							<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
-						</div>
-					</form>
-				</div>
-				<table id="lfs-files-locks-table" class="ui attached segment single line table">
-					<tbody>
-						{{range $index, $lock := .LFSLocks}}
-							<tr>
-								<td>
-									{{if index $.Linkable $index}}
-										{{svg "octicon-file"}}
-									<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
-									{{else}}
-										{{svg "octicon-diff"}}
-									<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
-									{{end}}
-									{{if not (index $.Lockables $index)}}
-										<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
-									{{end}}
-								</td>
-								<td>
-									<a href="{{$.Owner.HomeLink}}">
-										{{avatar $.Context $.Owner}}
-										{{$.Owner.DisplayName}}
-									</a>
-								</td>
-								<td>{{TimeSince .Created $.locale}}</td>
-								<td class="right aligned">
-									<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
-										{{$.CsrfTokenHtml}}
-										<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
-									</form>
-								</td>
-							</tr>
-						{{else}}
-							<tr>
-								<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
-							</tr>
-						{{end}}
-					</tbody>
-				</table>
-				{{template "base/paginate" .}}
+	<div class="twelve wide column content repository file list">
+		{{template "base/alert" .}}
+		<div class="tab-size-8 non-diff-file-content">
+			<h4 class="ui top attached header">
+				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
+			</h4>
+			<div class="ui attached segment">
+				<form class="ui form ignore-dirty" method="POST">
+					{{$.CsrfTokenHtml}}
+					<div class="ui fluid action input">
+						<input name="path" value="" placeholder="{{.locale.Tr "repo.settings.lfs_lock_path"}}" autofocus>
+						<button class="ui primary button">{{.locale.Tr "repo.settings.lfs_lock"}}</button>
+					</div>
+				</form>
 			</div>
+			<table id="lfs-files-locks-table" class="ui attached segment single line table">
+				<tbody>
+					{{range $index, $lock := .LFSLocks}}
+						<tr>
+							<td>
+								{{if index $.Linkable $index}}
+									{{svg "octicon-file"}}
+								<a href="{{$.RepoLink}}/src/branch/{{PathEscapeSegments $.Repository.DefaultBranch}}/{{PathEscapeSegments $lock.Path}}" title="{{$lock.Path}}">{{$lock.Path}}</a>
+								{{else}}
+									{{svg "octicon-diff"}}
+								<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_lock_file_no_exist"}}">{{$lock.Path}}</span>
+								{{end}}
+								{{if not (index $.Lockables $index)}}
+									<span data-tooltip-content="{{$.locale.Tr "repo.settings.lfs_noattribute"}}">{{svg "octicon-alert"}}</span>
+								{{end}}
+							</td>
+							<td>
+								<a href="{{$.Owner.HomeLink}}">
+									{{avatar $.Context $.Owner}}
+									{{$.Owner.DisplayName}}
+								</a>
+							</td>
+							<td>{{TimeSince .Created $.locale}}</td>
+							<td class="right aligned">
+								<form action="{{$.LFSFilesLink}}/locks/{{$lock.ID}}/unlock" method="POST">
+									{{$.CsrfTokenHtml}}
+									<button class="ui primary button"><span class="btn-octicon">{{svg "octicon-lock"}}</span>{{$.locale.Tr "repo.settings.lfs_force_unlock"}}</button>
+								</form>
+							</td>
+						</tr>
+					{{else}}
+						<tr>
+							<td colspan="4">{{.locale.Tr "repo.settings.lfs_locks_no_locks"}}</td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
+			{{template "base/paginate" .}}
 		</div>
 	</div>
-</div>
 {{template "repo/settings/layout_footer" .}}

From 6916e7c270703a410a5f3dec192911665ac5992b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 13:12:18 +0800
Subject: [PATCH 13/21] update user and modify repo and admin

---
 templates/admin/applications/list.tmpl        |   3 +-
 templates/admin/applications/oauth2_edit.tmpl |   3 +-
 templates/admin/auth/edit.tmpl                |   3 +-
 templates/admin/auth/list.tmpl                |   3 +-
 templates/admin/auth/new.tmpl                 |   3 +-
 templates/admin/config.tmpl                   |   3 +-
 templates/admin/dashboard.tmpl                |   3 +-
 templates/admin/emails/list.tmpl              |   3 +-
 templates/admin/hook_new.tmpl                 |   3 +-
 templates/admin/hooks.tmpl                    |   3 +-
 templates/admin/layout_head.tmpl              |   8 +-
 templates/admin/monitor.tmpl                  |   3 +-
 templates/admin/notice.tmpl                   |   3 +-
 templates/admin/org/list.tmpl                 |   3 +-
 templates/admin/packages/list.tmpl            |   3 +-
 templates/admin/queue.tmpl                    |   3 +-
 templates/admin/repo/list.tmpl                |   3 +-
 templates/admin/repo/unadopted.tmpl           |   3 +-
 templates/admin/runners/base.tmpl             |   3 +-
 templates/admin/runners/edit.tmpl             |   3 +-
 templates/admin/stacktrace.tmpl               |   3 +-
 templates/admin/user/edit.tmpl                |   3 +-
 templates/admin/user/list.tmpl                |   3 +-
 templates/admin/user/new.tmpl                 |   3 +-
 templates/repo/settings/branches.tmpl         |   2 +-
 templates/repo/settings/collaboration.tmpl    |   2 +-
 templates/repo/settings/deploy_keys.tmpl      |   2 +-
 templates/repo/settings/githook_edit.tmpl     |   2 +-
 templates/repo/settings/githooks.tmpl         |   2 +-
 templates/repo/settings/lfs.tmpl              |   2 +-
 templates/repo/settings/lfs_file.tmpl         |   2 +-
 templates/repo/settings/lfs_file_find.tmpl    |   2 +-
 templates/repo/settings/lfs_locks.tmpl        |   2 +-
 templates/repo/settings/lfs_pointers.tmpl     |   2 +-
 templates/repo/settings/options.tmpl          |   2 +-
 templates/repo/settings/protected_branch.tmpl |   2 +-
 templates/repo/settings/runner_edit.tmpl      |   2 +-
 templates/repo/settings/runners.tmpl          |   2 +-
 templates/repo/settings/secrets.tmpl          |   2 +-
 templates/repo/settings/tags.tmpl             |   2 +-
 templates/repo/settings/webhook/base.tmpl     |   2 +-
 templates/repo/settings/webhook/new.tmpl      |   2 +-
 templates/user/settings/account.tmpl          | 292 +++++------
 templates/user/settings/appearance.tmpl       | 318 ++++++-----
 templates/user/settings/applications.tmpl     | 495 +++++++++---------
 .../settings/applications_oauth2_edit.tmpl    |  17 +-
 templates/user/settings/hook_new.tmpl         |  99 ++--
 templates/user/settings/hooks.tmpl            |  17 +-
 templates/user/settings/keys.tmpl             |  22 +-
 templates/user/settings/layout_footer.tmpl    |   8 +
 templates/user/settings/layout_head.tmpl      |   9 +
 templates/user/settings/organization.tmpl     |  78 ++-
 templates/user/settings/packages.tmpl         |  46 +-
 .../settings/packages_cleanup_rules_edit.tmpl |  17 +-
 .../packages_cleanup_rules_preview.tmpl       |  15 +-
 templates/user/settings/profile.tmpl          | 245 +++++----
 templates/user/settings/repos.tmpl            | 227 ++++----
 templates/user/settings/secrets.tmpl          |  18 +-
 .../user/settings/security/security.tmpl      |  28 +-
 .../user/settings/security/twofa_enroll.tmpl  |  52 +-
 web_src/css/admin.css                         |   4 -
 61 files changed, 1019 insertions(+), 1101 deletions(-)
 create mode 100644 templates/user/settings/layout_footer.tmpl
 create mode 100644 templates/user/settings/layout_head.tmpl

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index d3186ca60be4..8f2ddb303791 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<div class="twelve wide column content">
 			<h4 class="ui top attached header">
 					{{.locale.Tr "settings.applications"}}
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index a22769bc7e6c..c60a0d815114 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index ef3fd31270c3..d832334f02a4 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.edit"}}
 		</h4>
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 750261aede38..7d113103123f 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index 071a95948e8b..183517eb2e5b 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.new"}}
 		</h4>
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 40a0111bd9cc..1bbb5c3f61cd 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.config.server_config"}}
 		</h4>
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 3c0d46e13b49..b57eb2ca99a1 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		{{if .NeedUpdate}}
 			<div class="ui negative message flash-error">
 				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 56c11be3ad1c..1fb8e19dacd9 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index 34dd9479fcb5..b80528d7c8b1 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsAdminDefaultHooksNew}}
 				{{.locale.Tr "admin.defaulthooks.add_webhook"}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index ca88c90b52c8..edb40d871463 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 
 		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
 		{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl
index 6612b69aca2d..0469e3d404ed 100644
--- a/templates/admin/layout_head.tmpl
+++ b/templates/admin/layout_head.tmpl
@@ -1,9 +1,7 @@
 {{template "base/head" .ctxData}}
-<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}} ui container stackable grid">
-	{{template "admin/navbar" .ctxData}}
-	<div class="twelve wide column">
-		{{template "base/alert" .ctxData}}
-
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	<div class="ui container stackable grid">
+		{{template "admin/navbar" .ctxData}}
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		{{/* block: admin-main-content */}}
 	</div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 5e8366f336c3..797ffaaec190 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		{{template "admin/cron" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queues"}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index e1a07685dd63..f7484349be75 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index fcff4a951c9c..6e522a39a546 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index b37de4b29b1f..df6e01fb2518 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
 			{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index b27aefda5885..5b853b5c7e90 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
 		</h4>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 1d5bc8eb4619..69c7be5e273b 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 330a2abd510a..cf06f97c9721 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.unadopted"}}
 			<div class="ui right">
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index 8cd3d6418a62..f7d55b0fd3d4 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index 63c6f2dd020f..3303e5f9f37c 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index 479f8c0f5bd2..c230da0393a6 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
 			<div class="ui right">
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 942885a38868..9085c44d2108 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.edit_account"}}
 		</h4>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 94953a90f8d4..051cd2569ba6 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 9274c28231e0..40f0b2643c57 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,5 +1,6 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
-	<div class="admin-main-content">
+	<div class="admin-main-content twelve wide column content">
+		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.new_account"}}
 		</h4>
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index effee6d14138..e29c7d82435e 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index b40c77a838a0..a62c796e5c24 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.collaboration"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 91a30aece331..822ece2e106b 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.deploy_keys"}}
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 64f4c7da7672..016c5976c0c8 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit githook")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index f61baba54a69..d02201c08240 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings githooks")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index dd583bb9e6c5..268ed0dbf327 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 03da5eac0e87..d1b4193ff6bc 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content repository file list">
+	<div class="user-main-content twelve wide column content repository file list">
 		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 1c7b935790f8..9414331c7eaf 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content repository file list">
+	<div class="user-main-content twelve wide column content repository file list">
 		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index 2a15f0dd13d9..b40cd544f9d9 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content repository file list">
+	<div class="user-main-content twelve wide column content repository file list">
 		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 0d2d9a6a406d..ad103e1acb60 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index f402401e2659..b82d4493b4ce 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings options")}}
-	<div class="twelve wide column">
+	<div class="user-main-content twelve wide column">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.basic_settings"}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 1f422b102b40..0705faa34403 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings branches")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<form class="ui form" action="{{.Link}}" method="post">
 			<h4 class="ui top attached header">
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 442db3a38b0b..4cb2d49af2bd 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index da6778a1a591..f6c0966b43d7 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index 8ba40d643ddd..2f01bd1ec535 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 00fccd04e830..8f351143bc02 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index bbcd62e0eb1d..0d40b5d7092f 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhooks")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		{{template "repo/settings/webhook/list" .}}
 	</div>
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index c50be164b614..a4284ef59bd8 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhook")}}
-	<div class="twelve wide column content">
+	<div class="repo-main-content twelve wide column content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 14f798b3da9c..3ae95a134bc4 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,169 +1,163 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings account">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.password"}}
-				</h4>
-				<div class="ui attached segment">
-					{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}}
-					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/account" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						{{if .SignedUser.IsPasswordSet}}
-						<div class="required field {{if .Err_OldPassword}}error{{end}}">
-							<label for="old_password">{{.locale.Tr "settings.old_password"}}</label>
-							<input id="old_password" name="old_password" type="password" autocomplete="current-password" autofocus required>
-						</div>
-						{{end}}
-						<div class="required field {{if .Err_Password}}error{{end}}">
-							<label for="password">{{.locale.Tr "settings.new_password"}}</label>
-							<input id="password" name="password" type="password" autocomplete="new-password" required>
-						</div>
-						<div class="required field {{if .Err_Password}}error{{end}}">
-							<label for="retype">{{.locale.Tr "settings.retype_new_password"}}</label>
-							<input id="retype" name="retype" type="password" autocomplete="new-password" required>
-						</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.password"}}
+		</h4>
+		<div class="ui attached segment">
+			{{if or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2)}}
+			<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/settings/account" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				{{if .SignedUser.IsPasswordSet}}
+				<div class="required field {{if .Err_OldPassword}}error{{end}}">
+					<label for="old_password">{{.locale.Tr "settings.old_password"}}</label>
+					<input id="old_password" name="old_password" type="password" autocomplete="current-password" autofocus required>
+				</div>
+				{{end}}
+				<div class="required field {{if .Err_Password}}error{{end}}">
+					<label for="password">{{.locale.Tr "settings.new_password"}}</label>
+					<input id="password" name="password" type="password" autocomplete="new-password" required>
+				</div>
+				<div class="required field {{if .Err_Password}}error{{end}}">
+					<label for="retype">{{.locale.Tr "settings.retype_new_password"}}</label>
+					<input id="retype" name="retype" type="password" autocomplete="new-password" required>
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.change_password"}}</button>
-							<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
-						</div>
-					</form>
-					{{else}}
-					<div class="ui info message">
-						<p class="text left">{{$.locale.Tr "settings.password_change_disabled"}}</p>
-					</div>
-					{{end}}
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.change_password"}}</button>
+					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
 				</div>
+			</form>
+			{{else}}
+			<div class="ui info message">
+				<p class="text left">{{$.locale.Tr "settings.password_change_disabled"}}</p>
+			</div>
+			{{end}}
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.manage_emails"}}
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui email list">
-						{{if $.EnableNotifyMail}}
-						<div class="item">
-							<form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post">
-								{{.locale.Tr "settings.email_desc"}}
-								<div class="right floated content">
-									<div class="field">
-										<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.manage_emails"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui email list">
+				{{if $.EnableNotifyMail}}
+				<div class="item">
+					<form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post">
+						{{.locale.Tr "settings.email_desc"}}
+						<div class="right floated content">
+							<div class="field">
+								<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
+							</div>
+						</div>
+						<div class="right floated content">
+							{{$.CsrfTokenHtml}}
+							<input name="_method" type="hidden" value="NOTIFICATION">
+							<div class="field">
+								<div class="ui selection dropdown" tabindex="0">
+									<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
+									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+									<div class="text"></div>
+									<div class="menu">
+										<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
+										<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
+										<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
+										<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
 									</div>
 								</div>
+							</div>
+						</div>
+					</form>
+				</div>
+				{{end}}
+				{{range .Emails}}
+					<div class="item">
+						{{if not .IsPrimary}}
+							<div class="right floated content">
+								<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
+									{{$.locale.Tr "settings.delete_email"}}
+								</button>
+							</div>
+							{{if .CanBePrimary}}
 								<div class="right floated content">
-									{{$.CsrfTokenHtml}}
-									<input name="_method" type="hidden" value="NOTIFICATION">
-									<div class="field">
-										<div class="ui selection dropdown" tabindex="0">
-											<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
-											{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-											<div class="text"></div>
-											<div class="menu">
-												<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
-												<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
-												<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
-												<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
-											</div>
-										</div>
-									</div>
+									<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
+										{{$.CsrfTokenHtml}}
+										<input name="_method" type="hidden" value="PRIMARY">
+										<input name="id" type="hidden" value="{{.ID}}">
+										<button class="ui primary tiny button">{{$.locale.Tr "settings.primary_email"}}</button>
+									</form>
 								</div>
-							</form>
-						</div>
+							{{end}}
 						{{end}}
-						{{range .Emails}}
-							<div class="item">
-								{{if not .IsPrimary}}
-									<div class="right floated content">
-										<button class="ui red tiny button delete-button" data-modal-id="delete-email" data-url="{{AppSubUrl}}/user/settings/account/email/delete" data-id="{{.ID}}">
-											{{$.locale.Tr "settings.delete_email"}}
-										</button>
-									</div>
-									{{if .CanBePrimary}}
-										<div class="right floated content">
-											<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
-												{{$.CsrfTokenHtml}}
-												<input name="_method" type="hidden" value="PRIMARY">
-												<input name="id" type="hidden" value="{{.ID}}">
-												<button class="ui primary tiny button">{{$.locale.Tr "settings.primary_email"}}</button>
-											</form>
-										</div>
-									{{end}}
-								{{end}}
-								{{if not .IsActivated}}
-									<div class="right floated content">
-										<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
-											{{$.CsrfTokenHtml}}
-											<input name="_method" type="hidden" value="SENDACTIVATION">
-											<input name="id" type="hidden" value="{{.ID}}">
-											{{if $.ActivationsPending}}
-												<button disabled class="ui primary tiny button">{{$.locale.Tr "settings.activations_pending"}}</button>
-											{{else}}
-												<button class="ui primary tiny button">{{$.locale.Tr "settings.activate_email"}}</button>
-											{{end}}
-										</form>
-									</div>
-								{{end}}
-								<div class="content">
-									<strong>{{.Email}}</strong>
-									{{if .IsPrimary}}
-										<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>
-									{{end}}
-									{{if .IsActivated}}
-										<div class="ui green label">{{$.locale.Tr "settings.activated"}}</div>
+						{{if not .IsActivated}}
+							<div class="right floated content">
+								<form action="{{AppSubUrl}}/user/settings/account/email" method="post">
+									{{$.CsrfTokenHtml}}
+									<input name="_method" type="hidden" value="SENDACTIVATION">
+									<input name="id" type="hidden" value="{{.ID}}">
+									{{if $.ActivationsPending}}
+										<button disabled class="ui primary tiny button">{{$.locale.Tr "settings.activations_pending"}}</button>
 									{{else}}
-										<div class="ui label">{{$.locale.Tr "settings.requires_activation"}}</div>
+										<button class="ui primary tiny button">{{$.locale.Tr "settings.activate_email"}}</button>
 									{{end}}
-								</div>
+								</form>
 							</div>
 						{{end}}
-					</div>
-				</div>
-				<div class="ui attached bottom segment">
-					<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="required field {{if .Err_Email}}error{{end}}">
-							<label for="email">{{.locale.Tr "settings.add_new_email"}}</label>
-							<input id="email" name="email" type="email" required {{if not .CanAddEmails}}disabled{{end}}>
+						<div class="content">
+							<strong>{{.Email}}</strong>
+							{{if .IsPrimary}}
+								<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>
+							{{end}}
+							{{if .IsActivated}}
+								<div class="ui green label">{{$.locale.Tr "settings.activated"}}</div>
+							{{else}}
+								<div class="ui label">{{$.locale.Tr "settings.requires_activation"}}</div>
+							{{end}}
 						</div>
-						<button class="ui green button" {{if not .CanAddEmails}}disabled{{end}}>
-							{{.locale.Tr "settings.add_email"}}
-						</button>
-					</form>
-				</div>
-
-				<h4 class="ui top attached error header">
-					{{.locale.Tr "settings.delete_account"}}
-				</h4>
-				<div class="ui attached error segment">
-					<div class="ui red message">
-						<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
-						{{if .UserDeleteWithComments}}
-						<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
-						{{end}}
 					</div>
-					<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
-						{{template "base/disable_form_autofill"}}
-						{{.CsrfTokenHtml}}
-						<div class="required field {{if .Err_Password}}error{{end}}">
-							<label for="password-confirmation">{{.locale.Tr "password"}}</label>
-							<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
-						</div>
-						<div class="field">
-							<button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
-								{{.locale.Tr "settings.confirm_delete_account"}}
-							</button>
-							<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
-						</div>
-					</form>
+				{{end}}
+			</div>
+		</div>
+		<div class="ui attached bottom segment">
+			<form class="ui form" action="{{AppSubUrl}}/user/settings/account/email" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="required field {{if .Err_Email}}error{{end}}">
+					<label for="email">{{.locale.Tr "settings.add_new_email"}}</label>
+					<input id="email" name="email" type="email" required {{if not .CanAddEmails}}disabled{{end}}>
 				</div>
+				<button class="ui green button" {{if not .CanAddEmails}}disabled{{end}}>
+					{{.locale.Tr "settings.add_email"}}
+				</button>
+			</form>
+		</div>
+
+		<h4 class="ui top attached error header">
+			{{.locale.Tr "settings.delete_account"}}
+		</h4>
+		<div class="ui attached error segment">
+			<div class="ui red message">
+				<p class="text left">{{svg "octicon-alert"}} {{.locale.Tr "settings.delete_prompt" | Str2html}}</p>
+				{{if .UserDeleteWithComments}}
+				<p class="text left" style="font-weight: bold;">{{.locale.Tr "settings.delete_with_all_comments" .UserDeleteWithCommentsMaxTime | Str2html}}</p>
+				{{end}}
 			</div>
+			<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<div class="required field {{if .Err_Password}}error{{end}}">
+					<label for="password-confirmation">{{.locale.Tr "password"}}</label>
+					<input id="password-confirmation" name="password" type="password" autocomplete="off" required>
+				</div>
+				<div class="field">
+					<button class="ui red button delete-button" data-modal-id="delete-account" data-type="form" data-form="#delete-form">
+						{{.locale.Tr "settings.confirm_delete_account"}}
+					</button>
+					<a href="{{AppSubUrl}}/user/forgot_password?email={{.Email}}">{{.locale.Tr "auth.forgot_password"}}</a>
+				</div>
+			</form>
 		</div>
 	</div>
-</div>
+{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-email">
 	<div class="ui icon header">
@@ -186,5 +180,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-
-{{template "base/footer" .}}
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index d4a3a59e4b3b..145654b19593 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -1,179 +1,171 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
 
-				<!-- Theme -->
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.manage_themes"}}
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui email list">
-						<div class="item">
-							{{.locale.Tr "settings.theme_desc"}}
-						</div>
+		<!-- Theme -->
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.manage_themes"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui email list">
+				<div class="item">
+					{{.locale.Tr "settings.theme_desc"}}
+				</div>
 
-					<form class="ui form" action="{{.Link}}/theme" method="post">
-						{{.CsrfTokenHtml}}
-							<div class="field">
-								<label for="ui">{{.locale.Tr "settings.ui"}}</label>
-								<div class="ui selection dropdown" id="ui">
-									<input name="theme" type="hidden" value="{{.SignedUser.Theme}}">
-									{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-									<div class="text">
-										{{range $i,$a := .AllThemes}}
-											{{if eq $.SignedUser.Theme $a}}{{$a}}{{end}}
-										{{end}}
-									</div>
+			<form class="ui form" action="{{.Link}}/theme" method="post">
+				{{.CsrfTokenHtml}}
+					<div class="field">
+						<label for="ui">{{.locale.Tr "settings.ui"}}</label>
+						<div class="ui selection dropdown" id="ui">
+							<input name="theme" type="hidden" value="{{.SignedUser.Theme}}">
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="text">
+								{{range $i,$a := .AllThemes}}
+									{{if eq $.SignedUser.Theme $a}}{{$a}}{{end}}
+								{{end}}
+							</div>
 
-									<div class="menu">
-									{{range $i,$a := .AllThemes}}
-										<div class="item{{if eq $.SignedUser.Theme $a}} active selected{{end}}" data-value="{{$a}}">
-											{{$a}}
-										</div>
-									{{end}}
-									</div>
+							<div class="menu">
+							{{range $i,$a := .AllThemes}}
+								<div class="item{{if eq $.SignedUser.Theme $a}} active selected{{end}}" data-value="{{$a}}">
+									{{$a}}
 								</div>
+							{{end}}
 							</div>
-
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_theme"}}</button>
 						</div>
-					</form>
 					</div>
+
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_theme"}}</button>
 				</div>
+			</form>
+			</div>
+		</div>
 
-				<!-- Language -->
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.language"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}/language" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="field">
-							<div class="ui language selection dropdown" id="language">
-								<input name="language" type="hidden" value="{{.SignedUser.Language}}">
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="text">{{range .AllLangs}}{{if eq $.SignedUser.Language .Lang}}{{.Name}}{{end}}{{end}}</div>
-								<div class="menu">
-								{{range .AllLangs}}
-									<div class="item{{if eq $.SignedUser.Language .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
-								{{end}}
-								</div>
-							</div>
-						</div>
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_language"}}</button>
+		<!-- Language -->
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.language"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}/language" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="field">
+					<div class="ui language selection dropdown" id="language">
+						<input name="language" type="hidden" value="{{.SignedUser.Language}}">
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="text">{{range .AllLangs}}{{if eq $.SignedUser.Language .Lang}}{{.Name}}{{end}}{{end}}</div>
+						<div class="menu">
+						{{range .AllLangs}}
+							<div class="item{{if eq $.SignedUser.Language .Lang}} active selected{{end}}" data-value="{{.Lang}}">{{.Name}}</div>
+						{{end}}
 						</div>
-					</form>
+					</div>
 				</div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_language"}}</button>
+				</div>
+			</form>
+		</div>
 
-				<!-- Shown comment event types -->
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.hidden_comment_types"}}
-				</h4>
-				<div class="ui attached segment">
-					<p class="help">
-						{{.locale.Tr "settings.hidden_comment_types_description"}}
-					</p>
-					<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="inline field">
-							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
-								<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
-							</div>
-						</div>
+		<!-- Shown comment event types -->
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.hidden_comment_types"}}
+		</h4>
+		<div class="ui attached segment">
+			<p class="help">
+				{{.locale.Tr "settings.hidden_comment_types_description"}}
+			</p>
+			<form class="ui form" action="{{.Link}}/hidden_comments" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="inline field">
+					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.ref_tooltip"}}">
+						<input name="reference" type="checkbox" {{if(call .IsCommentTypeGroupChecked "reference")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_reference"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="label" type="checkbox" {{if (call .IsCommentTypeGroupChecked "label")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_label"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="milestone" type="checkbox" {{if (call .IsCommentTypeGroupChecked "milestone")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_milestone"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="assignee" type="checkbox" {{if (call .IsCommentTypeGroupChecked "assignee")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_assignee"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="title" type="checkbox" {{if (call .IsCommentTypeGroupChecked "title")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_title"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="branch" type="checkbox" {{if (call .IsCommentTypeGroupChecked "branch")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_branch"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="time_tracking" type="checkbox" {{if (call .IsCommentTypeGroupChecked "time_tracking")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_time_tracking"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="deadline" type="checkbox" {{if (call .IsCommentTypeGroupChecked "deadline")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_deadline"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="dependency" type="checkbox" {{if (call .IsCommentTypeGroupChecked "dependency")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_dependency"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="lock" type="checkbox" {{if (call .IsCommentTypeGroupChecked "lock")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_lock"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="review_request" type="checkbox" {{if (call .IsCommentTypeGroupChecked "review_request")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_review_request"}}</label>
+					</div>
+				</div>
 
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox">
-								<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
-							</div>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
-								<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
-								<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
-							</div>
-						</div>
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "save"}}</button>
-						</div>
-					</form>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="pull_request_push" type="checkbox" {{if (call .IsCommentTypeGroupChecked "pull_request_push")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_pull_request_push"}}</label>
+					</div>
 				</div>
-			</div>
+				<div class="inline field">
+					<div class="ui checkbox">
+						<input name="project" type="checkbox" {{if (call .IsCommentTypeGroupChecked "project")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_project"}}</label>
+					</div>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox" data-tooltip-content="{{.locale.Tr "settings.hidden_comment_types.issue_ref_tooltip"}}">
+						<input name="issue_ref" type="checkbox" {{if (call .IsCommentTypeGroupChecked "issue_ref")}}checked{{end}}>
+						<label>{{.locale.Tr "settings.comment_type_group_issue_ref"}}</label>
+					</div>
+				</div>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "save"}}</button>
+				</div>
+			</form>
 		</div>
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 51a2f43dc00f..9c8e55353642 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,276 +1,270 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.manage_access_token"}}
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui key list">
-						<div class="item">
-							{{.locale.Tr "settings.tokens_desc"}}
-						</div>
-						{{range .Tokens}}
-							<div class="item">
-								<div class="right floated content">
-										<button class="ui red tiny button delete-button" data-modal-id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
-											{{svg "octicon-trash" 16 "gt-mr-2"}}
-											{{$.locale.Tr "settings.delete_token"}}
-										</button>
-								</div>
-								<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.token_state_desc"}}"{{end}}>{{svg "fontawesome-send" 36}}</i>
-								<div class="content">
-									<details><summary><strong>{{.Name}}</strong></summary>
-										<p class="gt-my-2">{{$.locale.Tr "settings.scopes_list"}}</p>
-										<ul class="gt-my-2">
-										{{range .Scope.StringSlice}}
-											<li>{{.}}</li>
-										{{end}}
-										</ul>
-									</details>
-									<div class="activity meta">
-										<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
-									</div>
-								</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.manage_access_token"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui key list">
+				<div class="item">
+					{{.locale.Tr "settings.tokens_desc"}}
+				</div>
+				{{range .Tokens}}
+					<div class="item">
+						<div class="right floated content">
+								<button class="ui red tiny button delete-button" data-modal-id="delete-token" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+									{{svg "octicon-trash" 16 "gt-mr-2"}}
+									{{$.locale.Tr "settings.delete_token"}}
+								</button>
+						</div>
+						<i class="text {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-tooltip-content="{{$.locale.Tr "settings.token_state_desc"}}"{{end}}>{{svg "fontawesome-send" 36}}</i>
+						<div class="content">
+							<details><summary><strong>{{.Name}}</strong></summary>
+								<p class="gt-my-2">{{$.locale.Tr "settings.scopes_list"}}</p>
+								<ul class="gt-my-2">
+								{{range .Scope.StringSlice}}
+									<li>{{.}}</li>
+								{{end}}
+								</ul>
+							</details>
+							<div class="activity meta">
+								<i>{{$.locale.Tr "settings.add_on"}} <span>{{template "shared/datetime/short" (dict "Datetime" .CreatedUnix.FormatLong "Fallback" .CreatedUnix.FormatShort)}}</span> — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{template "shared/datetime/short" (dict "Datetime" .UpdatedUnix.FormatLong "Fallback" .UpdatedUnix.FormatShort)}}</span>{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}</i>
 							</div>
-						{{end}}
+						</div>
 					</div>
+				{{end}}
+			</div>
+		</div>
+		<div class="ui attached bottom segment">
+			<h5 class="ui top header">
+				{{.locale.Tr "settings.generate_new_token"}}
+			</h5>
+			<p>{{.locale.Tr "settings.new_token_desc"}}</p>
+			<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="field {{if .Err_Name}}error{{end}}">
+					<label for="name">{{.locale.Tr "settings.token_name"}}</label>
+					<input id="name" name="name" value="{{.name}}" autofocus required>
 				</div>
-				<div class="ui attached bottom segment">
-					<h5 class="ui top header">
-						{{.locale.Tr "settings.generate_new_token"}}
-					</h5>
-					<p>{{.locale.Tr "settings.new_token_desc"}}</p>
-					<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="field {{if .Err_Name}}error{{end}}">
-							<label for="name">{{.locale.Tr "settings.token_name"}}</label>
-							<input id="name" name="name" value="{{.name}}" autofocus required>
-						</div>
-						<details class="ui optional field">
-							<summary class="gt-p-2">
-								{{.locale.Tr "settings.select_scopes"}}
-							</summary>
-							<div class="field gt-pl-2">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="repo">
-									<label>repo</label>
-								</div>
-							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="repo:status">
-										<label>repo:status</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="public_repo">
-										<label>public_repo</label>
-									</div>
-								</div>
-							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:org">
-									<label>admin:org</label>
-								</div>
-							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:org">
-										<label>write:org</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:org">
-										<label>read:org</label>
-									</div>
-								</div>
+				<details class="ui optional field">
+					<summary class="gt-p-2">
+						{{.locale.Tr "settings.select_scopes"}}
+					</summary>
+					<div class="field gt-pl-2">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="repo">
+							<label>repo</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="repo:status">
+								<label>repo:status</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:public_key">
-									<label>admin:public_key</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="public_repo">
+								<label>public_repo</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:public_key">
-										<label>write:public_key</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:public_key">
-										<label>read:public_key</label>
-									</div>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:org">
+							<label>admin:org</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:org">
+								<label>write:org</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:repo_hook">
-									<label>admin:repo_hook</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:org">
+								<label>read:org</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:repo_hook">
-										<label>write:repo_hook</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:repo_hook">
-										<label>read:repo_hook</label>
-									</div>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:public_key">
+							<label>admin:public_key</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:public_key">
+								<label>write:public_key</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:org_hook">
-									<label>admin:org_hook</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:public_key">
+								<label>read:public_key</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:user_hook">
-									<label>admin:user_hook</label>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:repo_hook">
+							<label>admin:repo_hook</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:repo_hook">
+								<label>write:repo_hook</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="notification">
-									<label>notification</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:repo_hook">
+								<label>read:repo_hook</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="user">
-									<label>user</label>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:org_hook">
+							<label>admin:org_hook</label>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:user_hook">
+							<label>admin:user_hook</label>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="notification">
+							<label>notification</label>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="user">
+							<label>user</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:user">
+								<label>read:user</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:user">
-										<label>read:user</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="user:email">
-										<label>user:email</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="user:follow">
-										<label>user:follow</label>
-									</div>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="user:email">
+								<label>user:email</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="delete_repo">
-									<label>delete_repo</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="user:follow">
+								<label>user:follow</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="package">
-									<label>package</label>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="delete_repo">
+							<label>delete_repo</label>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="package">
+							<label>package</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:package">
+								<label>write:package</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:package">
-										<label>write:package</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:package">
-										<label>read:package</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="delete:package">
-										<label>delete:package</label>
-									</div>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:package">
+								<label>read:package</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:gpg_key">
-									<label>admin:gpg_key</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="delete:package">
+								<label>delete:package</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:gpg_key">
-										<label>write:gpg_key</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:gpg_key">
-										<label>read:gpg_key</label>
-									</div>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:gpg_key">
+							<label>admin:gpg_key</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:gpg_key">
+								<label>write:gpg_key</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="admin:application">
-									<label>admin:application</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:gpg_key">
+								<label>read:gpg_key</label>
 							</div>
-							<div class="field gt-pl-4">
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="write:application">
-										<label>write:application</label>
-									</div>
-								</div>
-								<div class="field">
-									<div class="ui checkbox">
-										<input class="enable-system" type="checkbox" name="scope" value="read:application">
-										<label>read:application</label>
-									</div>
-								</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="admin:application">
+							<label>admin:application</label>
+						</div>
+					</div>
+					<div class="field gt-pl-4">
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="write:application">
+								<label>write:application</label>
 							</div>
-							<div class="field">
-								<div class="ui checkbox">
-									<input class="enable-system" type="checkbox" name="scope" value="sudo">
-									<label>sudo</label>
-								</div>
+						</div>
+						<div class="field">
+							<div class="ui checkbox">
+								<input class="enable-system" type="checkbox" name="scope" value="read:application">
+								<label>read:application</label>
 							</div>
-						</details>
-						<button class="ui green button">
-							{{.locale.Tr "settings.generate_token"}}
-						</button>
-					</form>
-				</div>
-
-				{{if .EnableOAuth2}}
-					{{template "user/settings/grants_oauth2" .}}
-					{{template "user/settings/applications_oauth2" .}}
-				{{end}}
-			</div>
+						</div>
+					</div>
+					<div class="field">
+						<div class="ui checkbox">
+							<input class="enable-system" type="checkbox" name="scope" value="sudo">
+							<label>sudo</label>
+						</div>
+					</div>
+				</details>
+				<button class="ui green button">
+					{{.locale.Tr "settings.generate_token"}}
+				</button>
+			</form>
 		</div>
+
+		{{if .EnableOAuth2}}
+			{{template "user/settings/grants_oauth2" .}}
+			{{template "user/settings/applications_oauth2" .}}
+		{{end}}
 	</div>
-</div>
+{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-token">
 	<div class="ui icon header">
@@ -294,4 +288,3 @@
 </div>
 
 
-{{template "base/footer" .}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index eb55def38800..6d8c1ecee9e3 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "user/settings/applications_oauth2_edit_form" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index 24a0ac58571b..e7f65cec01fb 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,57 +1,50 @@
-{{template "base/head" .}}
-<div class="page-content user  settings new webhook">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				<div class="twelve wide column content">
-					{{template "base/alert" .}}
-					<h4 class="ui top attached header">
-						{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
-						<div class="ui right">
-							{{if eq .HookType "gitea"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
-							{{else if eq .HookType "gogs"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
-							{{else if eq .HookType "slack"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
-							{{else if eq .HookType "discord"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
-							{{else if eq .HookType "dingtalk"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
-							{{else if eq .HookType "telegram"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
-							{{else if eq .HookType "msteams"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
-							{{else if eq .HookType "feishu"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
-							{{else if eq .HookType "matrix"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
-							{{else if eq .HookType "wechatwork"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
-							{{else if eq .HookType "packagist"}}
-								<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
-							{{end}}
-						</div>
-					</h4>
-					<div class="ui attached segment">
-						{{template "repo/settings/webhook/gitea" .}}
-						{{template "repo/settings/webhook/gogs" .}}
-						{{template "repo/settings/webhook/slack" .}}
-						{{template "repo/settings/webhook/discord" .}}
-						{{template "repo/settings/webhook/dingtalk" .}}
-						{{template "repo/settings/webhook/telegram" .}}
-						{{template "repo/settings/webhook/msteams" .}}
-						{{template "repo/settings/webhook/feishu" .}}
-						{{template "repo/settings/webhook/matrix" .}}
-						{{template "repo/settings/webhook/wechatwork" .}}
-						{{template "repo/settings/webhook/packagist" .}}
-					</div>
-
-					{{template "repo/settings/webhook/history" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
+	<div class="user-main-content twelve wide column content">
+		<div class="user-main-content twelve wide column content">
+			{{template "base/alert" .}}
+			<h4 class="ui top attached header">
+				{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
+				<div class="ui right">
+					{{if eq .HookType "gitea"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg">
+					{{else if eq .HookType "gogs"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico">
+					{{else if eq .HookType "slack"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png">
+					{{else if eq .HookType "discord"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png">
+					{{else if eq .HookType "dingtalk"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico">
+					{{else if eq .HookType "telegram"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png">
+					{{else if eq .HookType "msteams"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+					{{else if eq .HookType "feishu"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png">
+					{{else if eq .HookType "matrix"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg">
+					{{else if eq .HookType "wechatwork"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/wechatwork.png">
+					{{else if eq .HookType "packagist"}}
+						<img width="26" height="26" src="{{AssetUrlPrefix}}/img/packagist.png">
+					{{end}}
 				</div>
+			</h4>
+			<div class="ui attached segment">
+				{{template "repo/settings/webhook/gitea" .}}
+				{{template "repo/settings/webhook/gogs" .}}
+				{{template "repo/settings/webhook/slack" .}}
+				{{template "repo/settings/webhook/discord" .}}
+				{{template "repo/settings/webhook/dingtalk" .}}
+				{{template "repo/settings/webhook/telegram" .}}
+				{{template "repo/settings/webhook/msteams" .}}
+				{{template "repo/settings/webhook/feishu" .}}
+				{{template "repo/settings/webhook/matrix" .}}
+				{{template "repo/settings/webhook/wechatwork" .}}
+				{{template "repo/settings/webhook/packagist" .}}
 			</div>
+
+			{{template "repo/settings/webhook/history" .}}
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/hooks.tmpl b/templates/user/settings/hooks.tmpl
index 59ef98b7cad1..ada696b75fa5 100644
--- a/templates/user/settings/hooks.tmpl
+++ b/templates/user/settings/hooks.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div class="page-content user settings webhooks">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "repo/settings/webhook/list" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings webhooks")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "repo/settings/webhook/list" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 7c7069b5638b..07101147b11d 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,16 +1,8 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "user/settings/keys_ssh" .}}
-				{{template "user/settings/keys_principal" .}}
-				{{template "user/settings/keys_gpg" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "user/settings/keys_ssh" .}}
+		{{template "user/settings/keys_principal" .}}
+		{{template "user/settings/keys_gpg" .}}
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/layout_footer.tmpl b/templates/user/settings/layout_footer.tmpl
new file mode 100644
index 000000000000..93fd2038b7b9
--- /dev/null
+++ b/templates/user/settings/layout_footer.tmpl
@@ -0,0 +1,8 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="user-layout-right">
+		{{/* block: user-main-content */}}
+{{end}}
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl
new file mode 100644
index 000000000000..c082af6f08e7
--- /dev/null
+++ b/templates/user/settings/layout_head.tmpl
@@ -0,0 +1,9 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	<div class="ui container stackable grid">
+        {{template "user/settings/navbar" .ctxData}}
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		{{/* block: admin-main-content */}}
+	</div>
+</div>
+{{end}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 2aec93c8d112..5a15bda25bc3 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,49 +1,44 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings organization">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.orgs"}}
-					{{if .SignedUser.CanCreateOrganization}}
-					<div class="ui right">
-						<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
-					</div>
-					{{end}}
-				</h4>
-				<div class="ui attached segment orgs">
-					{{if .Orgs}}
-						<div class="ui middle aligned divided list">
-							{{range .Orgs}}
-							<div class="item">
-								<div class="right floated content">
-									<form>
-										{{$.CsrfTokenHtml}}
-										<button class="ui red button delete-button" data-modal-id="leave-organization"
-														data-url="{{.OrganisationLink}}/members/action/leave" data-datauid="{{$.SignedUser.ID}}"
-														data-name="{{$.SignedUser.DisplayName}}"
-														data-data-organization-name="{{.DisplayName}}">{{$.locale.Tr "org.members.leave"}}
-										</button>
-									</form>
-								</div>
-								{{avatar $.Context . 28 "mini"}}
-								<div class="content">
-										<a href="{{.HomeLink}}">{{.Name}}</a>
-								</div>
-							</div>
-							{{end}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings organization")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.orgs"}}
+			{{if .SignedUser.CanCreateOrganization}}
+			<div class="ui right">
+				<a class="ui primary tiny button" href="{{AppSubUrl}}/org/create">{{.locale.Tr "admin.orgs.new_orga"}}</a>
+			</div>
+			{{end}}
+		</h4>
+		<div class="ui attached segment orgs">
+			{{if .Orgs}}
+				<div class="ui middle aligned divided list">
+					{{range .Orgs}}
+					<div class="item">
+						<div class="right floated content">
+							<form>
+								{{$.CsrfTokenHtml}}
+								<button class="ui red button delete-button" data-modal-id="leave-organization"
+												data-url="{{.OrganisationLink}}/members/action/leave" data-datauid="{{$.SignedUser.ID}}"
+												data-name="{{$.SignedUser.DisplayName}}"
+												data-data-organization-name="{{.DisplayName}}">{{$.locale.Tr "org.members.leave"}}
+								</button>
+							</form>
+						</div>
+						{{avatar $.Context . 28 "mini"}}
+						<div class="content">
+								<a href="{{.HomeLink}}">{{.Name}}</a>
 						</div>
-						{{template "base/paginate" .}}
-					{{else}}
-						{{.locale.Tr "settings.orgs_none"}}
+					</div>
 					{{end}}
 				</div>
-			</div>
+				{{template "base/paginate" .}}
+			{{else}}
+				{{.locale.Tr "settings.orgs_none"}}
+			{{end}}
 		</div>
 	</div>
-</div>
+{{template "user/settings/layout_footer" .}}
+
 <div class="ui small basic delete modal" id="leave-organization">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -54,4 +49,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-{{template "base/footer" .}}
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index 9d4765094f75..5bd5eb582dde 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -1,32 +1,26 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "package/shared/cleanup_rules/list" .}}
-				{{template "package/shared/cargo" .}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "package/shared/cleanup_rules/list" .}}
+		{{template "package/shared/cargo" .}}
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "packages.owner.settings.chef.title"}}
-				</h4>
-				<div class="ui attached segment">
-					<div class="ui form">
-						<div class="field">
-							<label>{{$.locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
-						</div>
-						<form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post">
-							{{.CsrfTokenHtml}}
-							<button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button>
-						</form>
-						<div class="field">
-							<label>{{.locale.Tr "packages.chef.documentation" | Safe}}</label>
-						</div>
-					</div>
+		<h4 class="ui top attached header">
+			{{.locale.Tr "packages.owner.settings.chef.title"}}
+		</h4>
+		<div class="ui attached segment">
+			<div class="ui form">
+				<div class="field">
+					<label>{{$.locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
+				</div>
+				<form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post">
+					{{.CsrfTokenHtml}}
+					<button class="ui green button">{{$.locale.Tr "packages.owner.settings.chef.keypair"}}</button>
+				</form>
+				<div class="field">
+					<label>{{.locale.Tr "packages.chef.documentation" | Safe}}</label>
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_edit.tmpl b/templates/user/settings/packages_cleanup_rules_edit.tmpl
index 467f30693d68..1c6b3feab754 100644
--- a/templates/user/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_edit.tmpl
@@ -1,13 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "package/shared/cleanup_rules/edit" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "package/shared/cleanup_rules/edit" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_preview.tmpl b/templates/user/settings/packages_cleanup_rules_preview.tmpl
index 1ce66279ae8f..cc4312ca14c5 100644
--- a/templates/user/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_preview.tmpl
@@ -1,12 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings packages admin">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "package/shared/cleanup_rules/preview" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user packages admin")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "package/shared/cleanup_rules/preview" .}}
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 3442a48fede4..704e541d8ed3 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,141 +1,134 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings profile">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.public_profile"}}
-				</h4>
-				<div class="ui attached segment">
-					<p>{{.locale.Tr "settings.profile_desc"}}</p>
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="required field {{if .Err_Name}}error{{end}}">
-							<label for="username">{{.locale.Tr "username"}}
-								<span class="text red gt-hidden" id="name-change-prompt"> {{.locale.Tr "settings.change_username_prompt"}}</span>
-								<span class="text red gt-hidden" id="name-change-redirect-prompt"> {{.locale.Tr "settings.change_username_redirect_prompt"}}</span>
-							</label>
-							<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if or (not .SignedUser.IsLocal) .IsReverseProxy}}disabled{{end}}>
-							{{if or (not .SignedUser.IsLocal) .IsReverseProxy}}
-							<p class="help text blue">{{$.locale.Tr "settings.password_username_disabled"}}</p>
-							{{end}}
-						</div>
-						<div class="field {{if .Err_FullName}}error{{end}}">
-							<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
-							<input id="full_name" name="full_name" value="{{.SignedUser.FullName}}">
-						</div>
-						<div class="field {{if .Err_Email}}error{{end}}">
-							<label for="email">{{.locale.Tr "email"}}</label>
-							<p>{{.SignedUser.Email}}</p>
-						</div>
-						<div class="inline field">
-							<div class="ui checkbox" id="keep-email-private">
-								<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.Tr "settings.keep_email_private"}}</strong></label>
-								<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
-							</div>
-						</div>
-						<div class="field {{if .Err_Description}}error{{end}}">
-							<label for="description">{{$.locale.Tr "user.user_bio"}}</label>
-							<textarea id="description" name="description" rows="2" placeholder="{{.locale.Tr "settings.biography_placeholder"}}">{{.SignedUser.Description}}</textarea>
-						</div>
-						<div class="field {{if .Err_Website}}error{{end}}">
-							<label for="website">{{.locale.Tr "settings.website"}}</label>
-							<input id="website" name="website" type="url" value="{{.SignedUser.Website}}">
-						</div>
-						<div class="field">
-							<label for="location">{{.locale.Tr "settings.location"}}</label>
-							<input id="location" name="location"  value="{{.SignedUser.Location}}">
-						</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings profile")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.public_profile"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "settings.profile_desc"}}</p>
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="required field {{if .Err_Name}}error{{end}}">
+					<label for="username">{{.locale.Tr "username"}}
+						<span class="text red gt-hidden" id="name-change-prompt"> {{.locale.Tr "settings.change_username_prompt"}}</span>
+						<span class="text red gt-hidden" id="name-change-redirect-prompt"> {{.locale.Tr "settings.change_username_redirect_prompt"}}</span>
+					</label>
+					<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if or (not .SignedUser.IsLocal) .IsReverseProxy}}disabled{{end}}>
+					{{if or (not .SignedUser.IsLocal) .IsReverseProxy}}
+					<p class="help text blue">{{$.locale.Tr "settings.password_username_disabled"}}</p>
+					{{end}}
+				</div>
+				<div class="field {{if .Err_FullName}}error{{end}}">
+					<label for="full_name">{{.locale.Tr "settings.full_name"}}</label>
+					<input id="full_name" name="full_name" value="{{.SignedUser.FullName}}">
+				</div>
+				<div class="field {{if .Err_Email}}error{{end}}">
+					<label for="email">{{.locale.Tr "email"}}</label>
+					<p>{{.SignedUser.Email}}</p>
+				</div>
+				<div class="inline field">
+					<div class="ui checkbox" id="keep-email-private">
+						<label data-tooltip-content="{{.locale.Tr "settings.keep_email_private_popup"}}"><strong>{{.locale.Tr "settings.keep_email_private"}}</strong></label>
+						<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
+					</div>
+				</div>
+				<div class="field {{if .Err_Description}}error{{end}}">
+					<label for="description">{{$.locale.Tr "user.user_bio"}}</label>
+					<textarea id="description" name="description" rows="2" placeholder="{{.locale.Tr "settings.biography_placeholder"}}">{{.SignedUser.Description}}</textarea>
+				</div>
+				<div class="field {{if .Err_Website}}error{{end}}">
+					<label for="website">{{.locale.Tr "settings.website"}}</label>
+					<input id="website" name="website" type="url" value="{{.SignedUser.Website}}">
+				</div>
+				<div class="field">
+					<label for="location">{{.locale.Tr "settings.location"}}</label>
+					<input id="location" name="location"  value="{{.SignedUser.Location}}">
+				</div>
 
-						<div class="ui divider"></div>
-						<!-- private block -->
+				<div class="ui divider"></div>
+				<!-- private block -->
 
-						<div class="field">
-							<label for="security-private"><strong>{{.locale.Tr "settings.privacy"}}</strong></label>
-						</div>
+				<div class="field">
+					<label for="security-private"><strong>{{.locale.Tr "settings.privacy"}}</strong></label>
+				</div>
 
-						<div class="inline field {{if .Err_Visibility}}error{{end}}">
-							<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
-							<div class="ui selection type dropdown">
-								{{if .SignedUser.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
-								{{if .SignedUser.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
-								{{if .SignedUser.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
-								<div class="text">
-									{{if .SignedUser.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
-									{{if .SignedUser.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
-									{{if .SignedUser.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
-								</div>
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									{{range $mode := .AllowedUserVisibilityModes}}
-										{{if $mode.IsPublic}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
-										{{else if $mode.IsLimited}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
-										{{else if $mode.IsPrivate}}
-											<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
-										{{end}}
-									{{end}}
-								</div>
-							</div>
+				<div class="inline field {{if .Err_Visibility}}error{{end}}">
+					<span class="inline required field"><label for="visibility">{{.locale.Tr "settings.visibility"}}</label></span>
+					<div class="ui selection type dropdown">
+						{{if .SignedUser.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
+						{{if .SignedUser.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
+						{{if .SignedUser.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
+						<div class="text">
+							{{if .SignedUser.Visibility.IsPublic}}{{.locale.Tr "settings.visibility.public"}}{{end}}
+							{{if .SignedUser.Visibility.IsLimited}}{{.locale.Tr "settings.visibility.limited"}}{{end}}
+							{{if .SignedUser.Visibility.IsPrivate}}{{.locale.Tr "settings.visibility.private"}}{{end}}
+						</div>
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							{{range $mode := .AllowedUserVisibilityModes}}
+								{{if $mode.IsPublic}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.locale.Tr "settings.visibility.public"}}</div>
+								{{else if $mode.IsLimited}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.locale.Tr "settings.visibility.limited"}}</div>
+								{{else if $mode.IsPrivate}}
+									<div class="item" data-tooltip-content="{{$.locale.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.locale.Tr "settings.visibility.private"}}</div>
+								{{end}}
+							{{end}}
 						</div>
+					</div>
+				</div>
 
-						<div class="field">
-							<div class="ui checkbox" id="keep-activity-private">
-								<label data-tooltip-content="{{.locale.Tr "settings.keep_activity_private_popup"}}"><strong>{{.locale.Tr "settings.keep_activity_private"}}</strong></label>
-								<input name="keep_activity_private" type="checkbox" {{if .SignedUser.KeepActivityPrivate}}checked{{end}}>
-							</div>
-						</div>
+				<div class="field">
+					<div class="ui checkbox" id="keep-activity-private">
+						<label data-tooltip-content="{{.locale.Tr "settings.keep_activity_private_popup"}}"><strong>{{.locale.Tr "settings.keep_activity_private"}}</strong></label>
+						<input name="keep_activity_private" type="checkbox" {{if .SignedUser.KeepActivityPrivate}}checked{{end}}>
+					</div>
+				</div>
 
-						<div class="ui divider"></div>
+				<div class="ui divider"></div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_profile"}}</button>
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_profile"}}</button>
 				</div>
+			</form>
+		</div>
 
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.avatar"}}
-				</h4>
-				<div class="ui attached segment">
-					<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
-						{{.CsrfTokenHtml}}
-						{{if not (DisableGravatar $.Context)}}
-						<div class="inline field">
-							<div class="ui radio checkbox">
-								<input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}>
-								<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
-							</div>
-						</div>
-						<div class="field {{if .Err_Gravatar}}error{{end}}">
-							<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
-							<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}">
-						</div>
-						{{end}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.avatar"}}
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+				{{.CsrfTokenHtml}}
+				{{if not (DisableGravatar $.Context)}}
+				<div class="inline field">
+					<div class="ui radio checkbox">
+						<input name="source" value="lookup" type="radio" {{if not .SignedUser.UseCustomAvatar}}checked{{end}}>
+						<label>{{.locale.Tr "settings.lookup_avatar_by_mail"}}</label>
+					</div>
+				</div>
+				<div class="field {{if .Err_Gravatar}}error{{end}}">
+					<label for="gravatar">Avatar {{.locale.Tr "email"}}</label>
+					<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}">
+				</div>
+				{{end}}
 
-						<div class="inline field">
-							<div class="ui radio checkbox">
-								<input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}>
-								<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
-							</div>
-						</div>
+				<div class="inline field">
+					<div class="ui radio checkbox">
+						<input name="source" value="local" type="radio" {{if .SignedUser.UseCustomAvatar}}checked{{end}}>
+						<label>{{.locale.Tr "settings.enable_custom_avatar"}}</label>
+					</div>
+				</div>
 
-						<div class="inline field">
-							<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-							<input name="avatar" type="file" >
-						</div>
+				<div class="inline field">
+					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
+					<input name="avatar" type="file" >
+				</div>
 
-						<div class="field">
-							<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
-							<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
-						</div>
-					</form>
+				<div class="field">
+					<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
+					<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</a>
 				</div>
-			</div>
+			</form>
 		</div>
 	</div>
-</div>
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index b1fea3d18d3e..19285b5cbbf0 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,139 +1,133 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.repos"}}
-				</h4>
-				<div class="ui attached segment">
-					{{if or .allowAdopt .allowDelete}}
-						{{if .Dirs}}
-							<div class="ui middle aligned divided list">
-								{{range $dirI, $dir := .Dirs}}
-									{{$repo := index $.ReposMap $dir}}
-									<div class="item">
-										<div class="content">
-											{{if $repo}}
-												{{if $repo.IsPrivate}}
-													<span class="text gold icon">{{svg "octicon-lock"}}</span>
-												{{else if $repo.IsFork}}
-													<span class="icon">{{svg "octicon-repo-forked"}}</span>
-												{{else if $repo.IsMirror}}
-													<span class="icon">{{svg "octicon-mirror"}}</span>
-												{{else if $repo.IsTemplate}}
-													<span class="icon">{{svg "octicon-repo-template"}}</span>
-												{{else}}
-													<span class="icon">{{svg "octicon-repo"}}</span>
-												{{end}}
-												<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
-												<span>{{FileSize $repo.Size}}</span>
-												{{if $repo.IsFork}}
-													{{$.locale.Tr "repo.forked_from"}}
-													<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
-												{{end}}
-											{{else}}
-												<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
-												<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
-												<div class="right floated content">
-													{{if $.allowAdopt}}
-														<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-														<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings repos")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.repos"}}
+		</h4>
+		<div class="ui attached segment">
+			{{if or .allowAdopt .allowDelete}}
+				{{if .Dirs}}
+					<div class="ui middle aligned divided list">
+						{{range $dirI, $dir := .Dirs}}
+							{{$repo := index $.ReposMap $dir}}
+							<div class="item">
+								<div class="content">
+									{{if $repo}}
+										{{if $repo.IsPrivate}}
+											<span class="text gold icon">{{svg "octicon-lock"}}</span>
+										{{else if $repo.IsFork}}
+											<span class="icon">{{svg "octicon-repo-forked"}}</span>
+										{{else if $repo.IsMirror}}
+											<span class="icon">{{svg "octicon-mirror"}}</span>
+										{{else if $repo.IsTemplate}}
+											<span class="icon">{{svg "octicon-repo-template"}}</span>
+										{{else}}
+											<span class="icon">{{svg "octicon-repo"}}</span>
+										{{end}}
+										<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
+										<span>{{FileSize $repo.Size}}</span>
+										{{if $repo.IsFork}}
+											{{$.locale.Tr "repo.forked_from"}}
+											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
+										{{end}}
+									{{else}}
+										<span class="icon">{{svg "octicon-file-directory-fill"}}</span>
+										<span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
+										<div class="right floated content">
+											{{if $.allowAdopt}}
+												<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
+												<div class="ui basic modal" id="adopt-unadopted-modal-{{$dirI}}">
+													{{svg "octicon-x" 16 "close inside"}}
+													<div class="header">
+														<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
+													</div>
+													<div class="content">
+														<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
+													</div>
+													<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
+														{{$.CsrfTokenHtml}}
+														<input type="hidden" name="id" value="{{$dir}}">
+														<input type="hidden" name="action" value="adopt">
+														<div class="actions">
+															<button class="ui red basic inverted cancel button">
+																{{svg "octicon-x"}}
+																{{$.locale.Tr "modal.no"}}
+															</button>
+															<button class="ui green basic inverted ok button">
+																{{svg "octicon-check"}}
+																{{$.locale.Tr "modal.yes"}}
+															</button>
+														</div>
+													{{end}}
+													{{if $.allowDelete}}
+														<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+														<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
 															{{svg "octicon-x" 16 "close inside"}}
 															<div class="header">
-																<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
+																<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
 															</div>
 															<div class="content">
-																<p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p>
+																<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
 															</div>
 															<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
 																{{$.CsrfTokenHtml}}
 																<input type="hidden" name="id" value="{{$dir}}">
-																<input type="hidden" name="action" value="adopt">
-																<div class="actions">
-																	<button class="ui red basic inverted cancel button">
-																		{{svg "octicon-x"}}
-																		{{$.locale.Tr "modal.no"}}
-																	</button>
-																	<button class="ui green basic inverted ok button">
-																		{{svg "octicon-check"}}
-																		{{$.locale.Tr "modal.yes"}}
-																	</button>
-																</div>
-															{{end}}
-															{{if $.allowDelete}}
-																<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-																<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-																	{{svg "octicon-x" 16 "close inside"}}
-																	<div class="header">
-																		<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
-																	</div>
-																	<div class="content">
-																		<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
-																	</div>
-																	<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
-																		{{$.CsrfTokenHtml}}
-																		<input type="hidden" name="id" value="{{$dir}}">
-																		<input type="hidden" name="action" value="delete">
-																		{{template "base/delete_modal_actions" $}}
-																	</form>
-																</div>
-															{{end}}
+																<input type="hidden" name="action" value="delete">
+																{{template "base/delete_modal_actions" $}}
+															</form>
 														</div>
 													{{end}}
 												</div>
-											</div>
-										{{end}}
-									</div>
-									{{template "base/paginate" .}}
-								{{else}}
-									<div class="item">
-										{{.locale.Tr "settings.repos_none"}}
+											{{end}}
+										</div>
 									</div>
 								{{end}}
-							{{else}}
-								{{if .Repos}}
-									<div class="ui middle aligned divided list">
-										{{range .Repos}}
-											<div class="item">
-												<div class="content">
-													{{if .IsPrivate}}
-														{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
-													{{else if .IsFork}}
-														{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
-													{{else if .IsMirror}}
-														{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
-													{{else if .IsTemplate}}
-														{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
-													{{else}}
-														{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
-													{{end}}
-													<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
-													<span>{{FileSize .Size}}</span>
-													{{if .IsFork}}
-														{{$.locale.Tr "repo.forked_from"}}
-														<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
-													{{end}}
-												</div>
-											</div>
-										{{end}}
-									</div>
-									{{template "base/paginate" .}}
-								{{else}}
+							</div>
+							{{template "base/paginate" .}}
+						{{else}}
+							<div class="item">
+								{{.locale.Tr "settings.repos_none"}}
+							</div>
+						{{end}}
+					{{else}}
+						{{if .Repos}}
+							<div class="ui middle aligned divided list">
+								{{range .Repos}}
 									<div class="item">
-										{{.locale.Tr "settings.repos_none"}}
+										<div class="content">
+											{{if .IsPrivate}}
+												{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
+											{{else if .IsFork}}
+												{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
+											{{else if .IsMirror}}
+												{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
+											{{else if .IsTemplate}}
+												{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
+											{{else}}
+												{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
+											{{end}}
+											<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
+											<span>{{FileSize .Size}}</span>
+											{{if .IsFork}}
+												{{$.locale.Tr "repo.forked_from"}}
+												<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
+											{{end}}
+										</div>
 									</div>
 								{{end}}
-							{{end}}
-						</div>
-					</div>
+							</div>
+							{{template "base/paginate" .}}
+						{{else}}
+							<div class="item">
+								{{.locale.Tr "settings.repos_none"}}
+							</div>
+						{{end}}
+					{{end}}
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
+{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -145,4 +139,3 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-{{template "base/footer" .}}
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/secrets.tmpl
index 6e48a7de3882..90142b7074b6 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/secrets.tmpl
@@ -1,14 +1,6 @@
-{{template "base/head" .}}
-<div class="page-content user settings secrets">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "shared/secrets/add_list" .}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "shared/secrets/add_list" .}}
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index 6f9b1f16a9f7..7f0aa0ca3174 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,19 +1,11 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings security">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				{{template "user/settings/security/twofa" .}}
-				{{template "user/settings/security/webauthn" .}}
-				{{template "user/settings/security/accountlinks" .}}
-				{{if .EnableOpenIDSignIn}}
-				{{template "user/settings/security/openid" .}}
-				{{end}}
-			</div>
-		</div>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		{{template "user/settings/security/twofa" .}}
+		{{template "user/settings/security/webauthn" .}}
+		{{template "user/settings/security/accountlinks" .}}
+		{{if .EnableOpenIDSignIn}}
+		{{template "user/settings/security/openid" .}}
+		{{end}}
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index d6b6ae43b29b..f1dc2351eb4f 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,33 +1,25 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content user settings twofa">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "user/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
-				<h4 class="ui top attached header">
-					{{.locale.Tr "settings.twofa_enroll"}}
-				</h4>
-				<div class="ui attached segment">
-					<p>{{.locale.Tr "settings.scan_this_image"}}</p>
-					<img src="{{.QrUri}}" alt="{{.TwofaSecret}}">
-					<p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}
-					<p>{{.locale.Tr "settings.then_enter_passcode"}}
-					<form class="ui form" action="{{.Link}}" method="post">
-						{{.CsrfTokenHtml}}
-						<div class="inline required field {{if .Err_Passcode}}error{{end}}">
-							<label for="passcode">{{.locale.Tr "passcode"}}</label>
-							<input id="passcode" name="passcode" autofocus required>
-						</div>
-						<div class="inline field">
-							<label></label>
-							<button class="ui green button">{{.locale.Tr "auth.verify"}}</button>
-						</div>
-					</form>
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa")}}
+	<div class="user-main-content twelve wide column content">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header">
+			{{.locale.Tr "settings.twofa_enroll"}}
+		</h4>
+		<div class="ui attached segment">
+			<p>{{.locale.Tr "settings.scan_this_image"}}</p>
+			<img src="{{.QrUri}}" alt="{{.TwofaSecret}}">
+			<p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}
+			<p>{{.locale.Tr "settings.then_enter_passcode"}}
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<div class="inline required field {{if .Err_Passcode}}error{{end}}">
+					<label for="passcode">{{.locale.Tr "passcode"}}</label>
+					<input id="passcode" name="passcode" autofocus required>
 				</div>
-			</div>
+				<div class="inline field">
+					<label></label>
+					<button class="ui green button">{{.locale.Tr "auth.verify"}}</button>
+				</div>
+			</form>
 		</div>
 	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "user/settings/layout_footer" .}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css
index 2015140e08a8..00ed675e2d57 100644
--- a/web_src/css/admin.css
+++ b/web_src/css/admin.css
@@ -1,7 +1,3 @@
-.admi.page-content.grid {
-  margin-top: 0;
-}
-
 .admin.hooks .list > .item:not(:first-child) {
   border-top: 1px solid var(--color-secondary);
   padding: 0.25rem 1rem;

From ba7b3b80855916db5c7034e79ee96534a7413d2b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 13:18:56 +0800
Subject: [PATCH 14/21] reduce changes

---
 templates/admin/repo/unadopted.tmpl           |   1 +
 templates/user/settings/repos.tmpl            | 118 +++++++++---------
 templates/user/settings/secrets.tmpl          |   1 +
 .../user/settings/security/security.tmpl      |   1 +
 .../user/settings/security/twofa_enroll.tmpl  |   1 +
 5 files changed, 63 insertions(+), 59 deletions(-)

diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index cf06f97c9721..198d10eef277 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -95,4 +95,5 @@
 			</div>
 		{{end}}
 	</div>
+
 {{template "admin/layout_footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 19285b5cbbf0..05b3a7cde667 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -58,73 +58,73 @@
 																{{$.locale.Tr "modal.yes"}}
 															</button>
 														</div>
-													{{end}}
-													{{if $.allowDelete}}
-														<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-														<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
-															{{svg "octicon-x" 16 "close inside"}}
-															<div class="header">
-																<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
-															</div>
-															<div class="content">
-																<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
-															</div>
-															<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
-																{{$.CsrfTokenHtml}}
-																<input type="hidden" name="id" value="{{$dir}}">
-																<input type="hidden" name="action" value="delete">
-																{{template "base/delete_modal_actions" $}}
-															</form>
-														</div>
-													{{end}}
+													</form>
 												</div>
 											{{end}}
-										</div>
-									</div>
-								{{end}}
-							</div>
-							{{template "base/paginate" .}}
-						{{else}}
-							<div class="item">
-								{{.locale.Tr "settings.repos_none"}}
-							</div>
-						{{end}}
-					{{else}}
-						{{if .Repos}}
-							<div class="ui middle aligned divided list">
-								{{range .Repos}}
-									<div class="item">
-										<div class="content">
-											{{if .IsPrivate}}
-												{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
-											{{else if .IsFork}}
-												{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
-											{{else if .IsMirror}}
-												{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
-											{{else if .IsTemplate}}
-												{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
-											{{else}}
-												{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
-											{{end}}
-											<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
-											<span>{{FileSize .Size}}</span>
-											{{if .IsFork}}
-												{{$.locale.Tr "repo.forked_from"}}
-												<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
+											{{if $.allowDelete}}
+												<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
+												<div class="ui basic modal" id="delete-unadopted-modal-{{$dirI}}">
+													{{svg "octicon-x" 16 "close inside"}}
+													<div class="header">
+														<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
+													</div>
+													<div class="content">
+														<p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p>
+													</div>
+													<form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted">
+														{{$.CsrfTokenHtml}}
+														<input type="hidden" name="id" value="{{$dir}}">
+														<input type="hidden" name="action" value="delete">
+														{{template "base/delete_modal_actions" $}}
+													</form>
+												</div>
 											{{end}}
 										</div>
-									</div>
-								{{end}}
+									{{end}}
+								</div>
 							</div>
-							{{template "base/paginate" .}}
-						{{else}}
+						{{end}}
+					</div>
+					{{template "base/paginate" .}}
+				{{else}}
+					<div class="item">
+						{{.locale.Tr "settings.repos_none"}}
+					</div>
+				{{end}}
+			{{else}}
+				{{if .Repos}}
+					<div class="ui middle aligned divided list">
+						{{range .Repos}}
 							<div class="item">
-								{{.locale.Tr "settings.repos_none"}}
+								<div class="content">
+									{{if .IsPrivate}}
+										{{svg "octicon-lock" 16 "gt-mr-2 iconFloat text gold"}}
+									{{else if .IsFork}}
+										{{svg "octicon-repo-forked" 16 "gt-mr-2 iconFloat"}}
+									{{else if .IsMirror}}
+										{{svg "octicon-mirror" 16 "gt-mr-2 iconFloat"}}
+									{{else if .IsTemplate}}
+										{{svg "octicon-repo-template" 16 "gt-mr-2 iconFloat"}}
+									{{else}}
+										{{svg "octicon-repo" 16 "gt-mr-2 iconFloat"}}
+									{{end}}
+									<a class="name" href="{{.Link}}">{{.OwnerName}}/{{.Name}}</a>
+									<span>{{FileSize .Size}}</span>
+									{{if .IsFork}}
+										{{$.locale.Tr "repo.forked_from"}}
+										<span><a href="{{.BaseRepo.Link}}">{{.BaseRepo.OwnerName}}/{{.BaseRepo.Name}}</a></span>
+									{{end}}
+								</div>
 							</div>
 						{{end}}
-					{{end}}
-				</div>
-			</div>
+					</div>
+					{{template "base/paginate" .}}
+				{{else}}
+					<div class="item">
+						{{.locale.Tr "settings.repos_none"}}
+					</div>
+				{{end}}
+			{{end}}
 		</div>
 	</div>
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/secrets.tmpl
index 90142b7074b6..4275c599748b 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/secrets.tmpl
@@ -3,4 +3,5 @@
 		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
+
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index 7f0aa0ca3174..b561cdca2169 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -8,4 +8,5 @@
 		{{template "user/settings/security/openid" .}}
 		{{end}}
 	</div>
+
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index f1dc2351eb4f..dc03698497d0 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -22,4 +22,5 @@
 			</form>
 		</div>
 	</div>
+
 {{template "user/settings/layout_footer" .}}

From 34748e90be15754d68b399ce09ff75f908e491b9 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 13:23:18 +0800
Subject: [PATCH 15/21] remove unnecessay changes

---
 templates/repo/settings/options.tmpl | 2 +-
 templates/user/settings/profile.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index b82d4493b4ce..927aa56e8a71 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -57,7 +57,7 @@
 				{{.CsrfTokenHtml}}
 				<div class="inline field">
 					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" >
+					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
 				</div>
 
 				<div class="field">
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 704e541d8ed3..5265e10bc0a6 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -121,7 +121,7 @@
 
 				<div class="inline field">
 					<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
-					<input name="avatar" type="file" >
+					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
 				</div>
 
 				<div class="field">

From 66d71a5ec4100fc3cf137c66e18bc2566c16b060 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 13:40:22 +0800
Subject: [PATCH 16/21] fix lint

---
 templates/repo/settings/layout_head.tmpl | 2 +-
 templates/user/settings/layout_head.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl
index 7fb936860f39..e801b1c902d6 100644
--- a/templates/repo/settings/layout_head.tmpl
+++ b/templates/repo/settings/layout_head.tmpl
@@ -2,7 +2,7 @@
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	{{template "repo/header" .ctxData}}
 	<div class="ui container stackable grid">
-        {{template "repo/settings/navbar" .ctxData}}
+		{{template "repo/settings/navbar" .ctxData}}
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		{{/* block: admin-main-content */}}
 	</div>
diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl
index c082af6f08e7..8c123656331e 100644
--- a/templates/user/settings/layout_head.tmpl
+++ b/templates/user/settings/layout_head.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .ctxData}}
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	<div class="ui container stackable grid">
-        {{template "user/settings/navbar" .ctxData}}
+		{{template "user/settings/navbar" .ctxData}}
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		{{/* block: admin-main-content */}}
 	</div>

From 6aff469dd428a42901d10baf5c7b26fd8e08802b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Sun, 23 Apr 2023 13:46:44 +0800
Subject: [PATCH 17/21] adjust admin app list and remove some change

---
 templates/admin/applications/list.tmpl                | 10 ++++------
 templates/admin/applications/oauth2_edit.tmpl         |  1 +
 templates/user/settings/applications_oauth2_edit.tmpl |  1 +
 templates/user/settings/organization.tmpl             |  1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 8f2ddb303791..5786627ca5e4 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,11 +1,9 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-main-content twelve wide column content">
 		{{template "base/alert" .}}
-		<div class="twelve wide column content">
-			<h4 class="ui top attached header">
-					{{.locale.Tr "settings.applications"}}
-			</h4>
-			{{template "user/settings/applications_oauth2_list" .}}
-		</div>
+		<h4 class="ui top attached header">
+				{{.locale.Tr "settings.applications"}}
+		</h4>
+		{{template "user/settings/applications_oauth2_list" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index c60a0d815114..ac8d8c62e1ec 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,6 +1,7 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-main-content twelve wide column content">
 		{{template "base/alert" .}}
+
 		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index 6d8c1ecee9e3..6753eb50d989 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,6 +1,7 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
 	<div class="user-main-content twelve wide column content">
 		{{template "base/alert" .}}
+
 		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 5a15bda25bc3..5a34a924aa1b 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -38,7 +38,6 @@
 		</div>
 	</div>
 {{template "user/settings/layout_footer" .}}
-
 <div class="ui small basic delete modal" id="leave-organization">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}

From 7f75cc8dcc15f1b85acb09067d6de118923deb54 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 14:15:24 +0800
Subject: [PATCH 18/21] fix layout

---
 templates/admin/auth/edit.tmpl             | 3 ++-
 templates/admin/monitor.tmpl               | 6 ++++--
 templates/admin/notice.tmpl                | 3 ++-
 templates/admin/packages/list.tmpl         | 3 ++-
 templates/admin/queue.tmpl                 | 8 +++++---
 templates/admin/repo/list.tmpl             | 3 ++-
 templates/admin/stacktrace.tmpl            | 4 +++-
 templates/admin/user/edit.tmpl             | 3 ++-
 templates/repo/settings/branches.tmpl      | 3 ++-
 templates/repo/settings/collaboration.tmpl | 3 ++-
 templates/repo/settings/deploy_keys.tmpl   | 3 ++-
 templates/user/settings/account.tmpl       | 3 ++-
 templates/user/settings/applications.tmpl  | 3 +--
 templates/user/settings/organization.tmpl  | 4 +++-
 templates/user/settings/repos.tmpl         | 3 ++-
 15 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index d832334f02a4..f8c1cfccacae 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -436,7 +436,6 @@
 			</form>
 		</div>
 	</div>
-{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -448,3 +447,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 797ffaaec190..5464d0503b65 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -24,7 +24,7 @@
 							<td>{{.Type}}</td>
 							<td>{{.ExemplarType}}</td>
 							<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
-							<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+							<td>{{$sum = .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 							<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
 						</tr>
 					{{end}}
@@ -34,7 +34,7 @@
 
 		{{template "admin/process" .}}
 	</div>
-{{template "admin/layout_footer" .}}
+
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -46,3 +46,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index f7484349be75..9e6373551202 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -67,7 +67,6 @@
 
 		{{template "base/paginate" .}}
 	</div>
-{{template "admin/layout_footer" .}}
 
 <div class="ui modal admin" id="detail-modal">
 	{{svg "octicon-x" 16 "close inside"}}
@@ -77,3 +76,5 @@
 		<pre></pre>
 	</div>
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index df6e01fb2518..523820051fd0 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -76,7 +76,6 @@
 
 		{{template "base/paginate" .}}
 	</div>
-{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -88,3 +87,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 5b853b5c7e90..f7f86d02b3ac 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -23,7 +23,7 @@
 						<td>{{.Queue.ExemplarType}}</td>
 						<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 						<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
-						<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
+						<td>{{$sum = .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -175,10 +175,10 @@
 			{{.locale.Tr "admin.monitor.queue.configuration"}}
 		</h4>
 		<div class="ui attached segment">
-			<pre>{{.Queue.Configuration | JsonPrettyPrint}}
+			<pre>{{.Queue.Configuration | JsonPrettyPrint}}</pre>
 		</div>
 	</div>
-{{template "admin/layout_footer" .}}
+
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -190,3 +190,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 69c7be5e273b..0bcb1ea7ef12 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -91,7 +91,6 @@
 
 		{{template "base/paginate" .}}
 	</div>
-{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -105,3 +104,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index c230da0393a6..bd57848ff502 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -15,7 +15,7 @@
 			</div>
 		</div>
 	</div>
-{{template "admin/layout_footer" .}}
+
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -27,3 +27,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 9085c44d2108..37d74cbc7ba7 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -192,7 +192,6 @@
 			</form>
 		</div>
 	</div>
-{{template "admin/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-user-modal">
 	<div class="ui icon header">
@@ -214,3 +213,5 @@
 		{{template "base/delete_modal_actions" .}}
 	</form>
 </div>
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index e29c7d82435e..5521aee9ad84 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -91,7 +91,6 @@
 			{{end}}
 		{{end}}
 	</div>
-{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui header">
@@ -103,3 +102,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index a62c796e5c24..38e50078f083 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -107,7 +107,6 @@
 		</div>
 		{{end}}
 	</div>
-{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -119,3 +118,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 822ece2e106b..fe55353f41e7 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -72,7 +72,6 @@
 			{{end}}
 		</div>
 	</div>
-{{template "repo/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -84,3 +83,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 3ae95a134bc4..38d72c30f527 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -157,7 +157,6 @@
 			</form>
 		</div>
 	</div>
-{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-email">
 	<div class="ui icon header">
@@ -180,3 +179,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 9c8e55353642..6c9feb695e8d 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -264,7 +264,6 @@
 			{{template "user/settings/applications_oauth2" .}}
 		{{end}}
 	</div>
-{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal" id="delete-token">
 	<div class="ui icon header">
@@ -287,4 +286,4 @@
 	</div>
 </div>
 
-
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 5a34a924aa1b..b1782a53866e 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -37,7 +37,7 @@
 			{{end}}
 		</div>
 	</div>
-{{template "user/settings/layout_footer" .}}
+
 <div class="ui small basic delete modal" id="leave-organization">
 	<div class="ui icon header">
 		{{svg "octicon-x" 16 "close inside"}}
@@ -48,3 +48,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index 05b3a7cde667..a54db6d273da 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -127,7 +127,6 @@
 			{{end}}
 		</div>
 	</div>
-{{template "user/settings/layout_footer" .}}
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -139,3 +138,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
+
+{{template "user/settings/layout_footer" .}}

From bca27aad8ffaf09205fc725c7bd7842f8b798832 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 14:22:30 +0800
Subject: [PATCH 19/21] refactor

---
 templates/admin/applications/list.tmpl                      | 2 +-
 templates/admin/applications/oauth2_edit.tmpl               | 2 +-
 templates/admin/auth/edit.tmpl                              | 2 +-
 templates/admin/auth/list.tmpl                              | 2 +-
 templates/admin/auth/new.tmpl                               | 2 +-
 templates/admin/config.tmpl                                 | 2 +-
 templates/admin/dashboard.tmpl                              | 2 +-
 templates/admin/emails/list.tmpl                            | 2 +-
 templates/admin/hook_new.tmpl                               | 2 +-
 templates/admin/hooks.tmpl                                  | 2 +-
 templates/admin/layout_footer.tmpl                          | 2 ++
 templates/admin/layout_head.tmpl                            | 2 ++
 templates/admin/monitor.tmpl                                | 2 +-
 templates/admin/notice.tmpl                                 | 2 +-
 templates/admin/org/list.tmpl                               | 2 +-
 templates/admin/packages/list.tmpl                          | 2 +-
 templates/admin/queue.tmpl                                  | 2 +-
 templates/admin/repo/list.tmpl                              | 2 +-
 templates/admin/repo/unadopted.tmpl                         | 2 +-
 templates/admin/runners/base.tmpl                           | 2 +-
 templates/admin/runners/edit.tmpl                           | 2 +-
 templates/admin/stacktrace.tmpl                             | 2 +-
 templates/admin/user/edit.tmpl                              | 2 +-
 templates/admin/user/list.tmpl                              | 2 +-
 templates/admin/user/new.tmpl                               | 2 +-
 templates/repo/settings/branches.tmpl                       | 2 +-
 templates/repo/settings/collaboration.tmpl                  | 2 +-
 templates/repo/settings/deploy_keys.tmpl                    | 2 +-
 templates/repo/settings/githook_edit.tmpl                   | 2 +-
 templates/repo/settings/githooks.tmpl                       | 2 +-
 templates/repo/settings/layout_footer.tmpl                  | 2 ++
 templates/repo/settings/layout_head.tmpl                    | 2 ++
 templates/repo/settings/lfs.tmpl                            | 2 +-
 templates/repo/settings/lfs_pointers.tmpl                   | 2 +-
 templates/repo/settings/protected_branch.tmpl               | 2 +-
 templates/repo/settings/runner_edit.tmpl                    | 2 +-
 templates/repo/settings/runners.tmpl                        | 2 +-
 templates/repo/settings/secrets.tmpl                        | 2 +-
 templates/repo/settings/tags.tmpl                           | 2 +-
 templates/repo/settings/webhook/base.tmpl                   | 2 +-
 templates/repo/settings/webhook/new.tmpl                    | 2 +-
 templates/user/settings/account.tmpl                        | 2 +-
 templates/user/settings/appearance.tmpl                     | 2 +-
 templates/user/settings/applications.tmpl                   | 2 +-
 templates/user/settings/applications_oauth2_edit.tmpl       | 2 +-
 templates/user/settings/hook_new.tmpl                       | 4 ++--
 templates/user/settings/hooks.tmpl                          | 2 +-
 templates/user/settings/keys.tmpl                           | 2 +-
 templates/user/settings/layout_footer.tmpl                  | 2 ++
 templates/user/settings/layout_head.tmpl                    | 2 ++
 templates/user/settings/organization.tmpl                   | 2 +-
 templates/user/settings/packages.tmpl                       | 2 +-
 templates/user/settings/packages_cleanup_rules_edit.tmpl    | 2 +-
 templates/user/settings/packages_cleanup_rules_preview.tmpl | 2 +-
 templates/user/settings/profile.tmpl                        | 2 +-
 templates/user/settings/repos.tmpl                          | 2 +-
 templates/user/settings/secrets.tmpl                        | 2 +-
 templates/user/settings/security/security.tmpl              | 2 +-
 templates/user/settings/security/twofa_enroll.tmpl          | 2 +-
 59 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index 5786627ca5e4..ad58173c46f3 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 				{{.locale.Tr "settings.applications"}}
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index ac8d8c62e1ec..e575f22a07a9 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 
 		{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index f8c1cfccacae..ae849eca2908 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.edit"}}
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 7d113103123f..77243fd7c7e7 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index 183517eb2e5b..b9ebdee0a558 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.new"}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 1bbb5c3f61cd..7cc139317b1d 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.config.server_config"}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index b57eb2ca99a1..4215c8151b58 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		{{if .NeedUpdate}}
 			<div class="ui negative message flash-error">
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 1fb8e19dacd9..9027d4980f43 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index b80528d7c8b1..b7de4929c3d2 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsAdminDefaultHooksNew}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index edb40d871463..591680e31520 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 
 		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
diff --git a/templates/admin/layout_footer.tmpl b/templates/admin/layout_footer.tmpl
index 0a83b3e97cf8..a200e34d7ca9 100644
--- a/templates/admin/layout_footer.tmpl
+++ b/templates/admin/layout_footer.tmpl
@@ -1,8 +1,10 @@
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 <div class="page-content">
 	<div class="admin-layout-right">
+		<div>
 		{{/* block: admin-main-content */}}
 {{end}}
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl
index 0469e3d404ed..46cc7866dc70 100644
--- a/templates/admin/layout_head.tmpl
+++ b/templates/admin/layout_head.tmpl
@@ -2,8 +2,10 @@
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	<div class="ui container stackable grid">
 		{{template "admin/navbar" .ctxData}}
+		<div class="twelve wide column">
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		{{/* block: admin-main-content */}}
+		</div>
 	</div>
 </div>
 {{end}}
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index 5464d0503b65..f34c899fa1cb 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		{{template "admin/cron" .}}
 		<h4 class="ui top attached header">
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 9e6373551202..d3780ce9f1fe 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index 6e522a39a546..dc9117fbefa8 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 523820051fd0..84dd981db661 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index f7f86d02b3ac..4840d487d804 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 0bcb1ea7ef12..65dab7f8731c 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 198d10eef277..96f680f6115b 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.unadopted"}}
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index f7d55b0fd3d4..611a93ab1e22 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index 3303e5f9f37c..ac3b25a949fc 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index bd57848ff502..a1b66c23a336 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 37d74cbc7ba7..a16a9ac14386 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.edit_account"}}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 051cd2569ba6..09b5bfb9d2ab 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 40f0b2643c57..e86331adabd9 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,5 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
-	<div class="admin-main-content twelve wide column content">
+	<div class="admin-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.new_account"}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 5521aee9ad84..2fdf9dfff6c2 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 38e50078f083..8d4ed16eb5c8 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.collaboration"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index fe55353f41e7..8c043b718c2a 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.deploy_keys"}}
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index 016c5976c0c8..a459f5224a15 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit githook")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index d02201c08240..764b79c3bae8 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings githooks")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
diff --git a/templates/repo/settings/layout_footer.tmpl b/templates/repo/settings/layout_footer.tmpl
index 31e87cb5373c..6c22d522c1b3 100644
--- a/templates/repo/settings/layout_footer.tmpl
+++ b/templates/repo/settings/layout_footer.tmpl
@@ -1,8 +1,10 @@
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 <div class="page-content">
 	<div class="repo-layout-right">
+		<div>
 		{{/* block: repo-main-content */}}
 {{end}}
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl
index e801b1c902d6..bf30aabddbe0 100644
--- a/templates/repo/settings/layout_head.tmpl
+++ b/templates/repo/settings/layout_head.tmpl
@@ -3,7 +3,9 @@
 	{{template "repo/header" .ctxData}}
 	<div class="ui container stackable grid">
 		{{template "repo/settings/navbar" .ctxData}}
+		<div class="twelve wide column">
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
 		{{/* block: admin-main-content */}}
 	</div>
 </div>
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index 268ed0dbf327..a6ed40718135 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index ad103e1acb60..0c82cebccb17 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index 0705faa34403..b4fcb0d10563 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings branches")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<form class="ui form" action="{{.Link}}" method="post">
 			<h4 class="ui top attached header">
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 4cb2d49af2bd..05435eeaee48 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index f6c0966b43d7..29cb2e2b26ab 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index 2f01bd1ec535..04fc0c05f76e 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 8f351143bc02..4d381384200c 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index 0d40b5d7092f..2f2aab2a25e2 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhooks")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		{{template "repo/settings/webhook/list" .}}
 	</div>
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index a4284ef59bd8..04b7c4fad2cd 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,5 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhook")}}
-	<div class="repo-main-content twelve wide column content">
+	<div class="repo-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 38d72c30f527..37e2f12fb4a1 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.password"}}
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index 145654b19593..6c6ff7c7a63f 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 
 		<!-- Theme -->
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 6c9feb695e8d..912910b5e0d3 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.manage_access_token"}}
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index 6753eb50d989..1947ceb87300 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 
 		{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index e7f65cec01fb..9ec6dea1981f 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,6 +1,6 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
-	<div class="user-main-content twelve wide column content">
-		<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
+		<div class="user-setting-content">
 			{{template "base/alert" .}}
 			<h4 class="ui top attached header">
 				{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
diff --git a/templates/user/settings/hooks.tmpl b/templates/user/settings/hooks.tmpl
index ada696b75fa5..057b1a5f94a7 100644
--- a/templates/user/settings/hooks.tmpl
+++ b/templates/user/settings/hooks.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings webhooks")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "repo/settings/webhook/list" .}}
 	</div>
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index 07101147b11d..d69586af8dc2 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "user/settings/keys_ssh" .}}
 		{{template "user/settings/keys_principal" .}}
diff --git a/templates/user/settings/layout_footer.tmpl b/templates/user/settings/layout_footer.tmpl
index 93fd2038b7b9..43f2edea1e71 100644
--- a/templates/user/settings/layout_footer.tmpl
+++ b/templates/user/settings/layout_footer.tmpl
@@ -1,8 +1,10 @@
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 <div class="page-content">
 	<div class="user-layout-right">
+		<div>
 		{{/* block: user-main-content */}}
 {{end}}
+		</div>
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl
index 8c123656331e..393373e7908f 100644
--- a/templates/user/settings/layout_head.tmpl
+++ b/templates/user/settings/layout_head.tmpl
@@ -2,7 +2,9 @@
 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
 	<div class="ui container stackable grid">
 		{{template "user/settings/navbar" .ctxData}}
+		<div class="twelve wide column">
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
 		{{/* block: admin-main-content */}}
 	</div>
 </div>
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index b1782a53866e..6f92140387bf 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings organization")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.orgs"}}
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index 5bd5eb582dde..f6b2ead6bc7e 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "package/shared/cleanup_rules/list" .}}
 		{{template "package/shared/cargo" .}}
diff --git a/templates/user/settings/packages_cleanup_rules_edit.tmpl b/templates/user/settings/packages_cleanup_rules_edit.tmpl
index 1c6b3feab754..f0552f1065e5 100644
--- a/templates/user/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_edit.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "package/shared/cleanup_rules/edit" .}}
 	</div>
diff --git a/templates/user/settings/packages_cleanup_rules_preview.tmpl b/templates/user/settings/packages_cleanup_rules_preview.tmpl
index cc4312ca14c5..d99aee4b9a48 100644
--- a/templates/user/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_preview.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user packages admin")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "package/shared/cleanup_rules/preview" .}}
 	</div>
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 5265e10bc0a6..1308608a16a5 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings profile")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.public_profile"}}
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index a54db6d273da..d5ff52e31fb7 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings repos")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.repos"}}
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/secrets.tmpl
index 4275c599748b..eba14b610776 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/secrets.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index b561cdca2169..f7fa3eb15b6d 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		{{template "user/settings/security/twofa" .}}
 		{{template "user/settings/security/webauthn" .}}
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index dc03698497d0..c10277565cca 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,5 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa")}}
-	<div class="user-main-content twelve wide column content">
+	<div class="user-setting-content">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.twofa_enroll"}}

From 27798c64e49c07f653c82e41e0be157d5295de5d Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 14:34:37 +0800
Subject: [PATCH 20/21] fix alert layout

---
 templates/admin/applications/list.tmpl                   | 1 -
 templates/admin/applications/oauth2_edit.tmpl            | 1 -
 templates/admin/auth/edit.tmpl                           | 1 -
 templates/admin/auth/list.tmpl                           | 1 -
 templates/admin/auth/new.tmpl                            | 1 -
 templates/admin/config.tmpl                              | 1 -
 templates/admin/dashboard.tmpl                           | 1 -
 templates/admin/emails/list.tmpl                         | 1 -
 templates/admin/hook_new.tmpl                            | 1 -
 templates/admin/hooks.tmpl                               | 1 -
 templates/admin/layout_head.tmpl                         | 4 +++-
 templates/admin/monitor.tmpl                             | 1 -
 templates/admin/notice.tmpl                              | 1 -
 templates/admin/org/list.tmpl                            | 1 -
 templates/admin/packages/list.tmpl                       | 1 -
 templates/admin/queue.tmpl                               | 1 -
 templates/admin/repo/list.tmpl                           | 1 -
 templates/admin/repo/unadopted.tmpl                      | 1 -
 templates/admin/runners/base.tmpl                        | 1 -
 templates/admin/runners/edit.tmpl                        | 1 -
 templates/admin/stacktrace.tmpl                          | 1 -
 templates/admin/user/edit.tmpl                           | 1 -
 templates/admin/user/list.tmpl                           | 1 -
 templates/admin/user/new.tmpl                            | 1 -
 templates/repo/settings/branches.tmpl                    | 1 -
 templates/repo/settings/collaboration.tmpl               | 1 -
 templates/repo/settings/deploy_keys.tmpl                 | 1 -
 templates/repo/settings/githook_edit.tmpl                | 1 -
 templates/repo/settings/githooks.tmpl                    | 1 -
 templates/repo/settings/layout_head.tmpl                 | 4 +++-
 templates/repo/settings/lfs.tmpl                         | 1 -
 templates/repo/settings/lfs_file.tmpl                    | 1 -
 templates/repo/settings/lfs_file_find.tmpl               | 1 -
 templates/repo/settings/lfs_locks.tmpl                   | 1 -
 templates/repo/settings/lfs_pointers.tmpl                | 1 -
 templates/repo/settings/options.tmpl                     | 1 -
 templates/repo/settings/protected_branch.tmpl            | 1 -
 templates/repo/settings/runner_edit.tmpl                 | 1 -
 templates/repo/settings/runners.tmpl                     | 1 -
 templates/repo/settings/secrets.tmpl                     | 1 -
 templates/repo/settings/tags.tmpl                        | 1 -
 templates/repo/settings/webhook/base.tmpl                | 1 -
 templates/repo/settings/webhook/new.tmpl                 | 1 -
 templates/user/settings/account.tmpl                     | 1 -
 templates/user/settings/appearance.tmpl                  | 1 -
 templates/user/settings/applications.tmpl                | 1 -
 templates/user/settings/applications_oauth2_edit.tmpl    | 1 -
 templates/user/settings/hook_new.tmpl                    | 3 +--
 templates/user/settings/hooks.tmpl                       | 1 -
 templates/user/settings/keys.tmpl                        | 1 -
 templates/user/settings/layout_head.tmpl                 | 4 +++-
 templates/user/settings/organization.tmpl                | 1 -
 templates/user/settings/packages.tmpl                    | 1 -
 templates/user/settings/packages_cleanup_rules_edit.tmpl | 1 -
 templates/user/settings/profile.tmpl                     | 1 -
 templates/user/settings/repos.tmpl                       | 1 -
 templates/user/settings/secrets.tmpl                     | 1 -
 templates/user/settings/security/security.tmpl           | 1 -
 templates/user/settings/security/twofa_enroll.tmpl       | 1 -
 59 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl
index ad58173c46f3..a292051fd0d9 100644
--- a/templates/admin/applications/list.tmpl
+++ b/templates/admin/applications/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 				{{.locale.Tr "settings.applications"}}
 		</h4>
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl
index e575f22a07a9..668bfe063340 100644
--- a/templates/admin/applications/oauth2_edit.tmpl
+++ b/templates/admin/applications/oauth2_edit.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 
 		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index ae849eca2908..cb6f27c65ef2 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.edit"}}
 		</h4>
diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl
index 77243fd7c7e7..5350672026cb 100644
--- a/templates/admin/auth/list.tmpl
+++ b/templates/admin/auth/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
index b9ebdee0a558..5d9a9083c5c8 100644
--- a/templates/admin/auth/new.tmpl
+++ b/templates/admin/auth/new.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.auths.new"}}
 		</h4>
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 7cc139317b1d..136ad38f1632 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.config.server_config"}}
 		</h4>
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 4215c8151b58..93fcae4ca4d4 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		{{if .NeedUpdate}}
 			<div class="ui negative message flash-error">
 				<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 9027d4980f43..1c1be91850a7 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl
index b7de4929c3d2..1abdd4c813a2 100644
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsAdminDefaultHooksNew}}
 				{{.locale.Tr "admin.defaulthooks.add_webhook"}}
diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl
index 591680e31520..c77d27dbd0bd 100644
--- a/templates/admin/hooks.tmpl
+++ b/templates/admin/hooks.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 
 		{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
 		{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl
index 46cc7866dc70..6d84f8f3590e 100644
--- a/templates/admin/layout_head.tmpl
+++ b/templates/admin/layout_head.tmpl
@@ -3,8 +3,10 @@
 	<div class="ui container stackable grid">
 		{{template "admin/navbar" .ctxData}}
 		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: admin-setting-content */}}
+
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
-		{{/* block: admin-main-content */}}
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl
index f34c899fa1cb..f14120c0a5ed 100644
--- a/templates/admin/monitor.tmpl
+++ b/templates/admin/monitor.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		{{template "admin/cron" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queues"}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index d3780ce9f1fe..5474d960c808 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
 		</h4>
diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index dc9117fbefa8..2e8a6359858a 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 84dd981db661..275f472efb91 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
 			{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl
index 4840d487d804..0ac599dc2236 100644
--- a/templates/admin/queue.tmpl
+++ b/templates/admin/queue.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
 		</h4>
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 65dab7f8731c..82c9d1a81d1c 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl
index 96f680f6115b..8ddceffd2f8c 100644
--- a/templates/admin/repo/unadopted.tmpl
+++ b/templates/admin/repo/unadopted.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.repos.unadopted"}}
 			<div class="ui right">
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl
index 611a93ab1e22..36495b6a0b94 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/runners/base.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl
index ac3b25a949fc..1165c84b7941 100644
--- a/templates/admin/runners/edit.tmpl
+++ b/templates/admin/runners/edit.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
 {{template "admin/layout_footer" .}}
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index a1b66c23a336..dfafdc9f70a1 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
 			<div class="ui right">
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index a16a9ac14386..c92ebcb2291b 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.edit_account"}}
 		</h4>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 09b5bfb9d2ab..c7644b3b4ee1 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index e86331adabd9..dbf01fb43ec8 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,6 +1,5 @@
 {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
 	<div class="admin-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "admin.users.new_account"}}
 		</h4>
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 2fdf9dfff6c2..7f64b448d068 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
 				{{.locale.Tr "repo.settings.archive.branchsettings_unavailable"}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 8d4ed16eb5c8..66ca07419e01 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings collaboration")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.collaboration"}}
 		</h4>
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 8c043b718c2a..91cb9414a4cb 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.deploy_keys"}}
 			<div class="ui right">
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index a459f5224a15..3d212b5ffd00 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit githook")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
 		</h4>
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 764b79c3bae8..c0bf91f91037 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings githooks")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.githooks"}}
 		</h4>
diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl
index bf30aabddbe0..311730983189 100644
--- a/templates/repo/settings/layout_head.tmpl
+++ b/templates/repo/settings/layout_head.tmpl
@@ -4,9 +4,11 @@
 	<div class="ui container stackable grid">
 		{{template "repo/settings/navbar" .ctxData}}
 		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: repo-setting-content */}}
+
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		</div>
-		{{/* block: admin-main-content */}}
 	</div>
 </div>
 {{end}}
diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl
index a6ed40718135..33e991a6930c 100644
--- a/templates/repo/settings/lfs.tmpl
+++ b/templates/repo/settings/lfs.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_filelist"}} ({{.locale.Tr "admin.total" .Total}})
 			<div class="ui right">
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index d1b4193ff6bc..d38cf32d248e 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
 	<div class="user-main-content twelve wide column content repository file list">
-		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.LFSFile.Oid}}</span>
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 9414331c7eaf..21709e7b33dd 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
 	<div class="user-main-content twelve wide column content repository file list">
-		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / <span class="truncate sha">{{.Oid}}</span>
diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs_locks.tmpl
index b40cd544f9d9..8fa3dfd3d3df 100644
--- a/templates/repo/settings/lfs_locks.tmpl
+++ b/templates/repo/settings/lfs_locks.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
 	<div class="user-main-content twelve wide column content repository file list">
-		{{template "base/alert" .}}
 		<div class="tab-size-8 non-diff-file-content">
 			<h4 class="ui top attached header">
 				<a href="{{.LFSFilesLink}}">{{.locale.Tr "repo.settings.lfs"}}</a> / {{.locale.Tr "repo.settings.lfs_locks"}} ({{.locale.Tr "admin.total" .Total}})
diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl
index 0c82cebccb17..5f0cf3164d9f 100644
--- a/templates/repo/settings/lfs_pointers.tmpl
+++ b/templates/repo/settings/lfs_pointers.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings lfs")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.lfs_pointers.found" .NumPointers .NumAssociated .NumNotAssociated .NumNoExist}}
 			{{if gt .NumAssociatable 0}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 927aa56e8a71..87c367953829 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings options")}}
 	<div class="user-main-content twelve wide column">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "repo.settings.basic_settings"}}
 		</h4>
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl
index b4fcb0d10563..31ba0bf88879 100644
--- a/templates/repo/settings/protected_branch.tmpl
+++ b/templates/repo/settings/protected_branch.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings branches")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<form class="ui form" action="{{.Link}}" method="post">
 			<h4 class="ui top attached header">
 				{{.locale.Tr "repo.settings.branch_protection" (.Rule.RuleName|Escape) | Str2html}}
diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/runner_edit.tmpl
index 05435eeaee48..8b76aead579c 100644
--- a/templates/repo/settings/runner_edit.tmpl
+++ b/templates/repo/settings/runner_edit.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/actions/runner_edit" .}}
 	</div>
 {{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
index 29cb2e2b26ab..ab3ad40400d2 100644
--- a/templates/repo/settings/runners.tmpl
+++ b/templates/repo/settings/runners.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/actions/runner_list" .}}
 	</div>
 {{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index 04fc0c05f76e..0b89639e79d7 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
 {{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl
index 4d381384200c..fffb97100ec4 100644
--- a/templates/repo/settings/tags.tmpl
+++ b/templates/repo/settings/tags.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings edit")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{if .Repository.IsArchived}}
 			<div class="ui warning message">
 				{{.locale.Tr "repo.settings.archive.tagsettings_unavailable"}}
diff --git a/templates/repo/settings/webhook/base.tmpl b/templates/repo/settings/webhook/base.tmpl
index 2f2aab2a25e2..d524722454d7 100644
--- a/templates/repo/settings/webhook/base.tmpl
+++ b/templates/repo/settings/webhook/base.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhooks")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		{{template "repo/settings/webhook/list" .}}
 	</div>
 {{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl
index 04b7c4fad2cd..f4caa289894d 100644
--- a/templates/repo/settings/webhook/new.tmpl
+++ b/templates/repo/settings/webhook/new.tmpl
@@ -1,6 +1,5 @@
 {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings webhook")}}
 	<div class="repo-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
 			<div class="ui right">
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index 37e2f12fb4a1..4bd24436363f 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.password"}}
 		</h4>
diff --git a/templates/user/settings/appearance.tmpl b/templates/user/settings/appearance.tmpl
index 6c6ff7c7a63f..129fca26577f 100644
--- a/templates/user/settings/appearance.tmpl
+++ b/templates/user/settings/appearance.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 
 		<!-- Theme -->
 		<h4 class="ui top attached header">
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 912910b5e0d3..c88036cfdf7c 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.manage_access_token"}}
 		</h4>
diff --git a/templates/user/settings/applications_oauth2_edit.tmpl b/templates/user/settings/applications_oauth2_edit.tmpl
index 1947ceb87300..2858ecd0ee5e 100644
--- a/templates/user/settings/applications_oauth2_edit.tmpl
+++ b/templates/user/settings/applications_oauth2_edit.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 
 		{{template "user/settings/applications_oauth2_edit_form" .}}
 	</div>
diff --git a/templates/user/settings/hook_new.tmpl b/templates/user/settings/hook_new.tmpl
index 9ec6dea1981f..ac32cdd8c8bf 100644
--- a/templates/user/settings/hook_new.tmpl
+++ b/templates/user/settings/hook_new.tmpl
@@ -1,8 +1,7 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
 	<div class="user-setting-content">
 		<div class="user-setting-content">
-			{{template "base/alert" .}}
-			<h4 class="ui top attached header">
+				<h4 class="ui top attached header">
 				{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
 				<div class="ui right">
 					{{if eq .HookType "gitea"}}
diff --git a/templates/user/settings/hooks.tmpl b/templates/user/settings/hooks.tmpl
index 057b1a5f94a7..477c333220c4 100644
--- a/templates/user/settings/hooks.tmpl
+++ b/templates/user/settings/hooks.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings webhooks")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "repo/settings/webhook/list" .}}
 	</div>
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/keys.tmpl b/templates/user/settings/keys.tmpl
index d69586af8dc2..93037e7e282b 100644
--- a/templates/user/settings/keys.tmpl
+++ b/templates/user/settings/keys.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "user/settings/keys_ssh" .}}
 		{{template "user/settings/keys_principal" .}}
 		{{template "user/settings/keys_gpg" .}}
diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl
index 393373e7908f..26d165394874 100644
--- a/templates/user/settings/layout_head.tmpl
+++ b/templates/user/settings/layout_head.tmpl
@@ -3,9 +3,11 @@
 	<div class="ui container stackable grid">
 		{{template "user/settings/navbar" .ctxData}}
 		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: user-setting-content */}}
+
 {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 		</div>
-		{{/* block: admin-main-content */}}
 	</div>
 </div>
 {{end}}
diff --git a/templates/user/settings/organization.tmpl b/templates/user/settings/organization.tmpl
index 6f92140387bf..4ba98c8e0826 100644
--- a/templates/user/settings/organization.tmpl
+++ b/templates/user/settings/organization.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings organization")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.orgs"}}
 			{{if .SignedUser.CanCreateOrganization}}
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index f6b2ead6bc7e..a35597335ba2 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "package/shared/cleanup_rules/list" .}}
 		{{template "package/shared/cargo" .}}
 
diff --git a/templates/user/settings/packages_cleanup_rules_edit.tmpl b/templates/user/settings/packages_cleanup_rules_edit.tmpl
index f0552f1065e5..522b524882c9 100644
--- a/templates/user/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/user/settings/packages_cleanup_rules_edit.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "package/shared/cleanup_rules/edit" .}}
 	</div>
 {{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 1308608a16a5..92fbf5814cba 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings profile")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.public_profile"}}
 		</h4>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index d5ff52e31fb7..5c833eb9a453 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings repos")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.repos"}}
 		</h4>
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/secrets.tmpl
index eba14b610776..a831453f2a2e 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/secrets.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "shared/secrets/add_list" .}}
 	</div>
 
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index f7fa3eb15b6d..aee0456b8f55 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		{{template "user/settings/security/twofa" .}}
 		{{template "user/settings/security/webauthn" .}}
 		{{template "user/settings/security/accountlinks" .}}
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index c10277565cca..0ff0beb1bcee 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,6 +1,5 @@
 {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa")}}
 	<div class="user-setting-content">
-		{{template "base/alert" .}}
 		<h4 class="ui top attached header">
 			{{.locale.Tr "settings.twofa_enroll"}}
 		</h4>

From 4dcf7c18a4aba914c597f90593cb7e994f099ce7 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Sun, 23 Apr 2023 15:00:24 +0800
Subject: [PATCH 21/21] make org use layout

---
 templates/admin/layout_footer.tmpl             |  3 ++-
 templates/org/settings/applications.tmpl       | 15 +++------------
 .../org/settings/applications_oauth2_edit.tmpl | 14 +++-----------
 templates/org/settings/delete.tmpl             | 17 +++++------------
 templates/org/settings/hook_new.tmpl           | 16 ++++------------
 templates/org/settings/hooks.tmpl              | 15 +++------------
 templates/org/settings/labels.tmpl             | 18 ++++--------------
 templates/org/settings/layout_footer.tmpl      | 11 +++++++++++
 templates/org/settings/layout_head.tmpl        | 14 ++++++++++++++
 templates/org/settings/options.tmpl            | 15 +++------------
 templates/org/settings/packages.tmpl           | 15 +++------------
 .../settings/packages_cleanup_rules_edit.tmpl  | 15 +++------------
 .../packages_cleanup_rules_preview.tmpl        | 14 +++-----------
 templates/org/settings/runners.tmpl            | 14 +++-----------
 templates/org/settings/runners_edit.tmpl       | 14 +++-----------
 templates/org/settings/secrets.tmpl            | 16 +++-------------
 templates/repo/settings/layout_footer.tmpl     |  3 ++-
 templates/user/settings/layout_footer.tmpl     |  3 ++-
 18 files changed, 74 insertions(+), 158 deletions(-)
 create mode 100644 templates/org/settings/layout_footer.tmpl
 create mode 100644 templates/org/settings/layout_head.tmpl

diff --git a/templates/admin/layout_footer.tmpl b/templates/admin/layout_footer.tmpl
index a200e34d7ca9..8d6e564d515e 100644
--- a/templates/admin/layout_footer.tmpl
+++ b/templates/admin/layout_footer.tmpl
@@ -2,8 +2,9 @@
 <div class="page-content">
 	<div class="admin-layout-right">
 		<div>
-		{{/* block: admin-main-content */}}
+		{{/* block: admin-setting-content */}}
 {{end}}
+
 		</div>
 	</div>
 </div>
diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl
index 35736df591eb..5934f99de7f8 100644
--- a/templates/org/settings/applications.tmpl
+++ b/templates/org/settings/applications.tmpl
@@ -1,18 +1,9 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{.locale.Tr "settings.applications"}}
 				</h4>
 
 				{{template "user/settings/applications_oauth2_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl
index a805d5058481..987803ac26a5 100644
--- a/templates/org/settings/applications_oauth2_edit.tmpl
+++ b/templates/org/settings/applications_oauth2_edit.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/header" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
 				{{template "user/settings/applications_oauth2_edit_form" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index 69e226f410a7..4b7e74fe29a1 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,11 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings delete">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings delete")}}
+
+			<div class="org-setting-content">
 				<h4 class="ui top attached error header">
 					{{.locale.Tr "org.settings.delete_account"}}
 				</h4>
@@ -25,9 +20,6 @@
 					</form>
 				</div>
 			</div>
-		</div>
-	</div>
-</div>
 
 <div class="ui small basic delete modal">
 	<div class="ui icon header">
@@ -39,4 +31,5 @@
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index 4685225f4c86..1bf74fb7ba0e 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings new webhook">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
 					<div class="ui right">
@@ -50,7 +44,5 @@
 
 				{{template "repo/settings/webhook/history" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index c94a12368ea2..9f307968f8e4 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -1,14 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}}
+			<div class="org-setting-content">
 				{{template "repo/settings/webhook/list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl
index e04b39127162..c3917861f6ee 100644
--- a/templates/org/settings/labels.tmpl
+++ b/templates/org/settings/labels.tmpl
@@ -1,10 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings labels">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-				<div class="ui twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
+				<div class="org-setting-content">
 					<div class="ui grid">
 						<div class="left floated twelve wide column">
 							{{$.locale.Tr "org.settings.labels_desc" | Str2html}}
@@ -17,13 +12,8 @@
 					</div>
 					<div class="ui divider"></div>
 					{{template "repo/issue/labels/label_new" .}}
-					{{template "base/alert" .}}
 					{{template "repo/issue/labels/label_list" .}}
 				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
 {{template "repo/issue/labels/edit_delete_label" .}}
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
+
diff --git a/templates/org/settings/layout_footer.tmpl b/templates/org/settings/layout_footer.tmpl
new file mode 100644
index 000000000000..09d88c0c15eb
--- /dev/null
+++ b/templates/org/settings/layout_footer.tmpl
@@ -0,0 +1,11 @@
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+<div class="page-content">
+	<div class="org-layout-right">
+		<div>
+		{{/* block: org-setting-content */}}
+{{end}}
+
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl
new file mode 100644
index 000000000000..c245a3bf6246
--- /dev/null
+++ b/templates/org/settings/layout_head.tmpl
@@ -0,0 +1,14 @@
+{{template "base/head" .ctxData}}
+<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
+	{{template "org/header" .ctxData}}
+	<div class="ui container stackable grid">
+		{{template "org/settings/navbar" .ctxData}}
+		<div class="twelve wide column">
+			{{template "base/alert" .ctxData}}
+			{{/* block: org-setting-content */}}
+
+{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
+		</div>
+	</div>
+</div>
+{{end}}
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 56ad5fa89695..6f9f07654876 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,11 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
+			<div class="org-setting-content">
 				<h4 class="ui top attached header">
 					{{.locale.Tr "org.settings.options"}}
 				</h4>
@@ -101,7 +95,4 @@
 					</form>
 				</div>
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages.tmpl b/templates/org/settings/packages.tmpl
index 04e5d45b5070..91106c3f15da 100644
--- a/templates/org/settings/packages.tmpl
+++ b/templates/org/settings/packages.tmpl
@@ -1,15 +1,6 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/list" .}}
 				{{template "package/shared/cargo" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages_cleanup_rules_edit.tmpl b/templates/org/settings/packages_cleanup_rules_edit.tmpl
index 195c21da0c54..ff4c2dd65163 100644
--- a/templates/org/settings/packages_cleanup_rules_edit.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_edit.tmpl
@@ -1,14 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/edit" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/packages_cleanup_rules_preview.tmpl b/templates/org/settings/packages_cleanup_rules_preview.tmpl
index 771e6cb8f3dc..5a2f06122518 100644
--- a/templates/org/settings/packages_cleanup_rules_preview.tmpl
+++ b/templates/org/settings/packages_cleanup_rules_preview.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages admin">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
+			<div class="org-setting-content">
 				{{template "package/shared/cleanup_rules/preview" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl
index 7c70f6d956b4..2350f68ba9e9 100644
--- a/templates/org/settings/runners.tmpl
+++ b/templates/org/settings/runners.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+			<div class="org-setting-content">
 				{{template "shared/actions/runner_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/runners_edit.tmpl b/templates/org/settings/runners_edit.tmpl
index 931ca3701ab1..acd67a4d7bd5 100644
--- a/templates/org/settings/runners_edit.tmpl
+++ b/templates/org/settings/runners_edit.tmpl
@@ -1,13 +1,5 @@
-{{template "base/head" .}}
-<div class="page-content organization settings runners">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="twelve wide column content">
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+			<div class="org-setting-content">
 				{{template "shared/actions/runner_edit" .}}
 			</div>
-		</div>
-	</div>
-</div>
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl
index 909c16f4484e..68ce415f41f2 100644
--- a/templates/org/settings/secrets.tmpl
+++ b/templates/org/settings/secrets.tmpl
@@ -1,15 +1,5 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
-	{{template "org/header" .}}
-	<div class="ui container">
-		<div class="ui grid">
-			{{template "org/settings/navbar" .}}
-			<div class="ui twelve wide column content">
-				{{template "base/alert" .}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}}
+			<div class="org-setting-content">
 				{{template "shared/secrets/add_list" .}}
 			</div>
-		</div>
-	</div>
-</div>
-
-{{template "base/footer" .}}
+{{template "org/settings/layout_footer" .}}
diff --git a/templates/repo/settings/layout_footer.tmpl b/templates/repo/settings/layout_footer.tmpl
index 6c22d522c1b3..60cad3ffb9d5 100644
--- a/templates/repo/settings/layout_footer.tmpl
+++ b/templates/repo/settings/layout_footer.tmpl
@@ -2,8 +2,9 @@
 <div class="page-content">
 	<div class="repo-layout-right">
 		<div>
-		{{/* block: repo-main-content */}}
+		{{/* block: repo-setting-content */}}
 {{end}}
+
 		</div>
 	</div>
 </div>
diff --git a/templates/user/settings/layout_footer.tmpl b/templates/user/settings/layout_footer.tmpl
index 43f2edea1e71..46120d5102ee 100644
--- a/templates/user/settings/layout_footer.tmpl
+++ b/templates/user/settings/layout_footer.tmpl
@@ -2,8 +2,9 @@
 <div class="page-content">
 	<div class="user-layout-right">
 		<div>
-		{{/* block: user-main-content */}}
+		{{/* block: user-setting-content */}}
 {{end}}
+
 		</div>
 	</div>
 </div>