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>