diff --git a/util/doc.css b/util/doc.css
index ab653e4e..a868e444 100644
--- a/util/doc.css
+++ b/util/doc.css
@@ -7,12 +7,15 @@
 
 h2 {
   font-family: monospace;
-  margin-bottom: 2em;
   background-color: #b2c9db;
   padding: 7px;
   border-radius: 7px;
 }
 
+div.title {
+  margin-bottom: 2em;
+}
+
 ol {
   list-style: none;
   margin-bottom: 4em;
diff --git a/util/doc.go b/util/doc.go
index 50da8d2d..681b8349 100644
--- a/util/doc.go
+++ b/util/doc.go
@@ -544,7 +544,10 @@ func generate(outPath string, config *Config) (map[string]string, error) {
 
   <body>
     <div id="main">
-    <h2>{{.Name}}</h2>
+    <div class="title">
+      <h2>{{.Name}}</h2>
+      <a href="headers.html">All headers</a>
+    </div>
 
     {{range .Preamble}}<p>{{. | html | markupPipeWords}}</p>{{end}}
 
@@ -637,6 +640,9 @@ func generateIndex(outPath string, config *Config, headerDescriptions map[string
 
   <body>
     <div id="main">
+      <div class="title">
+        <h2>BoringSSL Headers</h2>
+      </div>
       <table>
         {{range .Sections}}
 	  <tr class="header"><td colspan="2">{{.Name}}</td></tr>
