diff --git a/master_middleman/source/index.html.md.erb b/master_middleman/source/index.html.md.erb
index db927cd1..eab2cf3b 100644
--- a/master_middleman/source/index.html.md.erb
+++ b/master_middleman/source/index.html.md.erb
@@ -4,8 +4,11 @@ breadcrumb: Cloud Foundry Documentation
 <div class="main-container">
   <div class="main">
     <h1 class="title-top" style="margin-left: 2em; margin-bottom: 0.25em;">Getting Started with</h1>
-    <img style="display: block; text-align: center; margin: 0 auto; width: 50%; position: relative; margin-top: 1em; margin-bottom: 1em;" src="images/new_logo_org.png" alt="Cloud Foundry Logo">
-    <h2 class="title-details">Cloud Foundry is an open-source platform as a service (PaaS) that provides you with a choice of clouds, developer frameworks, and application services.
+    <img
+      style="display: block; text-align: center; margin: 0 auto; width: 50%; position: relative; margin-top: 1em; margin-bottom: 1em;"
+      src="images/new_logo_org.png" alt="Cloud Foundry Logo">
+    <h2 class="title-details">Cloud Foundry is an open-source platform as a service (PaaS) that provides you with a
+      choice of clouds, developer frameworks, and application services.
     </h2>
   </div>
 </div>
@@ -215,7 +218,7 @@ breadcrumb: Cloud Foundry Documentation
           <a href="/devguide/services/using-vol-services.html">Using an external filesystem (volume services)</a>
         </div>
         <div class="docs-link">
-        <a href="/devguide/services/metrics.html">Using metrics with drain logs</a>
+          <a href="/devguide/services/metrics.html">Using metrics with drain logs</a>
         </div>
       </div>
     </div>
@@ -223,7 +226,7 @@ breadcrumb: Cloud Foundry Documentation
 
     <div class="docs-subsection">
       <h3><a class="title" href="/services/index.html">
-      Creating Managed Services in Cloud Foundry</a></h3>
+          Creating Managed Services in Cloud Foundry</a></h3>
       <div class="docs-module-description">Create and publish free or metered services for Cloud Foundry apps.</div>
       <br>
       <div class="docs-column-description">
@@ -231,7 +234,7 @@ breadcrumb: Cloud Foundry Documentation
           <a href="/services/overview.html">Services in Cloud Foundry</a>
         </div>
         <div class="docs-link">
-           <a href="https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md">Open Service Broker API</a>
+          <a href="https://github.com/openservicebrokerapi/servicebroker/blob/v2.13/spec.md">Open Service Broker API</a>
         </div>
         <div class="docs-link">
           <a href="/services/managing-service-brokers.html">Managing Service Brokers in Cloud Foundry</a>
@@ -325,7 +328,7 @@ breadcrumb: Cloud Foundry Documentation
           <a href="/adminguide/zipkin_tracing.html">Enabling Zipkin tracing</a>
         </div>
         <div class="docs-link">
-        <a href="/adminguide/w3c_tracing.html">Enabling W3C tracing</a>
+          <a href="/adminguide/w3c_tracing.html">Enabling W3C tracing</a>
         </div>
         <div class="docs-link">
           <a href="/adminguide/supporting-websockets.html">Supporting WebSockets</a>
@@ -357,12 +360,28 @@ breadcrumb: Cloud Foundry Documentation
     <hr>
 
     <div class="docs-subsection">
-      <h3><a class="title" href="/buildpacks/index.html">Buildpacks</a></h3>
+      <h3><a class="title" href="/buildpacks/index.html">Cloud Foundry Buildpacks</a></h3>
       <div class="docs-module-description">Package the languages and libraries that support your apps.</div>
-      <br>
+      <h4>Cloud Native Buildpacks</h4>
       <div class="docs-column-description">
         <div class="docs-link">
-          <a href="/buildpacks/index.html">Buildpacks</a>
+          <a href="/buildpacks/cnb/index.html">What are Cloud Native Buildpacks?</a>
+        </div>
+        <div class="docs-link">
+          <a href="/buildpacks/cnb/using.html">Using buildpacks</a>
+        </div>
+        <div class="docs-link">
+          <a href="/buildpacks/cnb/paketo.html">Paketo buildpacks</a>
+        </div>
+        <div class="docs-link">
+          <a href="/buildpacks/cnb/own.html">Developing your own buildpacks</a>
+        </div>
+      </div>
+
+      <h4>Classic Buildpacks</h4>
+      <div class="docs-column-description">
+        <div class="docs-link">
+          <a href="/buildpacks/classic.html">What are Classic Buildpacks?</a>
         </div>
         <div class="docs-link">
           <a href="/buildpacks/understand-buildpacks.html">How buildpacks work</a>
