diff --git a/ArchiveState.go b/ArchiveState.go
index 70e9636..2032371 100644
--- a/ArchiveState.go
+++ b/ArchiveState.go
@@ -296,29 +296,28 @@ func (this *ArchiveState) renderTemplateHead(w http.ResponseWriter) {
 				<a style="display:none;" id="monthnext" accesskey="k" href="` + html.EscapeString(nextMonthLink) + `">
 
 				<a class="btn" href="` + pageBase + `/page-0">&laquo;</a>
-				<a class="btn" id="pgprev" accesskey="h" title="Previous page (Alt+H)" href="` + pageBase + `/page-` + fmt.Sprintf("%d", previousPage) + `">&lsaquo;</a>
-				` + fmt.Sprintf("%d", this.page) + `
-				<a class="btn" id="pgnext" accesskey="l" title="Next page (Alt+L)" href="` + pageBase + `/page-` + fmt.Sprintf("%d", nextPage) + `">&rsaquo;</a>
+				<a class="btn" accesskey="h" title="Previous page (Alt+H)" href="` + pageBase + `/page-` + fmt.Sprintf("%d", previousPage) + `">&lsaquo;</a>
+				<span class="current-page">` + fmt.Sprintf("%d", this.page) + `</span>
+				<a class="btn" accesskey="l" title="Next page (Alt+L)" href="` + pageBase + `/page-` + fmt.Sprintf("%d", nextPage) + `">&rsaquo;</a>
 				<a class="btn" href="` + pageBase + `">&raquo;</a>
 		`))
 	}
 
 	w.Write([]byte(`
-					<div class="pad"></div>
-				</span>
+			</span>
 
-				<span class="area-search">	
-					<form method="GET">
-						<input type="hidden" name="h" value="` + html.EscapeString(this.logBestSlug) + `">
-						<input type="text" id="searchbox" name="q" value="` + html.EscapeString(this.query) + `" placeholder="Search..." accesskey="m" title="Search (Alt+M)">
-						<input type="submit" value="&raquo;">
-						<input type="checkbox" class="layout-pushdown" name="rx" value="1" title="Regular Expression" ` + attr(this.queryIsRegex, "checked") + `>
-					</form>
-				</span>
-				
-			</div>
+			<span class="area-search">
+				<form method="GET">
+					<input type="hidden" name="h" value="` + html.EscapeString(this.logBestSlug) + `">
+					<input type="text" id="searchbox" name="q" value="` + html.EscapeString(this.query) + `" placeholder="Search..." accesskey="m" title="Search (Alt+M)">
+					<input type="submit" value="&raquo;">
+					<input type="checkbox" class="layout-pushdown" name="rx" value="1" title="Regular Expression" ` + attr(this.queryIsRegex, "checked") + `>
+				</form>
+			</span>
+			
+		</div>
 
-			<div class="layout-body" id="chatarea">
+		<div class="layout-body" id="chatarea">
 	`))
 
 	// Header ends
diff --git a/static/style.css b/static/style.css
index cc36d88..cc218c8 100644
--- a/static/style.css
+++ b/static/style.css
@@ -96,11 +96,18 @@ select {
 .nav {      
 	background: #DDD;
 	box-shadow: 0px 4px 24px #CCC;
+	
+	font-size:0; /* remove phantom spaces between elements */
 }
 .nav form {
 	display: inline;
 }
 
+.nav .btn, .nav .current-page, .nav select {
+	font-size: 12px;
+	line-height: 12px;
+}
+
 .nav .btn {
 	background: white;
 	color:black;
@@ -211,7 +218,7 @@ select {
 		text-align:center;
 	}
 	
-	.nav, .nav select {	
+	.nav .btn, .nav .current-page, .nav select {
 		font-size: 16px;
 		line-height:16px;
 	}
@@ -236,7 +243,9 @@ select {
 	}
 	
 	.area-search {
+		display:block;
 		float:none;
+		margin-top: 4px;
 	}
 	
 	#searchbox {