diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb
index a5e950c901..88991ec614 100644
--- a/website/layouts/docs.erb
+++ b/website/layouts/docs.erb
@@ -3,131 +3,137 @@
     <h4><a href="/docs/index.html">Terraform CLI</a></h4>
 
     <ul class="nav docs-sidenav">
-      <li<%= sidebar_current("docs-config") %>>
+      <li<%= sidebar_current("docs-conf") %>>
         <a href="/docs/configuration/index.html">Configuration Language</a>
         <ul class="nav">
-          <li<%= sidebar_current("docs-config-resources") %>>
-            <a href="/docs/configuration/resources.html">Resources</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-providers") %>>
-            <a href="/docs/configuration/providers.html">Providers</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-variables") %>>
-            <a href="/docs/configuration/variables.html">Input Variables</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-outputs") %>>
-            <a href="/docs/configuration/outputs.html">Output Values</a>
-          </li>
+          <li<%= sidebar_current("docs-config") %>>
+            <a href="/docs/configuration/index.html">0.12 and Newer</a>
+            <ul class="nav">
+              <li<%= sidebar_current("docs-config-resources") %>>
+                <a href="/docs/configuration/resources.html">Resources</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-providers") %>>
+                <a href="/docs/configuration/providers.html">Providers</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-variables") %>>
+                <a href="/docs/configuration/variables.html">Input Variables</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-outputs") %>>
+                <a href="/docs/configuration/outputs.html">Output Values</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-locals") %>>
+                <a href="/docs/configuration/locals.html">Local Values</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-modules") %>>
+                <a href="/docs/configuration/modules.html">Modules</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-data-sources") %>>
+                <a href="/docs/configuration/data-sources.html">Data Sources</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-syntax") %>>
+                <a href="/docs/configuration/syntax.html">Configuration Syntax</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-expressions") %>>
+                <a href="/docs/configuration/expressions.html">Expressions</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-functions") %>>
+                <a href="/docs/configuration/functions.html">Functions</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-terraform") %>>
+                <a href="/docs/configuration/terraform.html">Terraform Settings</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-override") %>>
+                <a href="/docs/configuration/override.html">Override Files</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-style") %>>
+                <a href="/docs/configuration/style.html">Style Conventions</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-types") %>>
+                <a href="/docs/configuration/types.html">Type Constraints</a>
+              </li>
+
+              <li<%= sidebar_current("docs-config-syntax-json") %>>
+                <a href="/docs/configuration/syntax-json.html">JSON Configuration Syntax</a>
+              </li>
+            </ul>
+          </li>
+
+          <li<%= sidebar_current("docs-conf-old") %>>
+            <a href="/docs/configuration-0-11/index.html">0.11 and Older</a>
+            <ul class="nav">
+              <li<%= sidebar_current("docs-conf-old-load") %>>
+                <a href="/docs/configuration-0-11/load.html">Load Order and Semantics</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-syntax") %>>
+                <a href="/docs/configuration-0-11/syntax.html">Configuration Syntax</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-interpolation") %>>
+                <a href="/docs/configuration-0-11/interpolation.html">Interpolation Syntax</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-override") %>>
+                <a href="/docs/configuration-0-11/override.html">Overrides</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-resources") %>>
+                <a href="/docs/configuration-0-11/resources.html">Resources</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-data-sources") %>>
+                <a href="/docs/configuration-0-11/data-sources.html">Data Sources</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-providers") %>>
+                <a href="/docs/configuration-0-11/providers.html">Providers</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-variables") %>>
+                <a href="/docs/configuration-0-11/variables.html">Variables</a>
+              </li>
+
+              <li<%= sidebar_current("docs-conf-old-outputs") %>>
+                <a href="/docs/configuration-0-11/outputs.html">Outputs</a>
+              </li>
 
-          <li<%= sidebar_current("docs-config-locals") %>>
-            <a href="/docs/configuration/locals.html">Local Values</a>
-          </li>
+              <li<%= sidebar_current("docs-conf-old-locals") %>>
+                <a href="/docs/configuration-0-11/locals.html">Local Values</a>
+              </li>
 
