diff --git a/windows/configuration/assigned-access/toc.yml b/windows/configuration/assigned-access/toc.yml
index 994d64e36d..79538c7896 100644
--- a/windows/configuration/assigned-access/toc.yml
+++ b/windows/configuration/assigned-access/toc.yml
@@ -5,6 +5,7 @@ items:
   href: configure-single-app-kiosk.md
 - name: Configure a multi-app kiosk
   href: configure-multi-app-kiosk.md
+  displayName: Configure a restricted user experience
 - name: Recommendations
   href: recommendations.md
 - name: Create a configuration file
@@ -13,8 +14,10 @@ items:
   items:
     - name: Configure a single-app kiosk
       href: quickstart-kiosk.md
+      displayName: Configure a single-app kiosk quickstart
     - name: Configure a multi-app kiosk
       href: quickstart-restricted-user-experience.md
+      displayName: Configure a restricted user experience quickstart
 - name: Reference
   items:
     - name: Assigned Access XSD
diff --git a/windows/configuration/keyboard-filter/toc.yml b/windows/configuration/keyboard-filter/toc.yml
index 7c09e1a75c..ed899d6508 100644
--- a/windows/configuration/keyboard-filter/toc.yml
+++ b/windows/configuration/keyboard-filter/toc.yml
@@ -1,53 +1,51 @@
 items:
-- name: Keyboard Filter
+- name: About keyboard filter
+  href: index.md
+- name: Key Names
+  href: keyboardfilter-key-names.md
+- name: Predefined Key Combinations
+  href: keyboardfilter-list-all-configured-key-combinations.md
+- name: WMI Provider Reference
   items:
-  - name: About keyboard filter
-    href: index.md
-  - name: Key Names
-    href: keyboardfilter-key-names.md
-  - name: Predefined Key Combinations
+  - name: Overview
+    href: keyboardfilter-wmi-provider-reference.md
+  - name: Class WEKF_CustomKey
+    items:
+    - name: Overview
+      href: wekf-customkey.md
+    - name: Add
+      href: wekf-customkeyadd.md
+    - name: Remove
+      href: wekf-customkeyremove.md
+  - name: Class WEKF_PredefinedKey
+    items:
+    - name: Overview
+      href: wekf-predefinedkey.md
+    - name: Disable
+      href: wekf-predefinedkeydisable.md
+    - name: Enable
+      href: wekf-predefinedkeyenable.md
+  - name: Class WEKF_Scancode
+    items:
+    - name: Overview
+      href: wekf-scancode.md
+    - name: Add
+      href: wekf-scancodeadd.md
+    - name: Remove
+      href: wekf-scancoderemove.md
+  - name: Class WEKF-Settings
+    href: wekf-settings.md
+- name: PowerShell script samples
+  items:
+  - name: Overview
+    href: keyboardfilter-powershell-script-samples.md
+  - name: Add blocked key Combinations
+    href: keyboardfilter-add-blocked-key-combinations.md
+  - name: Disable all blocked key Combinations
+    href: disable-all-blocked-key-combinations.md
+  - name: List all configured key combinations
     href: keyboardfilter-list-all-configured-key-combinations.md
-  - name: WMI Provider Reference
-    items:
-    - name: Overview
-      href: keyboardfilter-wmi-provider-reference.md
-    - name: Class WEKF_CustomKey
-      items:
-      - name: Overview
-        href: wekf-customkey.md
-      - name: Add
-        href: wekf-customkeyadd.md
-      - name: Remove
-        href: wekf-customkeyremove.md
-    - name: Class WEKF_PredefinedKey
-      items:
-      - name: Overview
-        href: wekf-predefinedkey.md
-      - name: Disable
-        href: wekf-predefinedkeydisable.md
-      - name: Enable
-        href: wekf-predefinedkeyenable.md
-    - name: Class WEKF_Scancode
-      items:
-      - name: Overview
-        href: wekf-scancode.md
-      - name: Add
-        href: wekf-scancodeadd.md
-      - name: Remove
-        href: wekf-scancoderemove.md
-    - name: Class WEKF-Settings
-      href: wekf-settings.md
-  - name: PowerShell script samples
-    items:
-    - name: Overview
-      href: keyboardfilter-powershell-script-samples.md
-    - name: Add blocked key Combinations
-      href: keyboardfilter-add-blocked-key-combinations.md
-    - name: Disable all blocked key Combinations
-      href: disable-all-blocked-key-combinations.md
-    - name: List all configured key combinations
-      href: keyboardfilter-list-all-configured-key-combinations.md
-    - name: Modify global settings
-      href: modify-global-settings.md
-    - name: Remove key combination configurations
-      href: remove-key-combination-configurations.md
\ No newline at end of file
+  - name: Modify global settings
+    href: modify-global-settings.md
+  - name: Remove key combination configurations
+    href: remove-key-combination-configurations.md
\ No newline at end of file
diff --git a/windows/configuration/toc.yml b/windows/configuration/toc.yml
index bd322690a3..7d7497ddca 100644
--- a/windows/configuration/toc.yml
+++ b/windows/configuration/toc.yml
@@ -26,11 +26,15 @@ items:
 - name: Windows Configuration Designer
   href: wcd/toc.yml
 - name: Unbranded boot
