diff --git a/content/content-management/_index.md b/content/content-management/_index.md
index 26b2f606e..c7e171359 100644
--- a/content/content-management/_index.md
+++ b/content/content-management/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Content Management
-linktitle:
+linktitle: Content Management
 description: Content organization, summaries, archetypes, front matter, and supported formats.
 date: 2017-02-01
 publishdate: 2017-02-01
diff --git a/content/contribute-to-hugo/_index.md b/content/contribute-to-hugo/_index.md
index 7210713b3..325fbd0d7 100644
--- a/content/contribute-to-hugo/_index.md
+++ b/content/contribute-to-hugo/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Contribute to Hugo Development
-linktitle:
+linktitle: Contribute to Hugo Development
 description: Contribute to Hugo development and documentation.
 date: 2017-02-01
 publishdate: 2017-02-01
diff --git a/content/developer-tools/_index.md b/content/developer-tools/_index.md
index 3f8e11a93..04258b3d5 100644
--- a/content/developer-tools/_index.md
+++ b/content/developer-tools/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Developer Tools
-linktitle:
+linktitle: Developer Tools
 description: Description for the developer tools section.
 date: 2016-11-01
 publishdate: 2016-11-01
diff --git a/themes/hugodocs/layouts/_default/section.html b/themes/hugodocs/layouts/_default/section.html
index 665f182f2..b20204122 100644
--- a/themes/hugodocs/layouts/_default/section.html
+++ b/themes/hugodocs/layouts/_default/section.html
@@ -1,13 +1,21 @@
 {{ define "main" }}
+{{$base := .Site.BaseURL}}
 <main class="main">
-	<a role="button" target="_blank" class="edit-link" href="{{.Site.Params.ghrepourl}}{{.File.Path}}"><span class="edit-text">Edit</span> <i class="icon-pencil" aria-hidden="true"></i></a>
 	<header class="content-header">
-		<h1 class="page-title {{.Section}}">{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title | markdownify }}{{end}}</h1>
+		<h1 class="page-title">{{with .LinkTitle}}{{ . |markdownify}}{{else}}{{ .Title | markdownify }}{{end}}</h1>
+		<div class="content-header-links">
+		<a target="_blank" class="edit-link" href="{{.Site.Params.ghdocsrepo}}edit/master/content/{{.File.Path}}"><span class="edit">Edit Page</span><i class="icon-pencil" aria-hidden="true"></i></a>
+		{{- with .Params.godocref -}}
+		<a target="_blank" class="godoc-link" href="{{.}}" title="See the corresponding Golang Documentation for {{$.Title}}, {{$.Section}}."><span class="godocs">GoDocs</span>
+			{{ partial "svg-icons/godoc-icon.svg" .}}
+		</a>
+		{{- end -}}
+		</div>
 		{{with .Params.tags}}
 		<ul class="tags">
 			<li><i class="icon-tags"></i></li>
 			{{range .}}
-			<li><a class="tag" href="/tags/{{.|urlize}}">{{.}}</a></li>
+			<li><a class="tag" href="{{$base}}tags/{{.|urlize}}">{{.}}</a></li>
 			{{end}}
 		</ul>
 		{{end}}