diff --git a/content/layout/templates.md b/content/layout/templates.md
index 833546fcc..8f21aada3 100644
--- a/content/layout/templates.md
+++ b/content/layout/templates.md
@@ -22,7 +22,7 @@ The homepage of your site.
 ### [RSS](/layout/rss/)
 Used to render all rss documents.
 
-### [Index](/layout/index)
+### [Index](/layout/indexes)
 Page that list multiple pieces of content.
 
 ### [Content](/layout/content)
diff --git a/layouts/chrome/menu.html b/layouts/chrome/menu.html
index 40b3b6693..89f1c8414 100644
--- a/layouts/chrome/menu.html
+++ b/layouts/chrome/menu.html
@@ -2,40 +2,40 @@
             <li> <a href="/">Home</a></li>
             <li class="divider"></li>
             <li class="nav-header">Getting Started</li>
-            <li> <a href="/overview/installing">Installing Hugo</a></li>
-            <li> <a href="/overview/usage">Usage</a> </li>
-            <li> <a href="/overview/configuration">Configuration</a></li>
-            <li> <a href="/overview/source-directory">Source Directory Layout</a></li>
+            <li hugo-nav="/overview/installing"> <a href="/overview/installing">Installing Hugo</a></li>
+            <li hugo-nav="/overview/usage"> <a href="/overview/usage">Usage</a> </li>
+            <li hugo-nav="/overview/configuration"> <a href="/overview/configuration">Configuration</a></li>
+            <li hugo-nav="/overview/source-directory"> <a href="/overview/source-directory">Source Directory Layout</a></li>
             <li class="divider"></li>
             <li class="nav-header">Layout</li>
             <li> <a href="/layout/templates">Overview</a></li>
             <!--<li> <a href="/layout/go-templates">Go Templates</a></li>-->
-            <li> <a href="/layout/variables">Variables</a></li>
-            <li> <a href="/layout/homepage">Homepage</a></li>
-            <li> <a href="/layout/rss">RSS</a></li>
-            <li> <a href="/layout/index">Index</a></li>
-            <li> <a href="/layout/content">Content</a></li>
-            <li> <a href="/layout/views">Content Views</a></li>
-            <li> <a href="/layout/chrome">Chrome</a></li>
+            <li hugo-nav="/layout/variables"> <a href="/layout/variables">Variables</a></li>
+            <li hugo-nav="/layout/homepage"> <a href="/layout/homepage">Homepage</a></li>
+            <li hugo-nav="/layout/rss"> <a href="/layout/rss">RSS</a></li>
+            <li hugo-nav="/layout/indexes"> <a href="/layout/indexes">Index</a></li>
+            <li hugo-nav="/layout/content"> <a href="/layout/content">Content</a></li>
+            <li hugo-nav="/layout/views"> <a href="/layout/views">Content Views</a></li>
+            <li hugo-nav="/layout/chrome"> <a href="/layout/chrome">Chrome</a></li>
             <li class="divider"></li>
             <li class="nav-header">Content</li>
-            <li> <a href="/content/organization">Organization</a></li>
-            <li> <a href="/content/sections">Sections</a></li>
-            <li> <a href="/content/types">Types</a></li>
-            <li> <a href="/content/front-matter">Front Matter</a></li>
-            <li> <a href="/content/example">Example</a></li>
+            <li hugo-nav="/content/organization"> <a href="/content/organization">Organization</a></li>
+            <li hugo-nav="/content/sections"> <a href="/content/sections">Sections</a></li>
+            <li hugo-nav="/content/types"> <a href="/content/types">Types</a></li>
+            <li hugo-nav="/content/front-matter"> <a href="/content/front-matter">Front Matter</a></li>
+            <li hugo-nav="/content/example"> <a href="/content/example">Example</a></li>
             <li class="divider"></li>
             <li class="nav-header">Extras</li>
-            <li> <a href="/extras/shortcodes">ShortCodes</a></li>
-            <li> <a href="/extras/aliases">Aliases</a></li>
-            <li> <a href="/extras/indexes">Indexes</a></li>
-            <li> <a href="/extras/indexes/category">Example Index - Category</a></li>
+            <li hugo-nav="/extras/shortcodes"> <a href="/extras/shortcodes">ShortCodes</a></li>
+            <li hugo-nav="/extras/aliases"> <a href="/extras/aliases">Aliases</a></li>
+            <li hugo-nav="/extras/indexes"> <a href="/extras/indexes">Indexes</a></li>
+            <li hugo-nav="/extras/indexes/category"> <a href="/extras/indexes/category">Example Index - Category</a></li>
             <!--<li> <a href="/extras/indexes/series">Example Index - Series</a></li>-->
             <li class="divider"></li>
             <li class="nav-header">Meta</li>
-            <li> <a href="/meta/release-notes">Release Notes</a></li>
-            <li> <a href="/meta/roadmap">Roadmap</a> </li>
-            <li> <a href="/meta/contributing">Contributing</a></li>
-            <li> <a href="/meta/contributors">Contributors</a></li>
-            <li> <a href="/meta/license">License</a></li>
+            <li hugo-nav="/meta/release-notes"> <a href="/meta/release-notes">Release Notes</a></li>
+            <li hugo-nav="/meta/roadmap"> <a href="/meta/roadmap">Roadmap</a> </li>
+            <li hugo-nav="/meta/contributing"> <a href="/meta/contributing">Contributing</a></li>
+            <li hugo-nav="/meta/contributors"> <a href="/meta/contributors">Contributors</a></li>
+            <li hugo-nav="/meta/license"> <a href="/meta/license">License</a></li>
           </ul>