diff --git a/education/get-started/configure-microsoft-store-for-education.md b/education/get-started/configure-microsoft-store-for-education.md
index 0e275032a5..7e1dec3ff9 100644
--- a/education/get-started/configure-microsoft-store-for-education.md
+++ b/education/get-started/configure-microsoft-store-for-education.md
@@ -52,8 +52,15 @@ You can watch the descriptive audio version here: [Microsoft Education: Configur
 
 Your Microsoft Store for Education account is now linked to Intune for Education so let's set that up next.
 
+<!--
 > [!div class="nextstepaction"]
 > [Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)
+-->
+
+> [!div class="step-by-step"]
+[Enable Microsoft Teams for your school](enable-microsoft-teams.md)
+[Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)
+
 
 ## Related topic
 [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)
\ No newline at end of file
diff --git a/education/get-started/enable-microsoft-teams.md b/education/get-started/enable-microsoft-teams.md
index d3cbe08af6..39574448d6 100644
--- a/education/get-started/enable-microsoft-teams.md
+++ b/education/get-started/enable-microsoft-teams.md
@@ -46,8 +46,14 @@ To get started, IT administrators need to use the Office 365 Admin Center to ena
 
 You can find more info about how to control which users in your school can use Microsoft Teams, turn off group creation, configure tenant-level settings, and more by reading the *Guide for IT admins* getting started guide in the <a href="https://aka.ms/MeetTeamsEdu" target="_blank">Meet Microsoft Teams</a> page.
 
+<!--
 > [!div class="nextstepaction"]
 > [Configure Microsoft Store for Education](configure-microsoft-store-for-education.md)
+-->
+
+> [!div class="step-by-step"]
+[<< Use School Data Sync to import student data](use-school-data-sync.md)
+[Configure Microsoft Store for Education >>](configure-microsoft-store-for-education.md)
 
 
 ## Related topic
diff --git a/education/get-started/set-up-windows-10-education-devices.md b/education/get-started/set-up-windows-10-education-devices.md
index 94a9f4422d..d3f2f989b5 100644
--- a/education/get-started/set-up-windows-10-education-devices.md
+++ b/education/get-started/set-up-windows-10-education-devices.md
@@ -21,9 +21,16 @@ To set up new Windows 10 devices and enroll them to your education tenant, choos
 - **Option 1: [Use the Set up School PCs app](https://docs.microsoft.com/en-us/education/windows/use-set-up-school-pcs-app)** - You can use the app to create a setup file that you can use to quickly set up one or more Windows 10 devices.
 - **Option 2: [Go through Windows OOBE and join the device to Azure AD](set-up-windows-education-devices.md)** - You can go through a typical Windows 10 device setup or first-run experience to configure your device.
 
-
+<!--
 > [!div class="nextstepaction"]
 > [Finish setup and other tasks](finish-setup-and-other-tasks.md)
+-->
+
+
+> [!div class="step-by-step"]
+[<< Use Intune for Education to manage groups, apps, and settings](use-intune-for-education.md)
+[Finish setup and other tasks >>](finish-setup-and-other-tasks.md)
+
 
 
 ## Related topic
diff --git a/education/get-started/set-up-windows-education-devices.md b/education/get-started/set-up-windows-education-devices.md
index d73bf433f8..ad79d03cb5 100644
--- a/education/get-started/set-up-windows-education-devices.md
+++ b/education/get-started/set-up-windows-education-devices.md
@@ -20,9 +20,7 @@ If you are setting up a Windows 10 device invidividually, and network bandwidth
 You can watch the video to see how this is done, or follow the step-by-step guide. </br>
 
 <center><iframe src="https://www.youtube.com/embed/nADWqBYvqXk" width="960" height="540" allowFullScreen frameBorder="0"></iframe></center>
-<!--
-<div style="position:relative;height:0;padding-bottom:56.25%"><iframe src="https://www.youtube.com/embed/nADWqBYvqXk?ecver=2" width="640" height="360" frameborder="0" style="position:absolute;width:100%;height:100%;left:0" allowfullscreen></iframe></div>
--->
+
 You can watch the descriptive audio version here: [Microsoft Education: Set up a new Windows 10 education devices using the Windows setup experience (DA)](https://www.youtube.com/watch?v=_UtS1Cz2Pno)
 
 ## To set up Windows 10 devices using OOBE
diff --git a/education/get-started/use-intune-for-education.md b/education/get-started/use-intune-for-education.md
index cf61b2a622..b2a9e67e9d 100644
--- a/education/get-started/use-intune-for-education.md
+++ b/education/get-started/use-intune-for-education.md
@@ -206,8 +206,15 @@ Now that you've bought the apps, use Intune for Education to specify the group t
 
 You're now done assigning apps to all users in your tenant. It's time to set up your Windows 10 device(s) and check that your cloud infrastructure is correctly set up and your apps are being pushed to your devices from the cloud.
 
+<!--
 > [!div class="nextstepaction"]
 > [Set up Windows 10 devices](set-up-windows-10-education-devices.md)
+-->
+
+> [!div class="step-by-step"]
+[<< Configure Microsoft Store for Education](configure-microsoft-store-for-education.md)
+[Set up Windows 10 education devices >>](set-up-windows-10-education-devices.md)
+
 
 
 ## Related topic
diff --git a/education/get-started/use-school-data-sync.md b/education/get-started/use-school-data-sync.md
index 8d0bd5724a..6c9b89cb9d 100644
--- a/education/get-started/use-school-data-sync.md
+++ b/education/get-started/use-school-data-sync.md
@@ -170,9 +170,14 @@ To learn more about the CSV files that are required and the info you need to inc
 
 That's it for importing sample school data using SDS.
 
+<!--
 > [!div class="nextstepaction"]
 > [Enable Microsoft Teams for your school](enable-microsoft-teams.md)
+-->
 
+> [!div class="step-by-step"]
+[<< Set up an Office 365 education tenant](set-up-office365-edu-tenant.md)
+[Enable Microsoft Teams for your school >>](enable-microsoft-teams.md)
 
 ## Related topic
 [Get started: Deploy and manage a full cloud IT solution with Microsoft Education](get-started-with-microsoft-education.md)
\ No newline at end of file
diff --git a/education/windows/take-a-test-app-technical.md b/education/windows/take-a-test-app-technical.md
index b7bb11b7ff..803ad7376f 100644
--- a/education/windows/take-a-test-app-technical.md
+++ b/education/windows/take-a-test-app-technical.md
@@ -74,6 +74,26 @@ When Take a Test is running, the following functionality is available to student
     - Ctrl+Alt+Del 
     - Alt+F4 (Take a Test will restart if the student is using a dedicated test account)
 
+## Policies
+
+If the lock screen is disabled, Take aTest will not launch above lock. Be aware that if you set the following Group Policy, this breaks activation of Take a Test above lock.
+
+**Group Policy path:** Computer Configuration\Administrative Templates\Control Panel\Personalization\
+**Group Policy name:** Do not display the lock screen
+**ADML:** %SDXROOT%\shell\policies\ControlPanelDisplay.adml
+**ADMX:** %SDXROOT%\shell\policies\ControlPanelDisplay.admx
+ 
+```
+<policy name="CPL_Personalization_NoLockScreen" class="Machine"
+        displayName="$(string.CPL_Personalization_NoLockScreen)"
+        explainText="$(string.CPL_Personalization_NoLockScreen_Help)"
+        key="Software\Policies\Microsoft\Windows\Personalization"
+        valueName="NoLockScreen">
+  <parentCategory ref="Personalization" />
+  <supportedOn ref="windows:SUPPORTED_Windows8" />
+</policy>
+```
+
 
 ## Learn more