diff --git a/less/admin.less b/less/admin.less
index 183040c..9c4a7c2 100644
--- a/less/admin.less
+++ b/less/admin.less
@@ -1,31 +1,44 @@
 .edit-page {
 	font-size: 1em;
 	min-height: 12em;
 }
 header.admin {
 	margin: 0;
 
 	h1 + a {
 		margin-left: 1em;
 	}
 }
+nav#admin {
+	display: block;
+	margin: 0.5em 0;
+	a {
+		color: @primary;
+		&:first-child {
+			margin-left: 0;
+		}
+		&.selected {
+			font-weight: bold;
+		}
+	}
+}
 .pager {
 	display: flex;
 	justify-content: center;
 
 	a {
 		color: #333;
 		font-family: @sansFont;
 		font-size: 0.86em;
 		padding: 0.5em 1em;
 		border: 1px solid #ccc;
 		&:hover {
 			text-decoration: none;
 			background: #efefef;
 		}
 		&.selected {
 			cursor: default;
 			background: #ccc;
 		}
 	}
 }
diff --git a/templates/user/admin.tmpl b/templates/user/admin.tmpl
index 7628a48..a6e1389 100644
--- a/templates/user/admin.tmpl
+++ b/templates/user/admin.tmpl
@@ -1,211 +1,211 @@
 {{define "admin"}}
 {{template "header" .}}
 
 <style type="text/css">
 h2 {font-weight: normal;}
 ul.pagenav {list-style: none;}
 form {
 	margin: 0 0 2em;
 }
 form dt {
 	line-height: inherit;
 }
 .ui.divider:not(.vertical):not(.horizontal) {
 	border-top: 1px solid rgba(34,36,38,.15);
 	border-bottom: 1px solid rgba(255,255,255,.1);
 }
 .ui.divider {
 	margin: 1rem 0;
 	line-height: 1;
 	height: 0;
 	font-weight: 700;
 	text-transform: uppercase;
 	letter-spacing: .05em;
 	color: rgba(0,0,0,.85);
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
 	-webkit-tap-highlight-color: transparent;
 	font-size: 1rem;
 }
 .invisible {
 	display: none;
 }
 </style>
 
 <script>
 function savePage(el) {
 	var $btn = el.querySelector('input[type=submit]');
 	$btn.value = 'Saving...';
 	$btn.disabled = true;
 }
 </script>
 
 <div class="content-container snug">
-	<h1>Admin Dashboard</h1>
+	{{template "admin-header" .}}
 
 	{{if .Message}}<p>{{.Message}}</p>{{end}}
 
+	<h2>On this page</h2>
 	<ul class="pagenav">
 		{{if not .SingleUser}}