-  href: unbranded-boot/toc.yml
+  href: unbranded-boot/index.md
 - name: Unified write filter
   href: unified-write-filter/toc.yml
-- name: Keyboard filter
+- name: Keyboard Filter
   href: keyboard-filter/toc.yml
-- name: Custom logon
-  href: custom-logon/toc.yml
+- name: Custom Logon
+  items:
+    - name: Configure Custom Logon
+      href: custom-logon/index.md
+    - name: Troubleshoot
+      href: custom-logon/troubleshoot.md
 
diff --git a/windows/configuration/unified-write-filter/toc.yml b/windows/configuration/unified-write-filter/toc.yml
index d8105e71ec..b4d1417d81 100644
--- a/windows/configuration/unified-write-filter/toc.yml
+++ b/windows/configuration/unified-write-filter/toc.yml
@@ -1,126 +1,123 @@
-
 items:
-- name: Unified Write Filter
+- name: Overview
+  href: index.md
+- name: Hibernate Once/Resume Many (HORM)
+  href: hibernate-once-resume-many-horm.md
+- name: Exclusions
+  href: uwfexclusions.md
+- name: Overlay
+  href: uwfoverlay.md
+- name: Enable
+  href: uwf-turnonuwf.md
+- name: Command Line Utility (uwfmgr.exe)
+  href: uwfmgrexe.md
+- name: Servicing
+  items:
+  - name: Servicing protected devices
+    href: service-uwf-protected-devices.md
+  - name: Antimalware support
+    href: uwf-antimalware-support.md
+  - name: Windows Updates
+    href: uwf-apply-windows-updates.md
+  - name: OEM Updates
+    href: uwf-apply-oem-updates.md
+  - name: Servicing master script
+    href: uwf-master-servicing-script.md
+  - name: Servicing screen saver
+    href: uwf-servicing-screen-saver.md
+- name: Troubleshooting
+  href: uwftroubleshooting.md
+- name: WMI Provider Reference
   items:
   - name: Overview
-    href: index.md
-  - name: Hibernate Once/Resume Many (HORM)
-    href: hibernate-once-resume-many-horm.md
-  - name: Exclusions
-    href: uwfexclusions.md
-  - name: Overlay
-    href: uwfoverlay.md
-  - name: Enable
-    href: uwf-turnonuwf.md
-  - name: Command Line Utility (uwfmgr.exe)
-    href: uwfmgrexe.md
-  - name: Servicing
-    items:
-    - name: Servicing protected devices
-      href: service-uwf-protected-devices.md
-    - name: Antimalware support
-      href: uwf-antimalware-support.md
-    - name: Windows Updates
-      href: uwf-apply-windows-updates.md
-    - name: OEM Updates
-      href: uwf-apply-oem-updates.md
-    - name: Servicing master script
-      href: uwf-master-servicing-script.md
-    - name: Servicing screen saver
-      href: uwf-servicing-screen-saver.md
-  - name: Troubleshooting
-    href: uwftroubleshooting.md
-  - name: WMI Provider Reference
+    href: uwf-wmi-provider-reference.md
+  - name: Class UWF_ExcludedFile
+    href: uwf-excludedfile.md
+  - name: Class UWF_ExcludedRegistryKey
+    href: uwf-excludedregistrykey.md
+  - name: Class UWF_Filter
     items:
     - name: Overview
