diff --git a/layouts/partials/header/canonical.html b/layouts/partials/header/canonical.html
index e9d8249af..5403a0af5 100644
--- a/layouts/partials/header/canonical.html
+++ b/layouts/partials/header/canonical.html
@@ -1,7 +1,4 @@
-{{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) .RelPermalink }}
 {{ $stableVersion := $.Site.Data.versions.stable_version }}
 {{ $canonicalURL := print (replaceRE `\/$` "" .Site.BaseURL) (replaceRE "[^/]+.*?[0]" $stableVersion .RelPermalink) }}
 
-{{ if not (eq $currentVersion $stableVersion) }}
-  <link rel="canonical" href="{{ $canonicalURL }}" />
-{{ end }}
+<link rel="canonical" href="{{ $canonicalURL }}" />
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 8826761dc..2cd5310ae 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,9 +1,7 @@
 {{ $currentPage := . }}
 {{ $currentVersion := (index (findRE "[^/]+.*?" .RelPermalink) 0) }}
 <aside class="sidebar">
-
   <div class="sidebar-toggle" onclick="toggle_sidebar('sidebar-closed');return false;"><a href="#">&#59672;</a></div>
-
   <div class="search-and-nav-toggle">
     <div class="sidebar--search">
       <input  class="sidebar--search-field"
@@ -21,238 +19,22 @@
       <span class="toggle-hamburger"></span>
     </a>
   </div>
-
   <ul id="nav-tree">
 