-		<li><a href="/admin/users">View Users</a></li>
 		<li><a href="#page-about">Edit About page</a></li>
 		<li><a href="#page-privacy">Edit Privacy page</a></li>
 		{{end}}
 		<li><a href="#reset-pass">Reset user password</a></li>
 		<li><a href="#config">Configuration</a></li>
 		<li><a href="#monitor">Application monitor</a></li>
 	</ul>
 
 	<hr />
 
 	{{if not .SingleUser}}
 	<h2>Site</h2>
 
 	<h3 id="page-about">About page</h3>
 	<p>Describe what your instance is <a href="/about" target="page">about</a>. <em>Accepts Markdown</em>.</p>
 	<form method="post" action="/admin/update/about" onsubmit="savePage(this)">
 		<textarea id="about-editor" class="section codable norm edit-page" name="content">{{.AboutPage}}</textarea>
 		<input type="submit" value="Save" />
 	</form>
 
 	<h3 id="page-privacy">Privacy page</h3>
 	<p>Outline your <a href="/privacy" target="page">privacy policy</a>. <em>Accepts Markdown</em>.</p>
 	<form method="post" action="/admin/update/privacy" onsubmit="savePage(this)">
 		<textarea id="privacy-editor" class="section codable norm edit-page" name="content">{{.PrivacyPage}}</textarea>
 		<input type="submit" value="Save" />
 	</form>
 
 	<hr />
 	{{end}}
 
 	<h2>Users</h2>
 
 	<h3><a name="reset-pass"></a>reset password</h3>
 	<pre><code>writefreely --reset-pass &lt;username&gt;</code></pre>
 
 	<hr />
 
 	<h2><a name="config"></a>App Configuration</h2>
 
 	{{if .ConfigMessage}}<p class="success" style="text-align: center">{{.ConfigMessage}}</p>{{end}}
 
 	<form action="/admin/update/config" method="post">
 	<div class="ui attached table segment">
 		<dl class="dl-horizontal admin-dl-horizontal">
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}>Site Name</dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}><input type="text" name="site_name" id="site_name" class="inline" value="{{.Config.SiteName}}" style="width: 14em;" /></dd>
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}>Site Description</dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}><input type="text" name="site_desc" id="site_desc" class="inline" value="{{.Config.SiteDesc}}" style="width: 14em;" /></dd>
 			<dt>Host</dt>
 			<dd>{{.Config.Host}}</dd>
 			<dt>User Mode</dt>
 			<dd>{{if .Config.SingleUser}}Single user{{else}}Multiple users{{end}}</dd>
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}><label for="open_registration">Open Registrations</label></dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}><input type="checkbox" name="open_registration" id="open_registration" {{if .Config.OpenRegistration}}checked="checked"{{end}} /></dd>
 			<dt><label for="min_username_len">Minimum Username Length</label></dt>
 			<dd><input type="number" name="min_username_len" id="min_username_len" class="inline" min="1" max="100" value="{{.Config.MinUsernameLen}}" /></dd>
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}><label for="max_blogs">Maximum Blogs per User</label></dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}><input type="number" name="max_blogs" id="max_blogs" class="inline" min="1" value="{{.Config.MaxBlogs}}" /></dd>
 			<dt><label for="federation">Federation</label></dt>
 			<dd><input type="checkbox" name="federation" id="federation" {{if .Config.Federation}}checked="checked"{{end}} /></dd>
 			<dt><label for="public_stats">Public Stats</label></dt>
 			<dd><input type="checkbox" name="public_stats" id="public_stats" {{if .Config.PublicStats}}checked="checked"{{end}} /></dd>
 			<dt><label for="private">Private Instance</label></dt>
 			<dd><input type="checkbox" name="private" id="private" {{if .Config.Private}}checked="checked"{{end}} /></dd>
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}><label for="local_timeline">Local Timeline</label></dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}><input type="checkbox" name="local_timeline" id="local_timeline" {{if .Config.LocalTimeline}}checked="checked"{{end}} /></dd>
 			<dt{{if .Config.SingleUser}} class="invisible"{{end}}><label for="user_invites">Allow sending invitations by</label></dt>
 			<dd{{if .Config.SingleUser}} class="invisible"{{end}}>
 				<select name="user_invites" id="user_invites">
 					<option value="none" {{if eq .Config.UserInvites ""}}selected="selected"{{end}}>No one</option>
 					<option value="user" {{if eq .Config.UserInvites "user"}}selected="selected"{{end}}>Users</option>
 					<option value="admin" {{if eq .Config.UserInvites "admin"}}selected="selected"{{end}}>Admins</option>
 				</select>
 			</dd>
 		</dl>
 		<input type="submit" value="Save Configuration" />
 	</div>
 	</form>
 
 	<hr />
 
 	<h2><a name="monitor"></a>Application</h2>
 
 	<div class="ui attached table segment">
 		<dl class="dl-horizontal admin-dl-horizontal">
 			<dt>WriteFreely</dt>
 			<dd>{{.Version}}</dd>
 			<dt>Server Uptime</dt>
 			<dd>{{.SysStatus.Uptime}}</dd>
 			<dt>Current Goroutines</dt>
 			<dd>{{.SysStatus.NumGoroutine}}</dd>
 			<div class="ui divider"></div>
 			<dt>Current memory usage</dt>
 			<dd>{{.SysStatus.MemAllocated}}</dd>
 			<dt>Total mem allocated</dt>
 			<dd>{{.SysStatus.MemTotal}}</dd>
 			<dt>Memory obtained</dt>
 			<dd>{{.SysStatus.MemSys}}</dd>
 			<dt>Pointer lookup times</dt>
 			<dd>{{.SysStatus.Lookups}}</dd>
 			<dt>Memory allocate times</dt>
 			<dd>{{.SysStatus.MemMallocs}}</dd>
 			<dt>Memory free times</dt>
 			<dd>{{.SysStatus.MemFrees}}</dd>
 			<div class="ui divider"></div>
 			<dt>Current heap usage</dt>
 			<dd>{{.SysStatus.HeapAlloc}}</dd>
 			<dt>Heap memory obtained</dt>
 			<dd>{{.SysStatus.HeapSys}}</dd>
 			<dt>Heap memory idle</dt>
 			<dd>{{.SysStatus.HeapIdle}}</dd>
 			<dt>Heap memory in use</dt>
 			<dd>{{.SysStatus.HeapInuse}}</dd>
 			<dt>Heap memory released</dt>
 			<dd>{{.SysStatus.HeapReleased}}</dd>
 			<dt>Heap objects</dt>
 			<dd>{{.SysStatus.HeapObjects}}</dd>
 			<div class="ui divider"></div>
 			<dt>Bootstrap stack usage</dt>
 			<dd>{{.SysStatus.StackInuse}}</dd>
 			<dt>Stack memory obtained</dt>
 			<dd>{{.SysStatus.StackSys}}</dd>
 			<dt>MSpan structures in use</dt>
 			<dd>{{.SysStatus.MSpanInuse}}</dd>
 			<dt>MSpan structures obtained</dt>
 			<dd>{{.SysStatus.HeapSys}}</dd>
 			<dt>MCache structures in use</dt>
 			<dd>{{.SysStatus.MCacheInuse}}</dd>
 			<dt>MCache structures obtained</dt>
 			<dd>{{.SysStatus.MCacheSys}}</dd>
 			<dt>Profiling bucket hash table obtained</dt>
 			<dd>{{.SysStatus.BuckHashSys}}</dd>
 			<dt>GC metadata obtained</dt>
 			<dd>{{.SysStatus.GCSys}}</dd>
 			<dt>Other system allocation obtained</dt>
 			<dd>{{.SysStatus.OtherSys}}</dd>
 			<div class="ui divider"></div>
 			<dt>Next GC recycle</dt>
 			<dd>{{.SysStatus.NextGC}}</dd>
 			<dt>Since last GC</dt>
 			<dd>{{.SysStatus.LastGC}}</dd>
 			<dt>Total GC pause</dt>
 			<dd>{{.SysStatus.PauseTotalNs}}</dd>
 			<dt>Last GC pause</dt>
 			<dd>{{.SysStatus.PauseNs}}</dd>
 			<dt>GC times</dt>
 			<dd>{{.SysStatus.NumGC}}</dd>
 		</dl>
 	</div>
 </div>
 
 <script>
 history.replaceState(null, "", "/admin"+window.location.hash);
 </script>
 
 {{template "footer" .}}
 
 {{template "body-end" .}}
 {{end}}
