diff --git a/content/docs/tutorials/async/helloasync-cpp.md b/content/docs/tutorials/async/helloasync-cpp.md
index afa1fc4..d3328f2 100644
--- a/content/docs/tutorials/async/helloasync-cpp.md
+++ b/content/docs/tutorials/async/helloasync-cpp.md
@@ -1,7 +1,9 @@
 ---
 layout: tutorials
 title: Asynchronous Basics - C++
+short: Async - C++
 aliases: [docs/tutorials/async/helloasync-cpp.html]
+type: async
 ---
 
 This tutorial shows you how to write a simple server and client in C++ using
diff --git a/content/docs/tutorials/auth/oauth2-objective-c.md b/content/docs/tutorials/auth/oauth2-objective-c.md
index dc59e28..4711149 100644
--- a/content/docs/tutorials/auth/oauth2-objective-c.md
+++ b/content/docs/tutorials/auth/oauth2-objective-c.md
@@ -1,6 +1,8 @@
 ---
 layout: tutorials
 title: OAuth2 on gRPC - Objective-C
+short: Auth - Objective-C
+type: auth
 aliases: [/docs/tutorials/auth/oauth2-objective-c.html]
 ---
 This example demonstrates how to use OAuth2 on gRPC to make
diff --git a/content/docs/tutorials/basic/android.md b/content/docs/tutorials/basic/android.md
index 6291fbf..14c67de 100644
--- a/content/docs/tutorials/basic/android.md
+++ b/content/docs/tutorials/basic/android.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Android Java
-aliases: [/docs/tutorials/basic/android.html]
+short: Android
+type: basic
 ---
 
 This tutorial provides a basic Android Java programmer's introduction to working with gRPC.
diff --git a/content/docs/tutorials/basic/c.md b/content/docs/tutorials/basic/c.md
index 63ed6b6..1b7474d 100644
--- a/content/docs/tutorials/basic/c.md
+++ b/content/docs/tutorials/basic/c.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
-title: gRPC Basics - C++ 
-aliases: [/docs/tutorials/basic/c.html]
+title: gRPC Basics - C++
+type: basic
+short: C
 ---
 This tutorial provides a basic C++ programmer's introduction to working with gRPC.
 
diff --git a/content/docs/tutorials/basic/csharp.md b/content/docs/tutorials/basic/csharp.md
index 3ac695f..0aef029 100644
--- a/content/docs/tutorials/basic/csharp.md
+++ b/content/docs/tutorials/basic/csharp.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - C#
-aliases: [/docs/tutorials/basic/csharp.html]
+type: basic
+short: C#
 ---
 This tutorial provides a basic C# programmer's introduction to working with gRPC.
 
diff --git a/content/docs/tutorials/basic/dart.md b/content/docs/tutorials/basic/dart.md
index adcad2a..87d3961 100644
--- a/content/docs/tutorials/basic/dart.md
+++ b/content/docs/tutorials/basic/dart.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Dart
-aliases: [/docs/tutorials/basic/dart.html]
+type: basic
+short: Dart
 ---
 This tutorial provides a basic Dart programmer's introduction to
 working with gRPC.
diff --git a/content/docs/tutorials/basic/go.md b/content/docs/tutorials/basic/go.md
index 7cfea7a..8188d59 100644
--- a/content/docs/tutorials/basic/go.md
+++ b/content/docs/tutorials/basic/go.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Go
-aliases: [/docs/tutorials/basic/go.html]
+type: basic
+short: Go
 ---
 This tutorial provides a basic Go programmer's introduction to
 working with gRPC.
diff --git a/content/docs/tutorials/basic/java.md b/content/docs/tutorials/basic/java.md
index 0284d2a..4914da7 100644
--- a/content/docs/tutorials/basic/java.md
+++ b/content/docs/tutorials/basic/java.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Java
-aliases: [/docs/tutorials/basic/java.html]
+type: basic
+short: Java
 ---
 This tutorial provides a basic Java programmer's introduction to
 working with gRPC.
diff --git a/content/docs/tutorials/basic/node.md b/content/docs/tutorials/basic/node.md
index a05d82f..acd2aee 100644
--- a/content/docs/tutorials/basic/node.md
+++ b/content/docs/tutorials/basic/node.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Node.js
-aliases: [/docs/tutorials/basic/node.html]
+type: basic
+short: Node
 ---
 This tutorial provides a basic Node.js programmer's introduction
 to working with gRPC.
diff --git a/content/docs/tutorials/basic/objective-c.md b/content/docs/tutorials/basic/objective-c.md
index d8f4fdf..0d293fc 100644
--- a/content/docs/tutorials/basic/objective-c.md
+++ b/content/docs/tutorials/basic/objective-c.md
@@ -1,7 +1,7 @@
 ---
 layout: tutorials
 title: gRPC Basics - Objective-C
-aliases: [/docs/tutorials/basic/objective-c.html]
+type: basic
 ---
 This tutorial provides a basic Objective-C programmer's
 introduction to working with gRPC.