-  {{ $menuID := replaceRE "[.]" "_" $currentVersion }}
+  {{ $mainMenu := (index .Site.Menus (replaceRE "[.]" "_" $currentVersion)) }}
+  {{ $cloudMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_cloud")) }}
+  {{ $refMenu := (index .Site.Menus (print (replaceRE "[.]" "_" $currentVersion) "_ref")) }}
 
-  {{ range (index .Site.Menus $menuID) }}
-    <!-- Nested Navigation -->
-    <li class="nav-category {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-      {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-      <a href="{{ .URL }}">{{ .Name }}</a>
-      {{ if .HasChildren }}
-        <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-        {{ range .Children }}
-          <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-            {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-            <a href="{{ .URL }}">{{ .Name }}</a>
-            {{ if .HasChildren }}
-              <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-              {{ range .Children }}
-                <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                  {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                  <a href="{{ .URL }}">{{ .Name }}</a>
-                  {{ if .HasChildren }}
-                    <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                    {{ range .Children }}
-                      <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                        {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                        <a href="{{ .URL }}">{{ .Name }}</a>
-                        {{ if .HasChildren }}
-                          <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                          {{ range .Children }}
-                            <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                              {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                              <a href="{{ .URL }}">{{ .Name }}</a>
-                              {{ if .HasChildren }}
-                                <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                {{ range .Children }}
-                                  <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                    {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                    <a href="{{ .URL }}">{{ .Name }}</a>
-
-                                    <!-- Begin nested block -->
-                                    {{ if .HasChildren }}
-                                      <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                      {{ range .Children }}
-                                        <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                          {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                          <a href="{{ .URL }}">{{ .Name }}</a>
-                                          <!-- To add more nested layers, copy the nested block and paste it here -->
-                                        </li>
-                                      {{ end }}
-                                      </ul>
-                                    {{ end }}
-                                    <!-- End nested block -->
-
-                                  </li>
-                                {{ end }}
-                                </ul>
-                              {{ end }}
-                            </li>
-                          {{ end }}
-                          </ul>
-                        {{ end }}
-                      </li>
-                    {{ end }}
-                    </ul>
-                  {{ end }}
-                </li>
-              {{ end }}
-              </ul>
-            {{ end }}
-          </li>
-        {{ end }}
-        </ul>
-      {{ end }}
-    </li>
-  {{end}}
+  <!-- Main Section -->
+  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $mainMenu) }}
 
   <!-- Cloud Section -->
-  {{ $refMenuID := print (replaceRE "[.]" "_" $currentVersion) "_cloud" }}
   <h4 class="reference">{{ .Site.Data.products.cloud.shortname }}</h4>
-
-  {{ range (index .Site.Menus $refMenuID) }}
-    <!-- Nested Reference Navigation -->
-    <li class="nav-category {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-      {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-      <a href="{{ .URL }}">{{ .Name }}</a>
-      {{ if .HasChildren }}
-        <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-        {{ range .Children }}
-          <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-            {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-            <a href="{{ .URL }}">{{ .Name }}</a>
-            {{ if .HasChildren }}
-              <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-              {{ range .Children }}
-                <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                  {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                  <a href="{{ .URL }}">{{ .Name }}</a>
-                  {{ if .HasChildren }}
-                    <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                    {{ range .Children }}
-                      <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                        {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                        <a href="{{ .URL }}">{{ .Name }}</a>
-                        {{ if .HasChildren }}
-                          <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                          {{ range .Children }}
-                            <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                              {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                              <a href="{{ .URL }}">{{ .Name }}</a>
-                              {{ if .HasChildren }}
-                                <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                {{ range .Children }}
-                                  <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                    {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                    <a href="{{ .URL }}">{{ .Name }}</a>
-
-                                    <!-- Begin nested block -->
-                                    {{ if .HasChildren }}
-                                      <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                      {{ range .Children }}
-                                        <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                          {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                          <a href="{{ .URL }}">{{ .Name }}</a>
-                                          <!-- To add more nested layers, copy the nested block and paste it here -->
-                                        </li>
-                                      {{ end }}
-                                      </ul>
-                                    {{ end }}
-                                    <!-- End nested block -->
-
-                                  </li>
-                                {{ end }}
-                                </ul>
-                              {{ end }}
-                            </li>
-                          {{ end }}
-                          </ul>
-                        {{ end }}
-                      </li>
-                    {{ end }}
-                    </ul>
-                  {{ end }}
-                </li>
-              {{ end }}
-              </ul>
-            {{ end }}
-          </li>
-        {{ end }}
-        </ul>
-      {{ end }}
-    </li>
-  {{end}}
+  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $cloudMenu) }}
 
   <!-- Reference Section -->
-  {{ $refMenuID := print (replaceRE "[.]" "_" $currentVersion) "_ref" }}
   <h4 class="reference">Reference</h4>
-
-  {{ range (index .Site.Menus $refMenuID) }}
-    <!-- Nested Reference Navigation -->
-    <li class="nav-category {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-      {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-      <a href="{{ .URL }}">{{ .Name }}</a>
-      {{ if .HasChildren }}
-        <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-        {{ range .Children }}
-          <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-            {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-            <a href="{{ .URL }}">{{ .Name }}</a>
-            {{ if .HasChildren }}
-              <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-              {{ range .Children }}
-                <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                  {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                  <a href="{{ .URL }}">{{ .Name }}</a>
-                  {{ if .HasChildren }}
-                    <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                    {{ range .Children }}
-                      <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                        {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                        <a href="{{ .URL }}">{{ .Name }}</a>
-                        {{ if .HasChildren }}
-                          <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                          {{ range .Children }}
-                            <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                              {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                              <a href="{{ .URL }}">{{ .Name }}</a>
-                              {{ if .HasChildren }}
-                                <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                {{ range .Children }}
-                                  <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                    {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                    <a href="{{ .URL }}">{{ .Name }}</a>
-
-                                    <!-- Begin nested block -->
-                                    {{ if .HasChildren }}
-                                      <ul class="children {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}">
-                                      {{ range .Children }}
-                                        <li class="nav-item {{ if eq $currentPage.RelPermalink .URL }}active{{end}}">
-                                          {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($currentPage.IsMenuCurrent .Menu .) ($currentPage.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
-                                          <a href="{{ .URL }}">{{ .Name }}</a>
-                                          <!-- To add more nested layers, copy the nested block and paste it here -->
-                                        </li>
-                                      {{ end }}
-                                      </ul>
-                                    {{ end }}
-                                    <!-- End nested block -->
-
-                                  </li>
-                                {{ end }}
-                                </ul>
-                              {{ end }}
-                            </li>
-                          {{ end }}
-                          </ul>
-                        {{ end }}
-                      </li>
-                    {{ end }}
-                    </ul>
-                  {{ end }}
-                </li>
-              {{ end }}
-              </ul>
-            {{ end }}
-          </li>
-        {{ end }}
-        </ul>
-      {{ end }}
-    </li>
-  {{end}}
-
+  {{ partial "sidebar/nested-menu" (dict "page" $currentPage "menu" $refMenu) }}
 
   </ul>
 </aside>
diff --git a/layouts/partials/sidebar/nested-menu.html b/layouts/partials/sidebar/nested-menu.html
new file mode 100644
index 000000000..abeb169e9
--- /dev/null
+++ b/layouts/partials/sidebar/nested-menu.html
@@ -0,0 +1,74 @@
+{{ $page := .page }}
+{{ $menu := .menu }}
+
+{{ range $menu }}
+  <li class="nav-category {{ if eq $page.RelPermalink .URL }}active{{end}}">
+    {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+    <a href="{{ .URL }}">{{ .Name }}</a>
+    {{ if .HasChildren }}
+      <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+      {{ range .Children }}
+        <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+          {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+          <a href="{{ .URL }}">{{ .Name }}</a>
+          {{ if .HasChildren }}
+            <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+            {{ range .Children }}
+              <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+                {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+                <a href="{{ .URL }}">{{ .Name }}</a>
+                {{ if .HasChildren }}
+                  <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+                  {{ range .Children }}
+                    <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+                      {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+                      <a href="{{ .URL }}">{{ .Name }}</a>
+                      {{ if .HasChildren }}
+                        <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+                        {{ range .Children }}
+                          <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+                            {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+                            <a href="{{ .URL }}">{{ .Name }}</a>
+                            {{ if .HasChildren }}
+                              <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+                              {{ range .Children }}
+                                <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+                                  {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+                                  <a href="{{ .URL }}">{{ .Name }}</a>
+
+                                  <!-- Begin nested block -->
+                                  {{ if .HasChildren }}
+                                    <ul class="children {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}">
+                                    {{ range .Children }}
+                                      <li class="nav-item {{ if eq $page.RelPermalink .URL }}active{{end}}">
+                                        {{ if .HasChildren }}<a href="#" class="children-toggle {{ if or ($page.IsMenuCurrent .Menu .) ($page.HasMenuCurrent .Menu .) }}open{{end}}"></a>{{ end }}
+                                        <a href="{{ .URL }}">{{ .Name }}</a>
+                                        <!-- To add more nested layers, copy the nested block and paste it here -->
+                                      </li>
+                                    {{ end }}
+                                    </ul>
+                                  {{ end }}
+                                  <!-- End nested block -->
+
+                                </li>
+                              {{ end }}
+                              </ul>
+                            {{ end }}
+                          </li>
+                        {{ end }}
+                        </ul>
+                      {{ end }}
+                    </li>
+                  {{ end }}
+                  </ul>
+                {{ end }}
+              </li>
+            {{ end }}
+            </ul>
+          {{ end }}
+        </li>
+      {{ end }}
+      </ul>
+    {{ end }}
+  </li>
+{{ end }}