diff --git a/content/about-hugo/_index.md b/content/about-hugo/_index.md
index a11681036..ffebc47ae 100644
--- a/content/about-hugo/_index.md
+++ b/content/about-hugo/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: About Hugo
linktitle: Overview
description: Hugo's features, roadmap, and license, as well as the motivation behind creating Hugo.
date: 2017-02-01
diff --git a/content/content-management/_index.md b/content/content-management/_index.md
index a9b728c87..99f33ff6f 100644
--- a/content/content-management/_index.md
+++ b/content/content-management/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Content Management
linktitle: Overview
description: Hugo makes managing large static sites easy with support for archetypes, content types, menus, cross references, summaries, and more.
date: 2017-02-01
diff --git a/content/content-management/menus.md b/content/content-management/menus.md
index 3f849ccaa..cc6fdcfec 100644
--- a/content/content-management/menus.md
+++ b/content/content-management/menus.md
@@ -21,7 +21,7 @@ Hugo has a simple yet powerful menu system that permits content to be
placed in menus with a good degree of control without a lot of work.
-*TIP:* If all you want is a simple menu for your sections, see [Section Menu for "the Lazy Blogger"]({{< relref "#section-menu-for-the-lazy-blogger" >}}).
+*TIP:* If all you want is a simple menu for your sections, see [Section Menu for "the Lazy Blogger"](#section-menu-for-the-lazy-blogger).
Some of the features of Hugo Menus:
@@ -36,7 +36,7 @@ A menu is a named array of menu entries accessible on the site under
`.Site.Menus` by name. For example, if I have a menu called `main`, I would
access it via `.Site.Menus.main`.
-If you make use of the [multilingual feature]({{< relref "content/multilingual.md#menus">}}) you can define menus language independent.
+If you make use of the [multilingual feature](content-management/multilingual-mode/) you can define menus language independent.
A menu entry has the following properties:
@@ -200,7 +200,7 @@ The following is an example:
-> **Note**: use the `absLangURL` or `relLangURL` if your theme makes use of the [multilingual feature]({{< relref "content/multilingual.md" >}}). In contrast to `absURL` and `relURL` it adds the correct language prefix to the url. [Read more]({{< relref "templates/functions.md#urls" >}}).
+> **Note**: use the `absLangURL` or `relLangURL` if your theme makes use of the [multilingual feature](/content-management/multilingual-mode/). In contrast to `absURL` and `relURL` it adds the correct language prefix to the url. [Read more](/functions/).
## Section Menu for "the Lazy Blogger"
diff --git a/content/contribute-to-hugo/_index.md b/content/contribute-to-hugo/_index.md
index 8f42b56ff..e540d19ec 100644
--- a/content/contribute-to-hugo/_index.md
+++ b/content/contribute-to-hugo/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Contribute to Hugo
linktitle: Overview
description: Contribute to Hugo development and documentation.
date: 2017-02-01
diff --git a/content/developer-tools/_index.md b/content/developer-tools/_index.md
index 344c4b04e..ee304f356 100644
--- a/content/developer-tools/_index.md
+++ b/content/developer-tools/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Developer Tools
linktitle: Overview
description: Description for the developer tools section.
date: 2016-11-01
diff --git a/content/functions/_index.md b/content/functions/_index.md
index 109568c65..29ff1c0f5 100644
--- a/content/functions/_index.md
+++ b/content/functions/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Functions
linktitle: Overview
description: Comprehensive list of Hugo templating functions, including basic and advanced usage examples.
date: 2017-02-01
diff --git a/content/getting-started/_index.md b/content/getting-started/_index.md
index 420d47315..722dff87e 100644
--- a/content/getting-started/_index.md
+++ b/content/getting-started/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Getting Started
linktitle: Overview
description: Quick start and guides for installing Hugo on your preferred operating system.
date: 2017-02-01
diff --git a/content/getting-started/install-hugo.md b/content/getting-started/install-hugo.md
index 058722129..d44c58f3f 100644
--- a/content/getting-started/install-hugo.md
+++ b/content/getting-started/install-hugo.md
@@ -22,10 +22,10 @@ The latest release can be found at [Hugo Releases][releases].
Hugo currently provides pre-built binaries for the following:
+* OS X (Darwin) for x64, i386 and ARM architectures
* Windows,
* Linux,
* FreeBSD
-* OS X (Darwin) for x64, i386 and ARM architectures
Hugo may also be compiled from source wherever the Go compiler tool chain can run---e.g., for other operating systems, including DragonFly BSD, OpenBSD, Plan 9 and Solaris. See for the full set of supported combinations of target operating systems and compilation architectures.
@@ -72,7 +72,7 @@ You may run `go get` with the `-u` option to update Hugo's dependencies:
go get -u -v github.com/spf13/hugo
```
-## Installing Hugo on OS X
+## Installing Hugo on OS X
### Assumptions
@@ -293,7 +293,7 @@ go build -o hugo main.go
Then place the `hugo` executable somewhere in your `$PATH`. You're now ready to start using Hugo.
-## Installing Hugo on Windows
+## Installing Hugo on Windows
The following aims to be a complete guide to installing Hugo on your Windows PC.
@@ -408,7 +408,7 @@ C:\Hugo\Sites\example.com>dir
{{< youtube c8fJIRNChmU >}}
-## Installing Hugo on Linux
+## Installing Hugo on Linux
### Installing From Snap
diff --git a/content/hosting-and-deployment/_index.md b/content/hosting-and-deployment/_index.md
index 00b014664..3188714e5 100644
--- a/content/hosting-and-deployment/_index.md
+++ b/content/hosting-and-deployment/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Hosting and Deployment
linktitle: Overview
description: Site builds, automated deployments, and popular hosting solutions.
date: 2016-11-01
diff --git a/content/news/_index.md b/content/news/_index.md
index ca4fc5566..1f0ba7c2c 100644
--- a/content/news/_index.md
+++ b/content/news/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: News
linktitle: Overview
description: Articles where Hugo is featured, as well as news and updates on the project itself.
date: 2017-02-01
diff --git a/content/templates/_index.md b/content/templates/_index.md
index 2cc2cbd36..d4eb43155 100644
--- a/content/templates/_index.md
+++ b/content/templates/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Templates
linktitle: Overview
description: Golang templating, template types and lookup order, shortcodes, and data.
date: 2017-02-01
diff --git a/content/themes/_index.md b/content/themes/_index.md
index 9e3c05c90..441bd59f3 100644
--- a/content/themes/_index.md
+++ b/content/themes/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Themes
linktitle: Overview
description: Install, use, and create Hugo themes.
date: 2017-02-01
diff --git a/content/troubleshooting/_index.md b/content/troubleshooting/_index.md
index 7fca43771..18c5a3f6c 100644
--- a/content/troubleshooting/_index.md
+++ b/content/troubleshooting/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Troubleshooting
linktitle: Overview
description: Frequently asked questions and known issues pulled from the Hugo Discuss forum.
date: 2017-02-01
diff --git a/content/variables-and-params/_index.md b/content/variables-and-params/_index.md
index 4f564e93e..0c5603c35 100644
--- a/content/variables-and-params/_index.md
+++ b/content/variables-and-params/_index.md
@@ -1,5 +1,5 @@
---
-title: Overview
+title: Variables and Params
linktitle: Overview
description: Page-, file-, taxonomy-, and site-level variables and parameters available in templates.
date: 2017-02-01
diff --git a/themes/hugodocs/layouts/_default/section.html b/themes/hugodocs/layouts/_default/section.html
index 16bf25271..03c216b83 100644
--- a/themes/hugodocs/layouts/_default/section.html
+++ b/themes/hugodocs/layouts/_default/section.html
@@ -3,7 +3,7 @@