-      href: uwf-wmi-provider-reference.md
-    - name: Class UWF_ExcludedFile
-      href: uwf-excludedfile.md
-    - name: Class UWF_ExcludedRegistryKey
-      href: uwf-excludedregistrykey.md
-    - name: Class UWF_Filter
-      items:
-      - name: Overview
-        href: uwf-filter.md
-      - name: Disable
-        href: uwf-filterdisable.md
-      - name: Enable
-        href: uwf-filterdisable.md
-      - name: ResetSettings
-        href: uwf-filterresetsettings.md
-      - name: RestartSystem
-        href: uwf-filterrestartsystem.md
-      - name: ShutdownSystem
-        href: uwf-filtershutdownsystem.md
-    - name: Class UWF_Overlay
-      items:
-      - name: Overview
-        href: uwf-overlay.md
-      - name: GetOverlayFiles
-        href: uwf-overlaygetoverlayfiles.md
-      - name: OverlayFile
-        href: uwf-overlayfile.md
-      - name: SetCriticalThreshold
-        href: uwf-overlaysetcriticalthreshold.md
-      - name: SetWarningThreshold
-        href: uwf-overlaysetwarningthreshold.md
-    - name: Class UWF_OverlayConfig
-      items:
-      - name: Overview
-        href: uwf-overlayconfig.md
-      - name: SetMaximumSize
-        href: uwf-overlayconfigsetmaximumsize.md
-      - name: SetType
-        href: uwf-overlayconfigsettype.md
-    - name: Class UWF_RegistryFilter
-      items:
-      - name: Overview
-        href: uwf-registryfilter.md
-      - name: AddExclusion
-        href: uwf-registryfilteraddexclusion.md
-      - name: CommitRegistry
-        href: uwf-registryfiltercommitregistry.md
-      - name: CommitRegistryDeletion
-        href: uwf-registryfiltercommitregistrydeletion.md
-      - name: FindExclusion
-        href: uwf-registryfilterfindexclusion.md
-      - name: GetExclusions
-        href: uwf-registryfiltergetexclusions.md
-      - name: RemoveExclusion
-        href: uwf-registryfilterremoveexclusion.md
-    - name: Class UWF_Servicing
-      items:
-      - name: Overview
-        href: uwf-servicing.md
-      - name: Disable
-        href: uwf-servicingdisable.md
-      - name: Enable
-        href: uwf-servicingenable.md
-      - name: UpdateWindows
-        href: uwf-servicingupdatewindows.md
-    - name: Class UWF_Volume
-      items:
-      - name: Overview
-        href: uwf-volume.md
-      - name: AddExclusion
-        href: uwf-volumeaddexclusion.md
-      - name: CommitFile
-        href: uwf-volumecommitfile.md
-      - name: CommitFileDeletion
-        href: uwf-volumecommitfiledeletion.md
-      - name: FindExclusion
-        href: uwf-volumefindexclusion.md
-      - name: GetExclusions
-        href: uwf-volumegetexclusions.md
-      - name: protect
-        href: uwf-volumeprotect.md
-      - name: RemoveAllExclusions
-        href: uwf-volumeremoveallexclusions.md
-      - name: RemoveExclusion
-        href: uwf-volumeremoveexclusion.md
-      - name: SetBindByDriveLetter
-        href: uwf-volumesetbindbydriveletter.md
-      - name: Unprotect
-        href: uwf-volumeunprotect.md
-    - name: Migration from Enhanced Write Filter
-      href: uwf-wes7-ewf-to-win10-uwf.md
\ No newline at end of file
+      href: uwf-filter.md
+    - name: Disable
+      href: uwf-filterdisable.md
+    - name: Enable
+      href: uwf-filterdisable.md
+    - name: ResetSettings
+      href: uwf-filterresetsettings.md
+    - name: RestartSystem
+      href: uwf-filterrestartsystem.md
+    - name: ShutdownSystem
+      href: uwf-filtershutdownsystem.md
+  - name: Class UWF_Overlay
+    items:
+    - name: Overview
+      href: uwf-overlay.md
+    - name: GetOverlayFiles
+      href: uwf-overlaygetoverlayfiles.md
+    - name: OverlayFile
+      href: uwf-overlayfile.md
+    - name: SetCriticalThreshold
+      href: uwf-overlaysetcriticalthreshold.md
+    - name: SetWarningThreshold
+      href: uwf-overlaysetwarningthreshold.md
+  - name: Class UWF_OverlayConfig
+    items:
+    - name: Overview
+      href: uwf-overlayconfig.md
+    - name: SetMaximumSize
+      href: uwf-overlayconfigsetmaximumsize.md
+    - name: SetType
+      href: uwf-overlayconfigsettype.md
+  - name: Class UWF_RegistryFilter
+    items:
+    - name: Overview
+      href: uwf-registryfilter.md
+    - name: AddExclusion
+      href: uwf-registryfilteraddexclusion.md
+    - name: CommitRegistry
+      href: uwf-registryfiltercommitregistry.md
+    - name: CommitRegistryDeletion
+      href: uwf-registryfiltercommitregistrydeletion.md
+    - name: FindExclusion
+      href: uwf-registryfilterfindexclusion.md
+    - name: GetExclusions
+      href: uwf-registryfiltergetexclusions.md
+    - name: RemoveExclusion
+      href: uwf-registryfilterremoveexclusion.md
+  - name: Class UWF_Servicing
+    items:
+    - name: Overview
+      href: uwf-servicing.md
+    - name: Disable
+      href: uwf-servicingdisable.md
+    - name: Enable
+      href: uwf-servicingenable.md
+    - name: UpdateWindows
+      href: uwf-servicingupdatewindows.md
+  - name: Class UWF_Volume
+    items:
+    - name: Overview
+      href: uwf-volume.md
+    - name: AddExclusion
+      href: uwf-volumeaddexclusion.md
+    - name: CommitFile
+      href: uwf-volumecommitfile.md
+    - name: CommitFileDeletion
+      href: uwf-volumecommitfiledeletion.md
+    - name: FindExclusion
+      href: uwf-volumefindexclusion.md
+    - name: GetExclusions
+      href: uwf-volumegetexclusions.md
+    - name: protect
+      href: uwf-volumeprotect.md
+    - name: RemoveAllExclusions
+      href: uwf-volumeremoveallexclusions.md
+    - name: RemoveExclusion
+      href: uwf-volumeremoveexclusion.md
+    - name: SetBindByDriveLetter
+      href: uwf-volumesetbindbydriveletter.md
+    - name: Unprotect
+      href: uwf-volumeunprotect.md
+  - name: Migration from Enhanced Write Filter
+    href: uwf-wes7-ewf-to-win10-uwf.md
\ No newline at end of file