diff --git a/3x/api.md b/3x/api.md
index d5b0dcf1..86248e43 100644
--- a/3x/api.md
+++ b/3x/api.md
@@ -1,6 +1,7 @@
 ---
 layout: 3x-api
 title: Express 3.x - API Reference
+menu: api
 ---
 <div id="api-doc" markdown="1">
 
diff --git a/4x/api.md b/4x/api.md
index c03b2dd9..40e26b37 100644
--- a/4x/api.md
+++ b/4x/api.md
@@ -1,6 +1,7 @@
 ---
 layout: 4x-api
 title: Express 4.x - API Reference
+menu: api
 ---
 <div id="api-doc" markdown="1">
 
diff --git a/_includes/header.html b/_includes/header.html
index 1745944f..a336b136 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -6,11 +6,10 @@
   </section>
   <div id="navbar">
       <ul id="navmenu">
-          <li><a href="/" id="home-menu" class="active">Home</a>
-          </li>
+          <li><a href="/" id="home-menu"{% if page.menu == 'home' %} class="active"{% endif %}>Home</a></li>
           <li>
               <ul id="getting-started-menu" class="menu">
-                  <li><a href="/starter/installing.html">Getting started</a>
+                  <li><a href="/starter/installing.html"{% if page.menu == 'starter' %} class="active"{% endif %}>Getting started</a>
                       <ul>
                           <li><a href="/starter/installing.html">Installing</a>
                           </li>
@@ -28,7 +27,7 @@
           </li>
           <li>
               <ul id="guide-menu" class="menu">
-                  <li><a href="/guide/routing.html">Guide</a>
+                  <li><a href="/guide/routing.html"{% if page.menu == 'guide' %} class="active"{% endif %}>Guide</a>
                       <ul>
                           <li><a href="/guide/routing.html">Routing</a>
                           </li>
@@ -52,7 +51,7 @@
           </li>
           <li>
               <ul id="application-menu" class="menu">
-                  <li><a href="/4x/api.html">API reference</a>
+                  <li><a href="/4x/api.html"{% if page.menu == 'api' %} class="active"{% endif %}>API reference</a>
                       <ul>
                           <li><a href="/4x/api.html">4.x</a>
                           </li>
@@ -66,7 +65,7 @@
           </li>
           <li>
               <ul id="advanced-topics-menu" class="menu">
-                  <li><a href="/advanced/developing-template-engines.html">Advanced topics</a>
+                  <li><a href="/advanced/developing-template-engines.html"{% if page.menu == 'advanced' %} class="active"{% endif %}>Advanced topics</a>
                       <ul>
                           <li><a href="/advanced/developing-template-engines.html">Template engines</a>
                           </li>
@@ -78,7 +77,7 @@
           </li>
           <li>
               <ul id="resources-menu" class="menu">
-                  <li><a href="/resources/glossary.html">Resources</a>
+                  <li><a href="/resources/glossary.html"{% if page.menu == 'resources' %} class="active"{% endif %}>Resources</a>
                       <ul>
                           <li><a href="/resources/glossary.html">Glossary</a>
                           </li>
diff --git a/advanced/developing-template-engines.md b/advanced/developing-template-engines.md
index 78090c54..94ed1702 100644
--- a/advanced/developing-template-engines.md
+++ b/advanced/developing-template-engines.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Developing template engines for Express
+menu: advanced
 ---
 
 # Developing template engines for Express
diff --git a/advanced/security-updates.md b/advanced/security-updates.md
index 353b0904..1ec44291 100644
--- a/advanced/security-updates.md
+++ b/advanced/security-updates.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express security updates
+menu: advanced
 ---
 
 # Security updates
diff --git a/guide/behind-proxies.md b/guide/behind-proxies.md
index ba347565..4428471b 100644
--- a/guide/behind-proxies.md
+++ b/guide/behind-proxies.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express behind proxies
+menu: guide
 ---
 
 # Express behind proxies
diff --git a/guide/database-integration.md b/guide/database-integration.md
index b8a2b3b0..5ad5933b 100644
--- a/guide/database-integration.md
+++ b/guide/database-integration.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express database integration
+menu: guide
 ---
 
 # Database integration
