diff --git a/windows/client-management/images/auto-enrollment-enrollment-of-windows-devices.png b/windows/client-management/images/auto-enrollment-enrollment-of-windows-devices.png
index 5f7fb2c44b..f35f11cc5d 100644
Binary files a/windows/client-management/images/auto-enrollment-enrollment-of-windows-devices.png and b/windows/client-management/images/auto-enrollment-enrollment-of-windows-devices.png differ
diff --git a/windows/client-management/mdm-diagnose-enrollment.md b/windows/client-management/mdm-diagnose-enrollment.md
index c800d8d29d..87ffeb5b9f 100644
--- a/windows/client-management/mdm-diagnose-enrollment.md
+++ b/windows/client-management/mdm-diagnose-enrollment.md
@@ -62,13 +62,13 @@ To ensure that the auto-enrollment feature is working as expected, you must veri
 
    :::image type="content" alt-text="Mobility setting MDM intune." source="images/auto-enrollment-microsoft-intune-setting.png" lightbox="images/auto-enrollment-microsoft-intune-setting.png":::
 
-1. Verify that the *Enable Automatic MDM enrollment using default Azure AD credentials* group policy (**Local Group Policy Editor > Computer Configuration > Policies > Administrative Templates > Windows Components > MDM**) is properly deployed to all devices that should be enrolled into Intune. You may contact your domain administrators to verify if the group policy has been deployed successfully.
+1. When using group policy for enrollment, verify that the *Enable Automatic MDM enrollment using default Azure AD credentials* group policy (**Local Group Policy Editor > Computer Configuration > Policies > Administrative Templates > Windows Components > MDM**) is properly deployed to all devices that should be enrolled into Intune. You may contact your domain administrators to verify if the group policy has been deployed successfully.
 
-1. Verify that Microsoft Intune should allow enrollment of Windows devices.
+1. Verify that Microsoft Intune allows enrollment of Windows devices.
 
    :::image type="content" alt-text="Enrollment of Windows devices." source="images/auto-enrollment-enrollment-of-windows-devices.png" lightbox="images/auto-enrollment-enrollment-of-windows-devices.png":::
 
-## Troubleshoot auto-enrollment using group policy
+## Troubleshoot group policy enrollment
 
 Investigate the logs if you have issues even after performing all the verification steps. The first log file to investigate is the event log on the target Windows device. To collect Event Viewer logs:
 
diff --git a/windows/client-management/toc.yml b/windows/client-management/toc.yml
index 12a2e704c9..f1cc2a5917 100644
--- a/windows/client-management/toc.yml
+++ b/windows/client-management/toc.yml
@@ -21,7 +21,7 @@ items:
               - name: MAM support for device management
                 href: implement-server-side-mobile-application-management.md
           - name: Enroll devices
-            expanded: true
+            expanded: false
             items:
               - name: Enrollment overview
                 href: mobile-device-enrollment.md
@@ -40,7 +40,7 @@ items:
               - name: On-premises authentication enrollment
                 href: on-premise-authentication-device-enrollment.md
           - name: Manage devices
-            expanded: true
+            expanded: false
             items:
               - name: Manage settings
                 href: windows-mdm-enterprise-settings.md
@@ -53,6 +53,7 @@ items:
               - name: Certificate renewal
                 href: certificate-renewal-windows-mdm.md
           - name: Diagnose MDM failures
+            expanded: false
             items:
               - name: Collect MDM logs
                 href: mdm-collect-logs.md