@@ -449,7 +468,8 @@ breadcrumb: Cloud Foundry Documentation
           <a href="/buildpacks/ruby/ruby-tips.html">Tips for Ruby developers</a>
         </div>
         <div class="docs-link">
-          <a href="/buildpacks/ruby/ruby-environment.html">Environment variables defined by the Ruby buildpack</a>
+          <a href="/buildpacks/ruby/ruby-environment.html">Environment variables defined by the Ruby
+            buildpack</a>
         </div>
         <div class="docs-link">
           <a href="/buildpacks/ruby/ruby-service-bindings.html">Configure service connections for Ruby</a>
@@ -618,13 +638,15 @@ breadcrumb: Cloud Foundry Documentation
       <br>
       <div class="docs-column-description">
         <div class="docs-link">
-          <a href="https://docs.cloudfoundry.org/api/uaa/index.html">User Account and Authentication (UAA) server API</a>
+          <a href="https://docs.cloudfoundry.org/api/uaa/index.html">User Account and Authentication (UAA) server
+            API</a>
         </div>
         <div class="docs-link">
           <a href="/devguide/capi/client-libraries.html">Available Cloud Controller API client libraries</a>
         </div>
         <div class="docs-link">
-          <a href="/running/rate-limit-cloud-controller-api.html">Rate limit information returned by the Cloud Controller API</a>
+          <a href="/running/rate-limit-cloud-controller-api.html">Rate limit information returned by the Cloud
+            Controller API</a>
         </div>
         <div class="docs-link">
           <a href="http://v2-apidocs.cloudfoundry.org">CAPI V2 documentation</a>
@@ -640,10 +662,8 @@ breadcrumb: Cloud Foundry Documentation
   </div>
   <div>
     &nbsp;
-	</div>
+  </div>
   <div>
     <a id='repo-link' href='https://github.com/cloudfoundry/docs-book-cloudfoundry/blob/master/master_middleman/source/index.html.md.erb'>Create a pull request or raise an issue on the source for this page in GitHub</a>
   </div>
 </div>
-
-
diff --git a/master_middleman/source/subnavs/_cf-subnav.erb b/master_middleman/source/subnavs/_cf-subnav.erb
index 6ab70db1..78ee4515 100644
--- a/master_middleman/source/subnavs/_cf-subnav.erb
+++ b/master_middleman/source/subnavs/_cf-subnav.erb
@@ -266,9 +266,22 @@
           <li class=""><a href="/devguide/revisions.html">Cloud Foundry API app revisions</a></li>
         </ul>
       </li>
-      <li class="has_submenu"><a href="/buildpacks/">Buildpacks</a>
+
+
+      <li class="has_submenu"><a href="/buildpacks/">Cloud Foundry Buildpacks</a>
         <ul>
-          <li class="has_submenu"><a href="/buildpacks/using-buildpacks.html">Using buildpacks</a>
+          <li class="has_submenu"><a href="/buildpacks/cnb">Cloud Native Buildpacks</a>
+            <ul>
+              <li class=""><a href="/buildpacks/cnb/index.html">What are Cloud Native Buildpacks? </a></li>
+              <li class=""><a href="/buildpacks/cnb/using.html">Using buildpacks </a></li>
+              <li class=""><a href="/buildpacks/cnb/paketo.html">Paketo buildpacks </a></li>
+              <li class=""><a href="/buildpacks/cnb/own.html">Developing your own buildpacks </a></li>
+            </ul>
+          </li>
+
+          <li class="has_submenu"><a href="/buildpacks/classic.html">Classic Buildpacks</a>
+          <ul>
+          <li class="has_submenu"><a href="/buildpacks/using-buildpacks.html">What are classic buildpacks?</a>
             <ul>
               <li class=""><a href="/buildpacks/understand-buildpacks.html">Working with buildpacks in Cloud Foundry </a></li>
               <li class=""><a href="/buildpacks/stack-association.html">Stack association</a></li>
@@ -350,6 +363,9 @@
           </li>
         </ul>
       </li>
+
+        </ul>
+      </li>
       <li><span><hr></span></li>
       <li><strong>Information for Managed Service Authors</strong>
         <ul>