diff --git a/content/docs/tutorials/basic/php.md b/content/docs/tutorials/basic/php.md
index 69d2562..406d6d8 100644
--- a/content/docs/tutorials/basic/php.md
+++ b/content/docs/tutorials/basic/php.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - PHP
-aliases: [/docs/tutorials/basic/php.html]
+type: basic
+short: PHP
 ---
 This tutorial provides a basic PHP programmer's introduction to
 working with gRPC.
diff --git a/content/docs/tutorials/basic/python.md b/content/docs/tutorials/basic/python.md
index 52d11b7..f7dfc41 100644
--- a/content/docs/tutorials/basic/python.md
+++ b/content/docs/tutorials/basic/python.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Python
-aliases: [/docs/tutorials/basic/python.html]
+type: basic
+short: Python
 ---
 This tutorial provides a basic Python programmer's introduction
 to working with gRPC.
diff --git a/content/docs/tutorials/basic/ruby.md b/content/docs/tutorials/basic/ruby.md
index a697e1a..7df4922 100644
--- a/content/docs/tutorials/basic/ruby.md
+++ b/content/docs/tutorials/basic/ruby.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Ruby
-aliases: [/docs/tutorials/basic/ruby.html]
+type: basic
+short: Ruby
 ---
 This tutorial provides a basic Ruby programmer's introduction to working with gRPC.
 
diff --git a/content/docs/tutorials/basic/web.md b/content/docs/tutorials/basic/web.md
index 2d9d2a8..6a4f3f4 100644
--- a/content/docs/tutorials/basic/web.md
+++ b/content/docs/tutorials/basic/web.md
@@ -1,7 +1,8 @@
 ---
 layout: tutorials
 title: gRPC Basics - Web
-aliases: [/docs/tutorials/basic/web.html]
+type: basic
+short: Web
 ---
 
 This tutorial provides a basic introduction on how to use
diff --git a/layouts/docs/tutorials.html b/layouts/docs/tutorials.html
index 0d712fb..65ab6fe 100644
--- a/layouts/docs/tutorials.html
+++ b/layouts/docs/tutorials.html
@@ -3,6 +3,12 @@
   {{ .Title }} – {{ .Site.Title }}
 {{ end }}
 {{ define "main" }}
+{{ $currentUrl := .RelPermalink }}
+{{ $tutorials  := where site.Pages ".Layout" "tutorials" }}
+{{ $async      := where $tutorials ".Params.type" "eq" "async" }}
+{{ $auth       := where $tutorials ".Params.type" "eq" "auth" }}
+{{ $basic      := where $tutorials ".Params.type" "eq" "basic" }}
+
             <div class="headertext">Documentation</div>
   </div>
         </div>
@@ -15,21 +21,32 @@
 <div class="quickstartcol1">
 
 <h8>Tutorials</h8>
-<a href="{{ .Site.BaseURL }}docs/tutorials/async/helloasync-cpp/" {{ if in .RelPermalink "helloasync-cpp" }}class="active"{{ end }}>Async - C++</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/auth/oauth2-objective-c/" {{ if in .RelPermalink "oauth2-objective-c" }}class="active"{{ end }}>Auth - Objective C</a>
+
+{{ range $auth }}
+{{ $isCurrentPage := eq $currentUrl .RelPermalink }}
+{{ $title := .Params.short }}
+<a href="{{ .RelPermalink }}"{{ if $isCurrentPage }} class="active"{{ end }}>
+  {{ $title }}
+</a>
+{{ end }}
+
+{{ range $async }}
+{{ $isCurrentPage := eq $currentUrl .RelPermalink }}
+{{ $title := .Params.short }}
+<a href="{{ .RelPermalink }}">
+  {{ $title }}
+</a>
+{{ end }}
+
 <h8>Basic</h8>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/c/" {{ if in .RelPermalink "basic/c/" }}class="active"{{ end }}>C++</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/csharp/" {{ if in .RelPermalink "csharp" }}class="active"{{ end }}>C#</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/dart/" {{ if in .RelPermalink "dart" }}class="active"{{ end }}>Dart</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/go/" {{ if in .RelPermalink "go" }}class="active"{{ end }}>Go</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/java/" {{ if in .RelPermalink "java" }}class="active"{{ end }}>Java</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/android/" {{ if in .RelPermalink "android" }}class="active"{{ end }}>Android Java</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/node/" {{ if in .RelPermalink "node" }}class="active"{{ end }}>Node</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/objective-c/" {{ if in .RelPermalink "objective-c" }}class="active"{{ end }}>Objective-C</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/php/" {{ if in .RelPermalink "php" }}class="active"{{ end }}>PHP</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/python/" {{ if in .RelPermalink "python" }}class="active"{{ end }}>Python</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/ruby/" {{ if in .RelPermalink "ruby" }}class="active"{{ end }}>Ruby</a>
-<a href="{{ .Site.BaseURL }}docs/tutorials/basic/web/" {{ if in .RelPermalink "web" }}class="active"{{ end }}>Web</a>
+
+{{ range $basic }}
+{{ $isCurrentPage := eq $currentUrl .RelPermalink }}
+{{ $title := .Params.short }}
+<a href="{{ .RelPermalink }}">
+  {{ $title }}
+</a>
+{{ end }}
 
 </div>