diff --git a/doc/style.css b/doc/style.css
index 1d8ccd0ead3..d5b305984a5 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -129,19 +129,25 @@ div#heading a {
 
 div#topbar {
 	background: #E0EBF5;
+	height: 64px;
 }
 
 body {
 	text-align: center;
 }
 div#page,
-div#topbar .container {
+div#topbar > .container {
 	clear: both;
 	text-align: left;
 	margin-left: auto;
 	margin-right: auto;
+	padding: 0 20px;
 	width: 900px;
 }
+div#page.wide,
+div#topbar > .wide {
+	width: auto;
+}
 div#plusone {
 	float: right;
 }
@@ -182,6 +188,8 @@ div#blog .read a {
 }
 
 div#menu {
+	float: right;
+	min-width: 590px;
 	padding: 10px 0;
 	text-align: right;
 }
diff --git a/lib/godoc/godoc.html b/lib/godoc/godoc.html
index 62deed745b6..7efed83b922 100644
--- a/lib/godoc/godoc.html
+++ b/lib/godoc/godoc.html
@@ -15,10 +15,9 @@
 </head>
 <body>
 
-<div id="topbar"><div class="container">
+<div id="topbar"><div class="container{{if .Title}} wide{{end}}">
 
 <form method="GET" action="/search">
-<div id="heading"><a href="/">The Go Programming Language</a></div>
 <div id="menu">
 <a href="/doc/">Documents</a>
 <a href="/ref/">References</a>
@@ -27,13 +26,12 @@
 <a href="/help/">Help</a>
 <input type="text" id="search" name="q" class="inactive" value="Search">
 </div>
+<div id="heading"><a href="/">The Go Programming Language</a></div>
 </form>
 
 </div></div>
 
-<div id="page">
-
-<div id="content">
+<div id="page"{{if .Title}} class="wide"{{end}}>
 
 {{with .Title}}
   <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
@@ -52,8 +50,6 @@
 
 </div>
 
-</div>
-
 <div id="copyright">
 Build version {{html .Version}}.
 Except as noted, this content is licensed under a
