diff --git a/education/context/context.yml b/education/context/context.yml
index 3f95e464da..861f88f272 100644
--- a/education/context/context.yml
+++ b/education/context/context.yml
@@ -1,4 +1,4 @@
 ### YamlMime: ContextObject
-brand: azure
+brand: windows
 breadcrumb_path: ../breadcrumb/toc.yml
 toc_rel: ../windows/toc.yml
\ No newline at end of file
diff --git a/education/windows/TOC.yml b/education/windows/TOC.yml
index 81f5df768c..e5b7f3298b 100644
--- a/education/windows/TOC.yml
+++ b/education/windows/TOC.yml
@@ -39,7 +39,7 @@ items:
     - name: Configure Take a Test in kiosk mode
       href: edu-take-a-test-kiosk-mode.md
     - name: Configure Shared PC
-      href: /windows/configuration/shared-pc-technical?toc=%2Feducation%2Fwindows%2Ftoc.json&bc=%2Feducation%2Fbreadcrumb%2Ftoc.json
+      href: /windows/configuration/set-up-shared-or-guest-pc?toc=%2Feducation%2Fwindows%2Ftoc.json&bc=%2Feducation%2Fbreadcrumb%2Ftoc.json
     - name: Use the Set up School PCs app
       href: use-set-up-school-pcs-app.md
     - name: Change Windows edition
diff --git a/education/windows/index.yml b/education/windows/index.yml
index ae14226300..1555a28906 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -85,15 +85,15 @@ landingContent:
         links:
         - text: Take tests and assessments in Windows
           url: take-tests-in-windows.md
-        - text: Change Windows editions
-          url: change-home-to-edu.md
         - text: Considerations for shared and guest devices
           url: /windows/configuration/shared-devices-concepts?toc=%2Feducation%2Fwindows%2Ftoc.json&bc=%2Feducation%2Fbreadcrumb%2Ftoc.json
+        - text: Change Windows editions
+          url: change-home-to-edu.md
       - linkListType: how-to-guide
         links:
         - text: Configure Take a Test in kiosk mode
           url: edu-take-a-test-kiosk-mode.md
         - text: Configure Shared PC
-          url: /windows/configuration/shared-pc-technical?toc=%2Feducation%2Fwindows%2Ftoc.json&bc=%2Feducation%2Fbreadcrumb%2Ftoc.json
+          url: /windows/configuration/set-up-shared-or-guest-pc?toc=%2Feducation%2Fwindows%2Ftoc.json&bc=%2Feducation%2Fbreadcrumb%2Ftoc.json
         - text: "Deploy Minecraft: Education Edition"
           url: get-minecraft-for-education.md
\ No newline at end of file
diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md
index 136ca45dca..33e4c04dea 100644
--- a/windows/configuration/set-up-shared-or-guest-pc.md
+++ b/windows/configuration/set-up-shared-or-guest-pc.md
@@ -32,7 +32,7 @@ The customizations offered by Shared PC are listed in the following table.
 | Kiosk mode | <li>**KioskModeAUMID**: configures an application (referred as Application User Model ID - AUMID) to automatically execute when the kiosk account is used to sign in. A new account will be created and will use assigned access to only run the app specified by the AUMID. [Find the Application User Model ID of an installed app](/previous-versions/windows/embedded/dn449300(v=winembedded.82)) </li><li>**KioskModeUserTileDisplayText**: sets the display text on the kiosk account if **KioskModeAUMID** has been set. |
 | Maintenace time | **MaintenanceStartTime**: by default, the maintenance start time (which is when automatic maintenance tasks run, such as Windows Update) is midnight. You can adjust the start time in this setting by entering a new start time in minutes from midnight. For example, if you want maintenance to begin at 2 AM, enter `120` as the value. |
 | Page file size | **MaxPageFileSizeMB**: adjusts the maximum page file size in MB. This can be used to fine-tune page file behavior, especially on low end PCs. |
-| Local storage | **RestrictLocalStorage**: when enabled, users are prevented from saving or viewing local storage while using File Explorer.<li>This setting controls this API: [ShouldAvoidLocalStorage](/uwp/api/windows.system.profile.sharedmodesettings)</li>| 
+| Local storage | **RestrictLocalStorage**: when enabled, users are prevented from saving or viewing local storage while using File Explorer.<li>This setting controls the API: [ShouldAvoidLocalStorage](/uwp/api/windows.system.profile.sharedmodesettings)</li>| 
 | Security | **SignInOnResume**: if enabled, specifies if the user is required to sign in with a password when the PC wakes from sleep. |
 | Sleep settings | **SleepTimeout**: specifies all timeouts for when the PC should sleep. Enter the amount of idle time in seconds. If you don't set sleep timeout, the default of 1 hour applies.|