diff --git a/templates/user/admin/view-user.tmpl b/templates/user/admin/view-user.tmpl
index 5f2a032..2a74e5b 100644
--- a/templates/user/admin/view-user.tmpl
+++ b/templates/user/admin/view-user.tmpl
@@ -1,88 +1,87 @@
 {{define "view-user"}}
 {{template "header" .}}
 <style>
 table.classy th {
 	text-align: left;
 }
 h3 {
 	font-weight: normal;
 }
 </style>
 <div class="snug content-container">
 	{{template "admin-header" .}}
-	<p><a href="/admin/users">View Users</a></p>
 
 	<h2 id="posts-header">{{.User.Username}}</h2>
 
 	<table class="classy export">
 		<tr>
 			<th>No.</th>
 			<td>{{.User.ID}}</td>
 		</tr>
 		<tr>
 			<th>Type</th>
 			<td>{{if .User.IsAdmin}}Admin{{else}}User{{end}}</td>
 		</tr>
 		<tr>
 			<th>Username</th>
 			<td>{{.User.Username}}</td>
 		</tr>
 		<tr>
 			<th>Joined</th>
 			<td>{{.User.CreatedFriendly}}</td>
 		</tr>
 		<tr>
 			<th>Total Posts</th>
 			<td>{{.TotalPosts}}</td>
 		</tr>
 		<tr>
 			<th>Last Post</th>
 			<td>{{if .LastPost}}{{.LastPost}}{{else}}Never{{end}}</td>
 		</tr>
 	</table>
 
 	<h2>Blogs</h2>
 
 	{{range .Colls}}
 	<h3><a href="/{{.Alias}}/">{{.Title}}</a></h3>
 	<table class="classy export">
 		<tr>
 			<th>Alias</th>
 			<td>{{.Alias}}</td>
 		</tr>
 		<tr>
 			<th>Title</th>
 			<td>{{.Title}}</td>
 		</tr>
 		<tr>
 			<th>Description</th>
 			<td>{{.Description}}</td>
 		</tr>
 		<tr>
 			<th>Visibility</th>
 			<td>{{.FriendlyVisibility}}</td>
 		</tr>
 		<tr>
 			<th>Views</th>
 			<td>{{.Views}}</td>
 		</tr>
 		<tr>
 			<th>Posts</th>
 			<td>{{.TotalPosts}}</td>
 		</tr>
 		<tr>
 			<th>Last Post</th>
 			<td>{{if .LastPost}}{{.LastPost}}{{else}}Never{{end}}</td>
 		</tr>
 		{{if $.Config.Federation}}
 		<tr>
 			<th>Fediverse Followers</th>
 			<td>{{.Followers}}</td>
 		</tr>
 		{{end}}
 	</table>
 	{{end}}
 </div>
 
 {{template "footer" .}}
 {{end}}
