diff --git a/windows/client-management/mdm/toc.yml b/windows/client-management/mdm/toc.yml
index 8cea6ebd6f..42042cec64 100644
--- a/windows/client-management/mdm/toc.yml
+++ b/windows/client-management/mdm/toc.yml
@@ -1,10 +1,10 @@
 items:
-  - name: Overview
-    href: index.yml
   - name: Configuration service provider reference
     expanded: true
-    href: configuration-service-provider-reference.md
+    href: index.yml
     items:
+      - name: CSP Reference
+        href: configuration-service-provider-reference.md
       - name: Policy CSP
         href: policy-configuration-service-provider.md
         items:
@@ -12,22 +12,24 @@ items:
             href: policy-ddf-file.md
           - name: Policies in Policy CSP supported by Group Policy
             href: policies-in-policy-csp-supported-by-group-policy.md
-          - name: ADMX policies in Policy CSP
-            href: policies-in-policy-csp-admx-backed.md
-          - name: Policies in Policy CSP supported by HoloLens 2
-            href: policies-in-policy-csp-supported-by-hololens2.md
-          - name: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite
-            href: policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md
-          - name: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition
-            href: policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md
-          - name: Policies in Policy CSP supported by Windows 10 IoT Enterprise
-            href: ./configuration-service-provider-reference.md
-          - name: Policies in Policy CSP supported by Windows 10 IoT Core
-            href: policies-in-policy-csp-supported-by-iot-core.md
-          - name: Policies in Policy CSP supported by Microsoft Surface Hub
-            href: policies-in-policy-csp-supported-by-surface-hub.md
-          - name: Policy CSPs that can be set using Exchange Active Sync (EAS)
-            href: policies-in-policy-csp-that-can-be-set-using-eas.md
+          - name: Policy CSP support
+            items:
+            - name: ADMX policies in Policy CSP
+              href: policies-in-policy-csp-admx-backed.md
+            - name: Policies in Policy CSP supported by HoloLens 2
+              href: policies-in-policy-csp-supported-by-hololens2.md
+            - name: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite
+              href: policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md
+            - name: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition
+              href: policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md
+            - name: Policies in Policy CSP supported by Windows 10 IoT Enterprise
+              href: ./configuration-service-provider-reference.md
+            - name: Policies in Policy CSP supported by Windows 10 IoT Core
+              href: policies-in-policy-csp-supported-by-iot-core.md
+            - name: Policies in Policy CSP supported by Microsoft Surface Hub
+              href: policies-in-policy-csp-supported-by-surface-hub.md
+            - name: Policy CSPs that can be set using Exchange Active Sync (EAS)
+              href: policies-in-policy-csp-that-can-be-set-using-eas.md
           - name: AboveLock
             href: policy-csp-abovelock.md
           - name: Accounts