-          <li<%= sidebar_current("docs-config-modules") %>>
-            <a href="/docs/configuration/modules.html">Modules</a>
-          </li>
+              <li<%= sidebar_current("docs-conf-old-modules") %>>
+                <a href="/docs/configuration-0-11/modules.html">Modules</a>
+              </li>
 
-          <li<%= sidebar_current("docs-config-data-sources") %>>
-            <a href="/docs/configuration/data-sources.html">Data Sources</a>
-          </li>
+              <li<%= sidebar_current("docs-conf-old-terraform") %>>
+                <a href="/docs/configuration-0-11/terraform.html">Terraform</a>
+              </li>
 
-          <li<%= sidebar_current("docs-config-syntax") %>>
-            <a href="/docs/configuration/syntax.html">Configuration Syntax</a>
-          </li>
+              <li<%= sidebar_current("docs-conf-old-push") %>>
+                <a href="/docs/configuration-0-11/terraform-enterprise.html">Terraform Push (deprecated)</a>
+              </li>
 
-          <li<%= sidebar_current("docs-config-expressions") %>>
-            <a href="/docs/configuration/expressions.html">Expressions</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-functions") %>>
-            <a href="/docs/configuration/functions.html">Functions</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-terraform") %>>
-            <a href="/docs/configuration/terraform.html">Terraform Settings</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-override") %>>
-            <a href="/docs/configuration/override.html">Override Files</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-style") %>>
-            <a href="/docs/configuration/style.html">Style Conventions</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-types") %>>
-            <a href="/docs/configuration/types.html">Type Constraints</a>
-          </li>
-
-          <li<%= sidebar_current("docs-config-syntax-json") %>>
-            <a href="/docs/configuration/syntax-json.html">JSON Configuration Syntax</a>
+              <li<%= sidebar_current("docs-conf-old-environment-variables") %>>
+                <a href="/docs/configuration-0-11/environment-variables.html">Environment Variables</a>
+              </li>
+            </ul>
           </li>
         </ul>
       </li>
 
-      <li<%= sidebar_current("docs-conf-old") %>>
-        <a href="/docs/configuration-0-11/index.html">v0.11 Configuration Language</a>
-        <ul class="nav">
-          <li<%= sidebar_current("docs-conf-old-load") %>>
-            <a href="/docs/configuration-0-11/load.html">Load Order and Semantics</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-syntax") %>>
-            <a href="/docs/configuration-0-11/syntax.html">Configuration Syntax</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-interpolation") %>>
-            <a href="/docs/configuration-0-11/interpolation.html">Interpolation Syntax</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-override") %>>
-            <a href="/docs/configuration-0-11/override.html">Overrides</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-resources") %>>
-            <a href="/docs/configuration-0-11/resources.html">Resources</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-data-sources") %>>
-            <a href="/docs/configuration-0-11/data-sources.html">Data Sources</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-providers") %>>
-            <a href="/docs/configuration-0-11/providers.html">Providers</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-variables") %>>
-            <a href="/docs/configuration-0-11/variables.html">Variables</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-outputs") %>>
-            <a href="/docs/configuration-0-11/outputs.html">Outputs</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-locals") %>>
-            <a href="/docs/configuration-0-11/locals.html">Local Values</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-modules") %>>
-            <a href="/docs/configuration-0-11/modules.html">Modules</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-terraform") %>>
-            <a href="/docs/configuration-0-11/terraform.html">Terraform</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-push") %>>
-            <a href="/docs/configuration-0-11/terraform-enterprise.html">Terraform Push (deprecated)</a>
-          </li>
-
-          <li<%= sidebar_current("docs-conf-old-environment-variables") %>>
-            <a href="/docs/configuration-0-11/environment-variables.html">Environment Variables</a>
-          </li>
-        </ul>
-      </li>
 
       <li<%= sidebar_current("docs-commands") %>>
         <a href="/docs/commands/index.html">Commands (CLI)</a>