diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
index 4fc092c907..c7044e8c47 100644
--- a/windows/deployment/TOC.yml
+++ b/windows/deployment/TOC.yml
@@ -7,10 +7,10 @@
           href: deploy-whats-new.md
         - name: Windows client deployment scenarios
           href: windows-10-deployment-scenarios.md
-        - name: What is Windows as a service?
+        - name: Windows as a service overview
+          href: update/waas-overview.md          
+        - name: Update terminology
           href: update/waas-quick-start.md
-        - name: Windows update fundamentals
-          href: update/waas-overview.md
         - name: Monthly quality updates
           href: update/quality-updates.md
         - name: Basics of Windows updates, channels, and tools
@@ -47,12 +47,12 @@
         - name: Define your servicing strategy
           href: update/plan-define-strategy.md
         - name: Delivery Optimization for Windows client updates
-          href: do/waas-delivery-optimization.md
+          href: do/waas-delivery-optimization.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
           items:
             - name: Using a proxy with Delivery Optimization
-              href: do/delivery-optimization-proxy.md
+              href: do/delivery-optimization-proxy.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
             - name: Delivery Optimization client-service communication
-              href: do/delivery-optimization-workflow.md
+              href: do/delivery-optimization-workflow.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Windows 10 deployment considerations
           href: planning/windows-10-deployment-considerations.md
         - name: Windows 10 infrastructure requirements
@@ -80,7 +80,7 @@
         - name: Update Baseline
           href: update/update-baseline.md
         - name: Set up Delivery Optimization for Windows client updates
-          href: do/index.yml
+          href: do/waas-delivery-optimization-setup.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Configure BranchCache for Windows client updates
           href: update/waas-branchcache.md
         - name: Prepare your deployment tools
@@ -339,7 +339,7 @@
         - name: Additional Windows Update settings
           href: update/waas-wu-settings.md
         - name: Delivery Optimization reference
-          href: do/waas-delivery-optimization-reference.md
+          href: do/waas-delivery-optimization-reference.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Windows client in S mode
           href: s-mode.md
         - name: Switch to Windows client Pro or Enterprise from S mode
diff --git a/windows/deployment/breadcrumb/toc.yml b/windows/deployment/breadcrumb/toc.yml
index c7cea673bd..65a30e06f7 100644
--- a/windows/deployment/breadcrumb/toc.yml
+++ b/windows/deployment/breadcrumb/toc.yml
@@ -46,3 +46,15 @@ items:
     - name: Deployment
       tocHref: /windows/client-management/mdm
       topicHref: /windows/deployment/     
+
+- name: Learn
+  tocHref: /
+  topicHref: /
+  items:
+  - name: Windows
+    tocHref: /windows/
+    topicHref: /windows/resources/
+    items:
+    - name: Deployment
+      tocHref: /windows/deployment/do
+      topicHref: /windows/deployment/
\ No newline at end of file
diff --git a/windows/deployment/do/TOC.yml b/windows/deployment/do/TOC.yml
index 0336d89ddb..5bcf7b6dbe 100644
--- a/windows/deployment/do/TOC.yml
+++ b/windows/deployment/do/TOC.yml
@@ -11,14 +11,12 @@
     href: waas-delivery-optimization-faq.yml    
   - name: Configure Delivery Optimization for Windows
     items:
-    - name: Windows Delivery Optimization settings
-      href: waas-delivery-optimization-setup.md#recommended-delivery-optimization-settings
+    - name: Set up Delivery Optimization for Windows
+      href: waas-delivery-optimization-setup.md
     - name: Configure Delivery Optimization settings using Microsoft Intune
       href: /mem/intune/configuration/delivery-optimization-windows
   - name: Resources for Delivery Optimization
     items:
-    - name: Set up Delivery Optimization for Windows
-      href: waas-delivery-optimization-setup.md
     - name: Delivery Optimization reference
       href: waas-delivery-optimization-reference.md
     - name: Delivery Optimization client-service communication