diff --git a/content/docs/guides/_index.md b/content/docs/guides/_index.md
index 09ef36a..70effa1 100644
--- a/content/docs/guides/_index.md
+++ b/content/docs/guides/_index.md
@@ -1,6 +1,7 @@
 ---
 layout: guides
 title: Guides
+weight: 2
 ---
 
 This document introduces you to gRPC and protocol buffers. gRPC can use
diff --git a/content/docs/quickstart/_index.md b/content/docs/quickstart/_index.md
index 1b73b19..92f5454 100644
--- a/content/docs/quickstart/_index.md
+++ b/content/docs/quickstart/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Quick Start
 layout: quickstart
+weight: 1
 ---
 <p class="lead">
 Get started with gRPC
diff --git a/content/docs/reference/_index.html b/content/docs/reference/_index.html
index dc752ce..8a75d62 100644
--- a/content/docs/reference/_index.html
+++ b/content/docs/reference/_index.html
@@ -4,6 +4,7 @@ headline: 'Language Specific API Reference'
 layout: docs
 title: Reference
 type: markdown
+weight: 4
 ---
   <p class="lead">Links to the language specific automatically generated API reference documentation.</p>
 
diff --git a/content/docs/samples/_index.md b/content/docs/samples/_index.md
index 4e8575f..5434ebf 100644
--- a/content/docs/samples/_index.md
+++ b/content/docs/samples/_index.md
@@ -4,7 +4,9 @@ headline: 'gRPC Samples'
 layout: docs
 title: Samples
 type: markdown
+weight: 5
 ---
+
 <p class="lead">Here are some sample apps to help developers build certain functionalities</p>
 
 <ul>
diff --git a/content/docs/talks/_index.md b/content/docs/talks/_index.md
index 2d20af8..1177932 100644
--- a/content/docs/talks/_index.md
+++ b/content/docs/talks/_index.md
@@ -1,7 +1,9 @@
 ---
 layout: docs
 title: Presentations & Talks
+short: Presentations
 type: markdown
+weight: 6
 ---
 
 <p class="lead">gRPC has been talked about in many conferences and sessions. Here are a few interesting ones:</p>
diff --git a/content/docs/tutorials/_index.md b/content/docs/tutorials/_index.md
index 7d3e5a6..9f68236 100644
--- a/content/docs/tutorials/_index.md
+++ b/content/docs/tutorials/_index.md
@@ -1,6 +1,7 @@
 ---
 layout: tutorials
 title: Tutorials
+weight: 3
 ---
 
 This section contains tutorials for each of our supported languages. They
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index d0668c5..04bfd6c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -35,8 +35,8 @@
       <div class="row">
         <div class="topbanner{{ if not .IsHome }}sub{{ end }}">
           <nav class="navbar navbar-expand-md navbar-dark topnav">
-            <a class="navbar-brand" href="{{ .Site.BaseURL }}">
-              <img src="{{ .Site.BaseURL }}img/grpc-logo.png" width="114" height="50">
+            <a class="navbar-brand" href="/">
+              <img src="/img/grpc-logo.png" width="114" height="50">
             </a>
 
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -46,10 +46,10 @@
             <div class="topnav, collapse navbar-collapse" id="navbarSupportedContent" style="float:right !important">
               <ul class="navbar-nav ml-auto">
                 <li class="nav-item {{ if in .RelPermalink "about" }}active{{ end }}">
-                  <a class="nav-link" href="{{ .Site.BaseURL }}about/">About</a>
+                  <a class="nav-link" href="/about/">About</a>
                 </li>
                 <li class="nav-item dropdown {{ if in .RelPermalink "docs" }}active{{ end }}">
-                  <a class="nav-link dropdown-toggle" href="{{ .Site.BaseURL }}docs/" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <a class="nav-link dropdown-toggle" href="/docs/" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     Docs
                   </a>
 
diff --git a/layouts/partials/docs-topnav.html b/layouts/partials/docs-topnav.html
index c80e149..5fa32be 100644
--- a/layouts/partials/docs-topnav.html
+++ b/layouts/partials/docs-topnav.html
@@ -1,9 +1,17 @@
+{{ $docsSections   := (index (where site.Sections "Section" "docs") 0).Sections }}
+{{ $isDocsHome     := eq .RelPermalink "/docs/" }}
+{{ $currentSection := .CurrentSection.Title }}
 <div class="subnav d-none d-md-block">
-  <a href="{{ .Site.BaseURL }}docs/" {{ if eq (countrunes .RelPermalink) 6 }} class="active"{{ end }}>Overview</a>
-|  <a href="{{ .Site.BaseURL }}docs/quickstart/" {{ if in .RelPermalink "quickstart" }} class="active"{{ end }}>Quick Start</a>
-|  <a href="{{ .Site.BaseURL }}docs/guides/" {{ if in .RelPermalink "guides" }} class="active"{{ end }}>Guides</a>
-|  <a href="{{ .Site.BaseURL }}docs/tutorials/" {{ if in .RelPermalink "tutorials" }} class="active"{{ end }}>Tutorials</a>
-|  <a href="{{ .Site.BaseURL }}docs/reference/" {{ if in .RelPermalink "reference" }} class="active"{{ end }}>Reference</a>
-|  <a href="{{ .Site.BaseURL }}docs/samples/" {{ if in .RelPermalink "samples" }} class="active"{{ end }}>Samples</a>
-|  <a href="{{ .Site.BaseURL }}docs/talks/" {{ if in .RelPermalink "talks" }} class="active"{{ end }}>Presentations</a>
+  <a href="/docs"{{ if $isDocsHome }} class="active"{{ end }}>
+    Overview
+  </a>
+
+  {{ range $docsSections }}
+  {{ $isCurrentSection := eq $currentSection .CurrentSection.Title }}
+  {{ $title := cond (isset .Params "short") .Params.short .Title }}
+  |
+  <a href="{{ .RelPermalink }}"{{ if $isCurrentSection }} class="active"{{ end }}>
+    {{ $title }}
+  </a>
+  {{ end }}
 </div>