diff --git a/guide/debugging.md b/guide/debugging.md
index 240d06cb..25887caf 100644
--- a/guide/debugging.md
+++ b/guide/debugging.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Debugging Express
+menu: guide
 ---
 
 # Debugging Express
diff --git a/guide/error-handling.md b/guide/error-handling.md
index 5bcc53dd..acdd5086 100644
--- a/guide/error-handling.md
+++ b/guide/error-handling.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express error handling
+menu: guide
 ---
 
 # Error handling
diff --git a/guide/migrating-4.md b/guide/migrating-4.md
index 2beb6f53..c9ecd991 100644
--- a/guide/migrating-4.md
+++ b/guide/migrating-4.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Migrating to Express 4
+menu: guide
 ---
 
 # Moving to Express 4
diff --git a/guide/routing.md b/guide/routing.md
index 71ad32ea..59d88916 100644
--- a/guide/routing.md
+++ b/guide/routing.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express routing
+menu: guide
 ---
 
 # Routing
diff --git a/guide/using-middleware.md b/guide/using-middleware.md
index 51394263..8eeb87f8 100644
--- a/guide/using-middleware.md
+++ b/guide/using-middleware.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Using Express middleware
+menu: guide
 ---
 
 # Using middleware
diff --git a/guide/using-template-engines.md b/guide/using-template-engines.md
index bbc5b668..95ef0405 100644
--- a/guide/using-template-engines.md
+++ b/guide/using-template-engines.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Using template engines with Express
+menu: guide
 ---
 
 # Using template engines with Express
diff --git a/index.md b/index.md
index b563b46b..17db0ff4 100644
--- a/index.md
+++ b/index.md
@@ -1,6 +1,7 @@
 ---
 layout: home
 title: Express - Node.js web application framework
+menu: home
 ---
 
 <section id="home-content">
diff --git a/resources/applications.md b/resources/applications.md
index a992eb8c..461cf3be 100644
--- a/resources/applications.md
+++ b/resources/applications.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express applications
+menu: resources
 ---
 
 # Applications
diff --git a/resources/books-blogs.md b/resources/books-blogs.md
index 5575c143..1bb92a20 100644
--- a/resources/books-blogs.md
+++ b/resources/books-blogs.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express books and blogs
+menu: resources
 ---
 
 # Books and blogs
diff --git a/resources/community.md b/resources/community.md
index 5b236ed1..0becfecd 100644
--- a/resources/community.md
+++ b/resources/community.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express community
+menu: resources
 ---
 
 # Community
diff --git a/resources/glossary.md b/resources/glossary.md
index b485b5ef..841d501a 100644
--- a/resources/glossary.md
+++ b/resources/glossary.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express glossary
+menu: resources
 ---
 
 # Glossary
diff --git a/resources/middleware.md b/resources/middleware.md
index 51aad52b..83ff8342 100644
--- a/resources/middleware.md
+++ b/resources/middleware.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express middleware
+menu: resources
 ---
 
 # Third-party middleware
diff --git a/starter/basic-routing.md b/starter/basic-routing.md
index fdfd258b..1a999e05 100644
--- a/starter/basic-routing.md
+++ b/starter/basic-routing.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express basic routing tutorial
+menu: starter
 ---
 
 # Basic routing tutorial
diff --git a/starter/faq.md b/starter/faq.md
index 177f9ad4..58dd884b 100644
--- a/starter/faq.md
+++ b/starter/faq.md
@@ -1,6 +1,7 @@
 ---
 layout: page
-title: Express FAQ 
+title: Express FAQ
+menu: starter
 ---
 
 # FAQ
diff --git a/starter/generator.md b/starter/generator.md
index 12928f99..a0e87dff 100644
--- a/starter/generator.md
+++ b/starter/generator.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express application generator
+menu: starter
 ---
 
 # Express application generator
diff --git a/starter/hello-world.md b/starter/hello-world.md
index e9574cc6..0c8fffba 100644
--- a/starter/hello-world.md
+++ b/starter/hello-world.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Express "Hello World" example
+menu: starter
 ---
 
 # Hello world example
diff --git a/starter/installing.md b/starter/installing.md
index 1fcee39f..a9afbe6f 100644
--- a/starter/installing.md
+++ b/starter/installing.md
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Installing Express
+menu: starter
 ---
 
 # Installing