diff --git a/windows/configuration/assigned-access/toc.yml b/windows/configuration/assigned-access/toc.yml
index ab36c4b859..c5e4738fb7 100644
--- a/windows/configuration/assigned-access/toc.yml
+++ b/windows/configuration/assigned-access/toc.yml
@@ -23,5 +23,7 @@ items:
       href: examples.md
     - name: Assigned Access policy settings
       href: policy-settings.md
+    - name: WMI Class WEDL_AssignedAccess
+      href: wedl-assigneaccess.md
     - name: Assigned Access CSP 🔗
-      href: /windows/client-management/mdm/assignedaccess-csp
\ No newline at end of file
+      href: /windows/client-management/mdm/assignedaccess-csp
diff --git a/windows/configuration/shell-launcher/wedl-assignedaccess.md b/windows/configuration/assigned-access/wedl-assignedaccess.md
similarity index 98%
rename from windows/configuration/shell-launcher/wedl-assignedaccess.md
rename to windows/configuration/assigned-access/wedl-assignedaccess.md
index acdd00a9df..ee8f4a797f 100644
--- a/windows/configuration/shell-launcher/wedl-assignedaccess.md
+++ b/windows/configuration/assigned-access/wedl-assignedaccess.md
@@ -9,7 +9,7 @@ ms.topic: reference
 
 This Windows Management Instrumentation (WMI) provider class configures settings for assigned access.
 
-[!INCLUDE [shell-launcher](../../../includes/licensing/assigned-access.md)]
+[!INCLUDE [assigned-access](../../../includes/licensing/assigned-access.md)]
 
 ## Syntax
 
diff --git a/windows/configuration/shell-launcher/kiosk-mode.md b/windows/configuration/kiosk/kiosk-mode.md
similarity index 96%
rename from windows/configuration/shell-launcher/kiosk-mode.md
rename to windows/configuration/kiosk/kiosk-mode.md
index d5285fa51d..8e0da5e9c0 100644
--- a/windows/configuration/shell-launcher/kiosk-mode.md
+++ b/windows/configuration/kiosk/kiosk-mode.md
@@ -9,7 +9,7 @@ description: Learn about Kiosk Mode in Windows IoT Enterprise.
 
 Windows IoT Enterprise allows you to build fixed purpose devices such as ATM machines, point-of-sale terminals, medical devices, digital signs, or kiosks. Kiosk mode helps you create a dedicated and locked down user experience on these fixed purpose devices. Windows IoT Enterprise offers a set of different locked-down experiences for public or specialized use: [assigned access single-app kiosks](single-app-kiosk.md), [assigned access multi-app kiosks](multi-app-kiosk.md), or [shell launcher](index.md).
 
-Kiosk configurations are based upon either [assigned access](../assigned-access/overview.md) or [shell launcher](index.md). There are several kiosk configuration methods that you can choose from, depending on your answers to the following questions.
+Kiosk configurations are based upon either [assigned access](../assigned-access/index.md) or [shell launcher](index.md). There are several kiosk configuration methods that you can choose from, depending on your answers to the following questions.
 
 > [!NOTE]
 >
diff --git a/windows/configuration/kiosk/toc.yml b/windows/configuration/kiosk/toc.yml
index 91b2b9923c..dd7784fc1a 100644
--- a/windows/configuration/kiosk/toc.yml
+++ b/windows/configuration/kiosk/toc.yml
@@ -1,8 +1,10 @@
 items:
 - name: Overview
   href: index.md
+- name: 🔴 Kiosk mode
+  href: kiosk-mode.md
 - name: 🔴 Browser
-  href: browser-support
+  href: browser-support.md
 - name: Assigned Access
   href: ../assigned-access/toc.yml
 - name: Shell Launcher
diff --git a/windows/configuration/shell-launcher/toc.yml b/windows/configuration/shell-launcher/toc.yml
index 05c3a39c67..8f8482b7d9 100644
--- a/windows/configuration/shell-launcher/toc.yml
+++ b/windows/configuration/shell-launcher/toc.yml
@@ -2,7 +2,11 @@ items:
 - name: Overview
   href: index.md
 - name: 🔴 Overview
-  href: index_old
+  href: index_old.md
+- name: 🔴 Multi-app kiosk
+  href: multi-app-kiosk.md
+- name: 🔴 Single-app kiosk
+  href: single-app-kiosk.md
 - name: Configure a kiosk
   href: configure.md
 - name: "Quickstart: Configure a kiosk"