diff --git a/templates/user/include/header.tmpl b/templates/user/include/header.tmpl
index 76b1425..08a94c0 100644
--- a/templates/user/include/header.tmpl
+++ b/templates/user/include/header.tmpl
@@ -1,67 +1,70 @@
 {{define "header"}}<!DOCTYPE HTML>
 <html>
 <head>
 	<meta charset="utf-8">
 
 	<title>{{.PageTitle}} {{if .Separator}}{{.Separator}}{{else}}&mdash;{{end}} {{.SiteName}}</title>
 
 	<link rel="stylesheet" type="text/css" href="/css/write.css" />
 	<link rel="shortcut icon" href="/favicon.ico" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta name="theme-color" content="#888888" />
 	<meta name="apple-mobile-web-app-title" content="{{.SiteName}}">
 	<link rel="apple-touch-icon" sizes="152x152" href="/img/touch-icon-152.png">
 	<link rel="apple-touch-icon" sizes="167x167" href="/img/touch-icon-167.png">
 	<link rel="apple-touch-icon" sizes="180x180" href="/img/touch-icon-180.png">
 </head>
 <body id="me">
 	<header{{if .SingleUser}} class="singleuser"{{end}}>
 		{{if .SingleUser}}
 		<nav id="user-nav">
 			<nav class="dropdown-nav">
 				<ul><li><a href="/" title="View blog" class="title">{{.SiteName}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" />
 					<ul>
 						<li><a href="/me/c/{{.Username}}">Customize</a></li>
 						<li><a href="/me/c/{{.Username}}/stats">Stats</a></li>
 						<li class="separator"><hr /></li>
 						<li><a href="/me/settings">Settings</a></li>
 						<li><a href="/me/export">Export</a></li>
 						<li class="separator"><hr /></li>
 						<li><a href="/me/logout">Log out</a></li>
 					</ul></li>
 				</ul>
 			</nav>
 			<nav class="tabs">
 				<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>
 				<a href="/me/new">New Post</a>
 			</nav>
 		</nav>
 		{{else}}
 		<h1><a href="/" title="Return to editor">{{.SiteName}}</a></h1>
 		<nav id="user-nav">
 			<nav class="dropdown-nav">
 				<ul><li><a>{{.Username}}</a> <img class="ic-18dp" src="/img/ic_down_arrow_dark@2x.png" /><ul>
 						<li><a href="/me/settings">Account settings</a></li>
 						<li><a href="/me/export">Export</a></li>
 						{{if .CanInvite}}<li><a href="/me/invites">Invite people</a></li>{{end}}
 						<li class="separator"><hr /></li>
 						<li><a href="/me/logout">Log out</a></li>
 					</ul></li>
 				</ul>
 			</nav>
 			<nav class="tabs">
 				<a href="/me/c/"{{if eq .Path "/me/c/"}} class="selected"{{end}}>Blogs</a>
 				<a href="/me/posts/"{{if eq .Path "/me/posts/"}} class="selected"{{end}}>Drafts</a>
 			</nav>
 		</nav>
 		{{end}}
 	</header>
 	<div id="official-writing">
 {{end}}
 
 {{define "admin-header"}}
 <header class="admin">
 	<h1>Admin</h1>
-	<a href="/admin">back to dashboard</a>
+	<nav id="admin">
+		<a href="/admin" {{if eq .Path "/admin"}}class="selected"{{end}}>Dashboard</a>
+		{{if not .SingleUser}}<a href="/admin/users" {{if eq .Path "/admin/users"}}class="selected"{{end}}>Users</a>{{end}}
+	</nav>
 </header>
 {{end}}