diff --git a/devices/surface-hub/TOC-old.md b/devices/surface-hub/TOC-old.md
deleted file mode 100644
index 058ddefab4..0000000000
--- a/devices/surface-hub/TOC-old.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# [Microsoft Surface Hub](index.md)
-## [What's new in Windows 10, version 1703 for Surface Hub?](surfacehub-whats-new-1703.md)
-## [Differences between Surface Hub and Windows 10 Enterprise](differences-between-surface-hub-and-windows-10-enterprise.md)
-## [Prepare your environment for Microsoft Surface Hub](prepare-your-environment-for-surface-hub.md)
-### [Surface Hub Site Readiness Guide](surface-hub-site-readiness-guide.md)
-### [Physically install Microsoft Surface Hub](physically-install-your-surface-hub-device.md)
-### [Create and test a device account](create-and-test-a-device-account-surface-hub.md)
-#### [Online deployment](online-deployment-surface-hub-device-accounts.md)
-#### [On-premises deployment (single forest)](on-premises-deployment-surface-hub-device-accounts.md)
-#### [On-premises deployment (multiple forests)](on-premises-deployment-surface-hub-multi-forest.md)
-#### [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md)
-#### [Online or hybrid deployment using Skype Hybrid Voice environment](skype-hybrid-voice.md)
-#### [Create a device account using UI](create-a-device-account-using-office-365.md)
-#### [Microsoft Exchange properties](exchange-properties-for-surface-hub-device-accounts.md)
-#### [Applying ActiveSync policies to device accounts](apply-activesync-policies-for-surface-hub-device-accounts.md)
-#### [Password management](password-management-for-surface-hub-device-accounts.md)
-### [Create provisioning packages](provisioning-packages-for-surface-hub.md)
-### [Admin group management](admin-group-management-for-surface-hub.md)
-## [Set up Microsoft Surface Hub](set-up-your-surface-hub.md)
-### [Setup worksheet](setup-worksheet-surface-hub.md)
-### [First-run program](first-run-program-surface-hub.md)
-## [Manage Microsoft Surface Hub](manage-surface-hub.md)
-### [Remote Surface Hub management](remote-surface-hub-management.md)
-#### [Manage settings with an MDM provider](manage-settings-with-mdm-for-surface-hub.md)
-#### [Monitor your Surface Hub](monitor-surface-hub.md)
-#### [Windows updates](manage-windows-updates-for-surface-hub.md)
-### [Manage Surface Hub settings](manage-surface-hub-settings.md)
-#### [Local management for Surface Hub settings](local-management-surface-hub-settings.md)
-#### [Accessibility](accessibility-surface-hub.md)
-#### [Change the Surface Hub device account](change-surface-hub-device-account.md)
-#### [Device reset](device-reset-surface-hub.md)
-#### [Use fully qualified domain name with Surface Hub](use-fully-qualified-domain-name-surface-hub.md)
-#### [Wireless network management](wireless-network-management-for-surface-hub.md)
-### [Install apps on your Surface Hub](install-apps-on-surface-hub.md)
-### [Configure Surface Hub Start menu](surface-hub-start-menu.md)
-### [Set up and use Microsoft Whiteboard](whiteboard-collaboration.md) 
-### [End a Surface Hub meeting with End session](i-am-done-finishing-your-surface-hub-meeting.md)
-### [Sign in to Surface Hub with Microsoft Authenticator](surface-hub-authenticator-app.md)
-### [Save your BitLocker key](save-bitlocker-key-surface-hub.md)
-### [Connect other devices and display with Surface Hub](connect-and-display-with-surface-hub.md)
-### [Miracast on existing wireless network or LAN](miracast-over-infrastructure.md)
-### [Enable 802.1x wired authentication](enable-8021x-wired-authentication.md)
-### [Using a room control system](use-room-control-system-with-surface-hub.md)
-### [Implement Quality of Service on Surface Hub](surface-hub-qos.md)
-### [Using the Surface Hub Recovery Tool](surface-hub-recovery-tool.md)
-### [Surface Hub SSD replacement](surface-hub-ssd-replacement.md)
-## [PowerShell for Surface Hub](appendix-a-powershell-scripts-for-surface-hub.md)
-## [How Surface Hub addresses Wi-Fi Direct security issues](surface-hub-wifi-direct.md)
-## [Top support solutions for Surface Hub](support-solutions-surface-hub.md)
-## [Troubleshoot Microsoft Surface Hub](troubleshoot-surface-hub.md)
-## [Troubleshoot Miracast on Surface Hub](miracast-troubleshooting.md)
-## [Useful downloads for Surface Hub administrators](surface-hub-downloads.md)
-## [Technical information for 55” Microsoft Surface Hub](surface-hub-technical-55.md)
-## [Technical information for 84” Microsoft Surface Hub ](surface-hub-technical-84.md)
-## [Change history for Surface Hub](change-history-surface-hub.md)
\ No newline at end of file
diff --git a/devices/surface-hub/TOC.md b/devices/surface-hub/TOC.md
index 2a580770fb..d54e783b10 100644
--- a/devices/surface-hub/TOC.md
+++ b/devices/surface-hub/TOC.md
@@ -8,7 +8,7 @@
 ### [Operating system essentials (Surface Hub) ](differences-between-surface-hub-and-windows-10-enterprise.md)
 
 ## Plan
-### Surface Hub 2S Site Readiness Guide 
+### [Surface Hub 2S Site Readiness Guide](surface-hub-2s-site-readiness-guide.md) 
 #### [Site planning for Surface Hub 2S](surface-hub-2s-site-planning.md)
 #### [Surface Hub 2S quick start](surface-hub-2s-quick-start.md)
 #### [Installing and mounting Surface Hub 2S](surface-hub-2s-install-mount.md)
@@ -17,17 +17,15 @@
 #### [Surface Hub 2S ports and keypad overview](surface-hub-2s-port-keypad-overview.md)
 #### [Connecting to Surface Hub 2S](surface-hub-2s-connect.md)
 ### [Prepare your environment for Microsoft Surface Hub 2S](surface-hub-2s-prepare-environment.md)
-### [Configure phone authentication for Surface Hub 2S](surface-hub-2s-phone-authenticate.md)
+### [Configure Easy Authentication for Surface Hub 2S](surface-hub-2s-phone-authenticate.md)
 
 ## Deploy
 ### [Surface Hub 2S deployment checklist](surface-hub-2s-deploy-checklist.md)
 ### [Create Surface Hub 2S device account](surface-hub-2s-account.md)
-### [Deploy Surface Hub 2S](surface-hub-2s-deploy.md)
+### [Create provisioning packages for Surface Hub 2S](surface-hub-2s-deploy.md)
 ### [Deploy apps to Surface Hub 2S using Intune](surface-hub-2s-deploy-apps-intune.md)
 ### [Configure Surface Hub 2S with PowerShell](surface-hub-2s-configure-with-powershell.md)
 ### [Create Surface Hub 2S on-premises accounts with PowerShell](surface-hub-2s-onprem-powershell.md)
-### [First time setup on Surface Hub 2S](surface-hub-2s-startup.md)
-### [Deploy apps with Microsoft Intune](surface-hub-2s-deploy-apps-intune.md)
 
 ## Manage
 ### [Managing Surface Hub 2S with Microsoft Intune](surface-hub-2s-manage-intune.md)
diff --git a/devices/surface-hub/index-old.md b/devices/surface-hub/index-old.md
deleted file mode 100644
index 82f19b1a90..0000000000
--- a/devices/surface-hub/index-old.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-title: Microsoft Surface Hub admin guide
-description: Documents related to the Microsoft Surface Hub.
-ms.assetid: 69C99E91-1441-4318-BCAF-FE8207420555
-ms.prod: surface-hub
-ms.sitesec: library
-author: jdeckerms
-ms.author: jdecker
-ms.topic: article
-ms.date: 09/07/2017
-ms.localizationpriority: medium
----
-
-# Microsoft Surface Hub admin guide
-
->[Looking for the Surface Hub admin guide for Windows 10, version 1607?](https://download.microsoft.com/download/7/2/5/7252051B-7E97-4781-B5DF-58D4B1A4BB88/surface-hub-admin-guide-1607.pdf)
-
->[Looking for the user's guide for Surface Hub?](https://download.microsoft.com/download/3/6/B/36B6331E-0C63-4E71-A05D-EE88D05081F8/surface-hub-user-guide-en-us.pdf)
-
-
-<table><tr><td style="border: 0px;width: 75%;valign= top">Microsoft Surface Hub is an all-in-one productivity device that is intended for brainstorming, collaboration, and presentations. In order to get the maximum benefit from Surface Hub, your organization’s infrastructure and the Surface Hub itself must be properly set up and integrated. The documentation in this library describes what needs to be done both before and during setup in order to help you optimize your use of the device.</td><td align="left" style="border: 0px">![image of a Surface Hub](images/surfacehub.png) </td></tr></table>
- 
-
-## Surface Hub setup process
-
-In some ways, adding your new Surface Hub is just like adding any other Microsoft Windows-based device to your network. However, in order to get your Surface Hub up and running at its full capacity, there are some very specific requirements. Here are the next topics you'll need:
-
-1. [Prepare your environment for Surface Hub](prepare-your-environment-for-surface-hub.md)
-2. [Gather the information listed in the Setup worksheet](setup-worksheet-surface-hub.md)
-2. [Physically install your Surface Hub device](physically-install-your-surface-hub-device.md)
-3. [Run the Surface Hub first-run setup program (OOBE)](first-run-program-surface-hub.md)
-
-
-
-## In this section
-
-| Topic | Description |
-| --- | --- |
-| [What's new in Windows 10, version 1703 for Surface Hub?](surfacehub-whats-new-1703.md) | Discover the changes and improvements for Microsoft Surface Hub in the Windows 10, version 1703 release (also known as Creators Update). |
-| [Differences between Surface Hub and Windows 10 Enterprise](differences-between-surface-hub-and-windows-10-enterprise.md) | This topic explains the differences between the operating system on Surface Hub and Windows 10 Enterprise. |
-| [Prepare your environment for Microsoft Surface Hub](prepare-your-environment-for-surface-hub.md) | This section contains an overview of the steps required to prepare your environment so that you can use all of the features of Surface Hub. See [Intro to Surface Hub](intro-to-surface-hub.md) for a description of how the device and its features interact with your IT environment. |
-| [Set up Microsoft Surface Hub](set-up-your-surface-hub.md) | Set up instructions for Surface Hub include a setup worksheet, and a walkthrough of the first-run program. |
-| [Manage Microsoft Surface Hub](manage-surface-hub.md) | How to manage your Surface Hub after finishing the first-run program. |
-| [PowerShell for Surface Hub](appendix-a-powershell-scripts-for-surface-hub.md) |
-| [How Surface Hub addresses Wi-Fi Direct security issues](surface-hub-wifi-direct.md) | This topic provides guidance on Wi-Fi Direct security risks, how the Surface Hub has addressed those risks, and how Surface Hub administrators can configure the device for the highest level of security.  | PowerShell scripts to help set up and manage your Surface Hub. |
-| [Top support solutions for Surface Hub](support-solutions-surface-hub.md) | These are the top Microsoft Support solutions for common issues experienced using Surface Hub. |
-| [Troubleshoot Microsoft Surface Hub](troubleshoot-surface-hub.md) | Troubleshoot common problems, including setup issues, Exchange ActiveSync errors. |
-| [Troubleshoot Miracast on Surface Hub](miracast-troubleshooting.md) | Learn how to resolve Miracast issues. |
-| [Useful downloads for Surface Hub administrators](surface-hub-downloads.md) | This topic provides links to useful Surface Hub documents. |
-| [Change history for Surface Hub](change-history-surface-hub.md) | This topic lists new and updated topics in the Surface Hub documentation library. |
-
-
-
-## Additional resources
-
-- [Surface Hub update history](https://support.microsoft.com/help/4037666/surface-surface-hub-update-history)
-- [Surface Hub help](https://support.microsoft.com/hub/4343507/surface-hub-help)
-- [Surface IT Pro Blog](https://blogs.technet.microsoft.com/surface/)
-- [Surface Playlist of videos](https://www.youtube.com/playlist?list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ)
-- [Microsoft Surface on Twitter](https://twitter.com/surface)
-
diff --git a/devices/surface-hub/index.md b/devices/surface-hub/index.md
index a99060c42a..6f051de2d4 100644
--- a/devices/surface-hub/index.md
+++ b/devices/surface-hub/index.md
@@ -12,7 +12,7 @@ description: "Get started with Microsoft Surface Hub."
 ---
 # Get started with Surface Hub
 
-Microsoft Surface Hub 2S is an all-in one productivity device for brainstorming, collaboration, and presentations. Use the links to content below to learn how to plan, deploy, manage, and support your Surface Hub devices.
+Surface Hub 2S is an all-in-one digital interactive whiteboard, meetings platform, and collaborative computing device that brings the power of Windows 10 to team collaboration. Use the links below to learn how to plan, deploy, manage, and support your Surface Hub devices.
 
 <ul class="panelContent cardsF">
     <li>
diff --git a/devices/surface-hub/surface-hub-2s-account.md b/devices/surface-hub/surface-hub-2s-account.md
index 9597d7284e..348bce4e21 100644
--- a/devices/surface-hub/surface-hub-2s-account.md
+++ b/devices/surface-hub/surface-hub-2s-account.md
@@ -25,9 +25,9 @@ Complete advanced configuration tasks using Windows PowerShell. For example:
 
 For more information, see [Configure Surface Hub 2S accounts with PowerShell](surface-hub-2s-configure-with-powershell.md).
 
-## Create account using Office 365 portal
+## Create account using Microsoft 365 admin center
 
-1. In the Microsoft 365 Admin Center, go to Resources and choose Rooms & Equipment and then click +Room.
+1. In the Microsoft 365 admin center, go to **Resources** and choose **Rooms & Equipment** and then select **+ Room**.
 
 2. Provide a name and email address for the device account. Leave remaining settings unchanged in the default state.
 
diff --git a/devices/surface-hub/surface-hub-2s-connect.md b/devices/surface-hub/surface-hub-2s-connect.md
index eec4f12605..f83a4e0b1c 100644
--- a/devices/surface-hub/surface-hub-2s-connect.md
+++ b/devices/surface-hub/surface-hub-2s-connect.md
@@ -17,10 +17,10 @@ Surface Hub 2S lets you connect external devices, mirror the display on Surface
 
 ## Connect external PCs and related devices
 
-You can display content from your devices to Surface Hub 2S. If the source device is Windows-based, that device can also provide TouchBack and InkBack, which takes video and audio from the connected device and presents them on Surface Hub 2S. If Surface Hub 2S encounters a High-Bandwidth Digital Content Protection (HDCP) signal, such as a Blu-ray DVD player, the source is displayed as a black image. To display your content without violating HDCP requirements, use the keypad of Surface Hub 2S to directly choose the external source via a wired connection such as USB-C or HDMI.
+You can display content from your devices to Surface Hub 2S. If the source device is Windows-based, that device can also provide TouchBack and InkBack, which takes video and audio from the connected device and presents them on Surface Hub 2S. If Surface Hub 2S encounters a High-Bandwidth Digital Content Protection (HDCP) signal, such as a Blu-ray DVD player, the source is displayed as a black image.
 
 > [!NOTE]
-> Surface Hub-2S will use the video input that you select until a new connection is made, the existing connection is disrupted, or the Connect App is closed.
+> Surface Hub-2S uses the video input selected until a new connection is made, the existing connection is disrupted, or the Connect App is closed.
 
 ## Recommended wired configurations for connecting to Surface Hub 2S
 
diff --git a/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md b/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
index 03473f2577..c7cbab0851 100644
--- a/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
+++ b/devices/surface-hub/surface-hub-2s-deploy-apps-intune.md
@@ -28,23 +28,29 @@ You can install additional apps to fit your team or organization's needs.
 
 You can deploy Universal Windows Platform (UWP) apps to Surface Hub 2S using Intune, easing app deployment to devices.
 
-1. To deploy apps, enable MDM for your organization. In the Intune portal, select **Intune** as your MDM Authority (recommended).
+1. To deploy apps, enable MDM for your organization. In the Intune portal, select **Intune** as your MDM Authority (recommended). <br>
 
     ![Choose MDM authority](images/sh2-set-intune5.png)
 
-2. Enable the Microsoft Store for Business in Intune. Open Intune, select **Client apps** > **Microsoft Store for Business.**
+2. Enable the Microsoft Store for Business in Intune. Open Intune, select **Client apps** > **Microsoft Store for Business.** <br>
 
     ![Enable Store for Business](images/sh2-deploy-apps-sync.png)
 
-3. In Intune open **Microsoft Store for Business** and select **Settings** > **Distribute** > **Management tools**. Choose **Microsoft Intune** as your management tool.
+3. In Intune open **Microsoft Store for Business** and select **Settings** > **Distribute** > **Management tools**. Choose **Microsoft Intune** as your management tool. <br>
 
     ![Add Intune as your management tool](images/sh2-set-intune8.png)
 
 4. In Microsoft Store for Business, select **Settings** > **Shop** > **Shopping Experience**, and then select **Show offline apps**. Offline apps refer to apps that can be synced to Intune and centrally deployed to a device.
 5. After enabling Offline shopping, you can acquire offline licenses for apps that you can sync to Intune and deploy as Device licensing.
 6. In **Intune** > **Client apps** > **Microsoft Store for Business**, select **Sync**.
-7. In the Client apps page, search for the app in the apps list. Assign the apps to the desired device group or groups. Select **Assignments** > **Add group**. ![*Assigning apps to groups *](images/sh2-assign-group.png) <br>
-8. Under assignment type, choose **Required**.
+7. In the Client apps page, search for the app in the apps list. Assign the apps to the desired device group or groups. Select **Assignments** > **Add group**. <br>
+
+![*Assigning apps to groups *](images/sh2-assign-group.png) <br>
+
+8. Under assignment type, choose **Required**. <br>
+
 ![*Assigning apps to groups *](images/sh2-add-group.png) <br>
-9. For the selected groups, choose **Device licensing** and then select **OK** and save the assignment.
-![*Assigning apps to groups *](images/sh2-apps-assign.png) <br>
+
+9. For the selected groups, choose **Device licensing** and then select **OK** and save the assignment. <br>
+ 
+![*Assigning apps to groups *](images/sh2-apps-assign.png)
diff --git a/devices/surface-hub/surface-hub-2s-deploy.md b/devices/surface-hub/surface-hub-2s-deploy.md
index 9046d56858..59d66af7f3 100644
--- a/devices/surface-hub/surface-hub-2s-deploy.md
+++ b/devices/surface-hub/surface-hub-2s-deploy.md
@@ -17,7 +17,7 @@ You can use Windows Configuration Designer (WCD) to create provisioning packages
 
 ### Install Windows Configuration Designer
 
-Install Windows Configuration Designer from the Windows Assessment and Deployment Kit (ADK) for Windows 10. Download and install the [ADK for Windows 10, version 1703](https://go.microsoft.com/fwlink/p/?LinkId=845542) . For more information, see [Download and install the Windows ADK](https://docs.microsoft.com/en-us/windows-hardware/get-started/adk-install) 
+Install Windows Configuration Designer from the Windows Assessment and Deployment Kit (ADK) for Windows 10. Download and install the [ADK for Windows 10, version 1703](https://go.microsoft.com/fwlink/p/?LinkId=845542). For more information, see [Download and install the Windows ADK](https://docs.microsoft.com/en-us/windows-hardware/get-started/adk-install).
 
 ### Add certificates
 
diff --git a/devices/surface-hub/surface-hub-2s-install-mount.md b/devices/surface-hub/surface-hub-2s-install-mount.md
index a3269296d3..5640e07bc4 100644
--- a/devices/surface-hub/surface-hub-2s-install-mount.md
+++ b/devices/surface-hub/surface-hub-2s-install-mount.md
@@ -17,11 +17,19 @@ Surface Hub 2S is designed for ease of mobility with a form factor that enables
 
 You can mount Surface Hub 2S with the certified wall mount or the certified mobile stand, both developed in partnership with Steelcase. Both fully integrate with the design of Surface Hub 2S, enabling unimpeded access to the compute cartridge along with all I/O ports and power. 
 
-For more information, see [Officially licensed third-party accessories](http://licensedhardware.azurewebsites.net/surface) and view installation demos from the Surface product team:
-
-- [Unboxing and set up](https://youtu.be/fCrxdNXvru4)
-- [Steelcase mobile stand and APC battery set up](https://youtu.be/VTzdu4Skpkg)
+For more information, see [Officially licensed third-party accessories](http://licensedhardware.azurewebsites.net/surface) and view installation demos from the Surface product team at [Steelcase mobile stand and APC battery set up](https://youtu.be/VTzdu4Skpkg).
 
  ![Surface Hub 2S on Roam Mobile Stand](images/sh2-mobile-stand.png)<br>
 
 If you’re not using licensed accessories, see [Customizing installation of Surface Hub 2S](surface-hub-2s-connect.md).
+
+| 1. **Set up your mount first** | |
+|:------ |:-------- |
+| Leave your Surface Hub in the box until the mount is set up and mounting hardware is applied. Mount is not included. Your mount is sold separately. | ![* Set up your mount first *](images/sh2-setup-1.png) <br> |
+| 2. **Attach hardware to the Surface Hub** | |
+| Mounting hardware and specific instructions are found in the box for your mount. | ![* Attach hardware to the Surface Hub *](images/sh2-setup-2.png) <br> |
+| 3. **Remove the instructional label before mounting.** | |
+| Get someone to help you lift and mount your Surface Hub. Make sure to hold and lift the Surface Hub from the bottom. | ![* Remove the instructional label before mounting *](images/sh2-setup-3.png) <br> |
+| 4. **Attach accessories and power on** | |
+| Install accessories and attach power cable as shown. See guides on the screen cling. Remove cling wrap from the screen. Press the power button to power on. | ![* Attach accessories and power on *](images/sh2-setup-4.png) <br> |
+
diff --git a/devices/surface-hub/surface-hub-2s-phone-authenticate.md b/devices/surface-hub/surface-hub-2s-phone-authenticate.md
index c40c5f96ce..fddd72900c 100644
--- a/devices/surface-hub/surface-hub-2s-phone-authenticate.md
+++ b/devices/surface-hub/surface-hub-2s-phone-authenticate.md
@@ -15,7 +15,8 @@ ms.localizationpriority: Normal
 
 Easy Authentication simplifies signing-in to your meetings and files on Surface Hub 2S.
 
-Note: Easy Authentication requires that your primary email address must match your UPN.
+> [!NOTE]
+> Easy Authentication requires that your primary email address must match your UPN.
 
 ## To set up Easy Authentication
 
diff --git a/devices/surface-hub/surface-hub-2s-quick-start.md b/devices/surface-hub/surface-hub-2s-quick-start.md
index fcd3dcdc8f..87103e79f6 100644
--- a/devices/surface-hub/surface-hub-2s-quick-start.md
+++ b/devices/surface-hub/surface-hub-2s-quick-start.md
@@ -20,17 +20,9 @@ ms.localizationpriority: Normal
 3. In the base of the Surface Hub 2S, open the accessories box containing the setup guide, Surface Hub 2 pen, Surface Hub 2 camera, and the power cable.
 4. On the back of the Surface Hub, there's an instructional label showing you where to attach the mounting hardware. Install them in place and remove the label.
 
-| 1. **Set up your mount first** | |
-|------ | -------- |
-| Leave your Surface Hub in the box until the mount is set up and mounting hardware is applied. Mount is not included. Your mount is sold separately. | ![* Set up your mount first *](images/sh2-setup-1.png) <br> |
-| 2. **Attach hardware to the Surface Hub** | |
-| Mounting hardware and specific instructions are found in the box for your mount. | ![* Attach hardware to the Surface Hub *](images/sh2-setup-2.png) <br> |
-| 3. **Remove the instructional label before mounting.** | |
-| Get someone to help you lift and mount your Surface Hub. Make sure to hold and lift the Surface Hub from the bottom. | ![* Remove the instructional label before mounting *](images/sh2-setup-3.png) <br> |
-| 4. **Attach accessories and power on** | |
-| Install accessories and attach power cable as shown. See guides on the screen cling. Remove cling wrap from the screen. Press the power button to power on. | ![* Attach accessories and power on *](images/sh2-setup-4.png) <br> |
+See this video for more information about [unboxing and set up](https://youtu.be/fCrxdNXvru4).
 
-## Install and adjust pen 
+## Install and adjust pen
 
 1. Attach Surface Hub 2 pen magnetically to your preferred side of the device.
 
@@ -41,9 +33,10 @@ ms.localizationpriority: Normal
 ![*Adjust the slider to change pen pressure *](images/sh2-pen-pressure.png) <br>
 
 ## Install camera
+
 Remove the lens cling from the camera and attach it to the USB-C port on the top of the Surface Hub 2S.
 
 ## Start Surface Hub 2S
 
 1. Insert the power cable into the back of the device and plug it into a power outlet. Run the cable through any cable guides on your mounting solution and remove the screen clang.
-2. To begin, press the power button on the bottom right. To learn more about running the out of the box (OOBE) setup of Surface Hub 2S, see [Out-of-box startup for Surface Hub 2S](surface-hub-2s-startup.md).
+2. To begin, press the power button on the bottom right.
diff --git a/devices/surface-hub/surface-hub-2s-service-update.md b/devices/surface-hub/surface-hub-2s-service-update.md
deleted file mode 100644
index 75d2e652c6..0000000000
--- a/devices/surface-hub/surface-hub-2s-service-update.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: "Servicing and updating Surface Hub 2S"
-description: "Learn more about servicing and updating in Surface Hub 2S."
-keywords: separate values with commas
-ms.prod: surface-hub
-ms.sitesec: library
-author: robmazz
-ms.author: robmazz
-audience: Admin
-ms.topic: article
-ms.localizationpriority: Normal
-ROBOTS: NOINDEX, NOFOLLOW
----
-
-# Servicing and updating Surface Hub 2S
\ No newline at end of file
diff --git a/devices/surface-hub/surface-hub-2s-site-planning.md b/devices/surface-hub/surface-hub-2s-site-planning.md
index 0986c0fe3d..6837b360bc 100644
--- a/devices/surface-hub/surface-hub-2s-site-planning.md
+++ b/devices/surface-hub/surface-hub-2s-site-planning.md
@@ -19,7 +19,7 @@ Designed for team collaboration, Surface Hub 2S can transform the way you work
 
 ## Room considerations
 
-Designed for interactive use in smaller conference rooms and huddle spaces, Surface Hub 2S provides a 4K camera, beam-forming microphones, crystal clear speakers, and a brilliant 4K+ resolution display. Optimizing the user experience in larger spaces with more people further away from the display may require peripherals such as an extra camera, microphone, or room systems solution such as Microsoft Teams Rooms. Use the following proximity guidance to determine if you need to plan for peripherals.
+Designed for interactive use in smaller conference rooms and huddle spaces, Surface Hub 2S provides a 4K camera, 8-element microphone array, crystal clear speakers, and a brilliant 4K+ resolution display. Optimizing the user experience in larger spaces with more people further away from the display may require peripherals such as an extra camera, microphone, or room systems solution such as Microsoft Teams Rooms. Use the following proximity guidance to determine if you need to plan for peripherals.
 
 
 | **Room size**     | **Participants** | **Proximity**        | **Additional peripherals** |
diff --git a/devices/surface-hub/surface-hub-2s-techspecs.md b/devices/surface-hub/surface-hub-2s-techspecs.md
index 67b81fde8a..fe9ecec1c7 100644
--- a/devices/surface-hub/surface-hub-2s-techspecs.md
+++ b/devices/surface-hub/surface-hub-2s-techspecs.md
@@ -13,15 +13,13 @@ ms.localizationpriority: Normal
 
 # Surface Hub 2S tech specs
 
-## General specs
-
 |**Item**|**Details**|
 |:------ |:--------- |
-|**Size**| 29.2" x 43.2" x 3.0” (741 mm x 1097 mm x 76 mm) |
+|**Dimensions**| 29.2" x 43.2" x 3.0” (741 mm x 1097 mm x 76 mm) |
 |**Weight**| 61.6 lbs. (28 kg) |
 |**Resolution**| 3840 x 2560 |
 |**Display**| PixelSense Display, 3:2 aspect ratio, 10-bit color, 15.5 mm border, anti-glare, IPS LCD |
-|**Compute**| Quad-core 8th Generation Intel Core i5 processor, 8 GB RAM, 128 GB SSD <sup>1</sup> |
+|**Processor**| Quad-core 8th Generation Intel Core i5 processor, 8 GB RAM, 128 GB SSD <sup>1</sup> |
 |**Graphics**| Intel UHD Graphics 620 |
 |**Wireless**| Wi-Fi 5 (IEEE 802.11 a/b/g/n/ac compatible) Bluetooth Wireless 4.1 technology <br> Miracast display |
 |**Connections**| USB-A <br> Mini-DisplayPort 1.2 video output <br> RJ45 gigabit Ethernet (1000/100/10 BaseT) <br> HDMI video input (HDMI 2.0, HDCP 2.2 /1.4) <br> USB-C with DisplayPort input <br> Four USB-C (on display) |
@@ -29,7 +27,6 @@ ms.localizationpriority: Normal
 |**Audio/Video**| Full-range, front facing 3-way stereo speakers <br> Full band 8-element MEMS microphone array <br> Microsoft Surface Hub 2 Camera, 4K, USB-C connection, 90-degree HFOV |
 |**Pen**| Microsoft Surface Hub 2 Pen (active) |
 |**Software**| Windows 10 <br> Microsoft Teams for Surface Hub <sup>2</sup> <br> Skype for Business <br> Microsoft Whiteboard <br> Microsoft Office (Mobile) <br> Microsoft Power BI <sup>2</sup> |
-|**Connections**| USB-A <br> Mini-DisplayPort video output <br> RJ45 Gigabit Ethernet <br> HDMI video input <br> USB-C with DisplayPort input <br> Four USB-C (on display) |
 |**Exterior**| Casing: Precision machined aluminum with mineral-composite resin <br> Color: Platinum <br> Physical Buttons: Power, Volume, Source |
 |**What’s in the box**| One Surface Hub 2S <br> One Surface Hub 2 Pen  <br> One Surface Hub 2 Camera <br> 2.5 m AC Power Cable <br> Quick Start Guide |
 |**Warranty**| 1-year limited hardware warranty |
diff --git a/devices/surface-hub/surface-hub-2s-whats-new.md b/devices/surface-hub/surface-hub-2s-whats-new.md
index 3b46fffc8f..7efb9ca4b3 100644
--- a/devices/surface-hub/surface-hub-2s-whats-new.md
+++ b/devices/surface-hub/surface-hub-2s-whats-new.md
@@ -17,13 +17,13 @@ Surface Hub 2S is an all-in-one collaboration canvas that’s built for teamwork
 
 |**Capability**|**Summary**|**Learn more**|
 |:-------|:------|:----|
-|**Mobile Device Management and UEFI manageability**| Manage settings and policies using a mobile device management (MDM) provider.<br> <br> Full integration with Surface Enterprise Management Mode (SEMM) lets you manage hardware components and firmware at the firmware level. | [Managing Surface Hub 2S with Microsoft Intune](surface-hub-2s-manage-intune.md)<br> <br> [Surface Enterprise Management Mode](https://docs.microsoft.com/surface/surface-enterprise-management-mode) |
+|**Mobile Device Management and UEFI manageability**| Manage settings and policies using a mobile device management (MDM) provider. <br> <br> Full integration with Surface Enterprise Management Mode (SEMM) lets you manage hardware components and firmware. | [Managing Surface Hub 2S with Microsoft Intune](surface-hub-2s-manage-intune.md) <br> <br> [Surface Enterprise Management Mode](https://docs.microsoft.com/surface/surface-enterprise-management-mode) |
 |**Cloud and on-premises coexistence**| Supports on-premises, hybrid, or online. | [Prepare your environment for Microsoft Surface Hub 2S](surface-hub-2s-prepare-environment.md) |
 |**Reset and recovery**| Restore from the cloud or USB drive. | [Recover and reset Surface Hub 2S](surface-hub-2s-recover-reset.md) |
 |**Microsoft Whiteboard**| Ofice 365 integration, intelligent ink, and Bing search bring powerful new capabilities, enabling a persistent digital canvas shareable across most browsers, Windows and iOS devices. | [Announcing a new whiteboard for your Surface Hub](https://techcommunity.microsoft.com/t5/Office-365-Blog/Announcing-a-new-Whiteboard-for-your-Surface-Hub/ba-p/637050) |
 |**Microsoft Teams Meeting Room License**| Extends Office 365 licensing options across Skype for Business, Microsoft Teams, and Intune. | [Teams Meeting Room Licensing Update](https://docs.microsoft.com/MicrosoftTeams/room-systems/skype-room-systems-v2-0) |
 |**On-screen display**| Adjust volume, brightness, and input control directly on the display. |  |
-|**Sensor-activated Connected Standby**| Doppler sensor activates Connected Standby after 1 minute of inactivity.<br> <br>Manage this setting remotely using Intune or directly on the device from the Settings app. | [Surface Hub 2S tech specs](surface-hub-2s-techspecs.md) |
+|**Sensor-activated Connected Standby**| Doppler sensor activates Connected Standby after 1 minute of inactivity.<br> <br> Manage this setting remotely using Intune or directly on the device from the Settings app. | [Surface Hub 2S tech specs](surface-hub-2s-techspecs.md) |
 |**Surface Hub pen**| Ergonomically redesigned and easily attachable on the sides of the device.  |  |
 |**Surface app for Surface Hub 2S**| Change audio settings and view your device's information from the Surface app |  |
 |**Ready for tomorrow**| Removable cartridge facilitates upgrading to new features. |  |
@@ -40,7 +40,7 @@ The following table details the differences between Surface Hub and Surface Hub
 |**Component**| **Surface Hub 55”**|**Surface Hub 84”**| **Surface Hub 2S**|
 |:----- |:---- |:---- |:----- |
 |**Form Factor**| 55” | 84” | 50” |
-|**Size**| 31.75” x 59.62” x 3.38” <br> (806.4 mm x 1514.3 mm x 85.8 mm) | 46.12” x 86.7” x 4.15” <br> (1171.5 mm x 2202.9 mm x 105.4 mm) | 29.2" x 43.2" x 3.0" <br> (741 mm x 1097 mm x 76 mm) |
+|**Dimension**| 31.75” x 59.62” x 3.38” <br> (806.4 mm x 1514.3 mm x 85.8 mm) | 46.12” x 86.7” x 4.15” <br> (1171.5 mm x 2202.9 mm x 105.4 mm) | 29.2" x 43.2" x 3.0" <br> (741 mm x 1097 mm x 76 mm) |
 |**Weight**| 105 lbs. (48 kg) | 280 lbs. (127 kg) | 61.6 lbs. (28 kg) |
 |**Display**| Resolution: <br> 1920 x 1080 @ 120 Hz  <br> Contrast ratio: <br> 1300:1 <br> Touch: <br> 100-point multi-touch <br> Projective Capacitance optically bonded sensor | Resolution: <br> 3840 x 2160 @ 120 Hz  <br> Contrast Ratio: <br> 1400:1 <br> Touch: <br> 100-point multi-touch <br> Projective Capacitance optically bonded sensor | Resolution: <br> 3840 x 2560 @ 60 Hz |
 |**Aspect Ratio**| 16:9 | 16:9 | 3:2 |
@@ -61,5 +61,3 @@ The following table details the differences between Surface Hub and Surface Hub
 
 > [!NOTE]
 > The NFC reader available in the original Surface Hub is discontinued in Surface Hub 2S and is no longer available.
-
-To learn more about what’s new in Surface Hub 2S, see [Behind the design: Surface Hub 2S](https://techcommunity.microsoft.com/t5/Surface-IT-Pro-Blog/Behind-the-design-Surface-Hub-2S/ba-p/464099).
diff --git a/devices/surface/TOC-old.md b/devices/surface/TOC-old.md
deleted file mode 100644
index e333b838b1..0000000000
--- a/devices/surface/TOC-old.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# [Surface](index.md)
-
-### [Surface Pro Tech specs](https://www.microsoft.com/surface/devices/surface-pro/tech-specs)
-### [Surface Book Tech specs](https://www.microsoft.com/surface/devices/surface-book/tech-specs)
-### [Surface Studio Tech specs](https://www.microsoft.com/surface/devices/surface-studio/tech-specs)
-### [Surface Go Tech specs](https://www.microsoft.com/surface/devices/surface-go/tech-specs)
-### [Surface Laptop 2 Tech specs](https://www.microsoft.com/surface/devices/surface-laptop/tech-specs)
-### [Windows Autopilot and Surface devices](windows-autopilot-and-surface-devices.md)
-### [Surface device compatibility with Windows 10 Long-Term Servicing Branch](surface-device-compatibility-with-windows-10-ltsc.md)
-### [Long-Term Servicing Branch for Surface devices](ltsb-for-surface.md)
-### [Wake On LAN for Surface devices](wake-on-lan-for-surface-devices.md)
-### [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md)
-### [Deploy Surface app with Microsoft Store for Business](deploy-surface-app-with-windows-store-for-business.md)
-### [Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md)
-### [Ethernet adapters and Surface deployment](ethernet-adapters-and-surface-device-deployment.md)
diff --git a/devices/surface/get-started.md b/devices/surface/get-started.md
index 4269e7f06d..0013b51394 100644
--- a/devices/surface/get-started.md
+++ b/devices/surface/get-started.md
@@ -63,7 +63,7 @@ Harness the power of Surface, Windows, and Office connected together through the
                     </div>
                     <div class="cardText">
                         <h3>Manage</h3>
-                        <p><a href="maintain-optimal-power-settings-on-Surface-devices.md">Maintain optimal power settings</a></p>
+                        <p><a href="maintain-optimal-power-settings-on-Surface-devices.md">Best practice power settings for Surface devices</a></p>
                         <p><a href="battery-limit.md">Manage battery limit with UEFI</a></p>
                         <p><a href="deploy-the-latest-firmware-and-drivers-for-surface-devices.md">Manage driver and firmware updates</a></p>
                     </div>
@@ -137,7 +137,7 @@ Harness the power of Surface, Windows, and Office connected together through the
                 <div class="card">
                     <div class="cardText">
                         <h3>Discover Surface tools</h3>
-                         <P><a href="surface-diagnostic-toolkit-business.md">Surface Diagnostic Toolkit for Business</a></p>
+                         <P><a href="surface-diagnostic-toolkit-for-business-intro.md">Surface Diagnostic Toolkit for Business</a></p>
                          <P><a href="surface-enterprise-management-mode.md">SEMM and UEFI</a></p>
                          <P><a href="microsoft-surface-brightness-control.md">Surface Brightness Control</a></p>
                          <P><a href="microsoft-surface-data-eraser.md">Surface Data Eraser</a></p>
diff --git a/devices/surface/index-new2.md b/devices/surface/index-new2.md
deleted file mode 100644
index b6709b00f1..0000000000
--- a/devices/surface/index-new2.md
+++ /dev/null
@@ -1,150 +0,0 @@
---- 
-title: Microsoft Surface documentation and resources
-layout: HubPage
-hide_bc: true
-description: Surface and Surface Hub documentation for admins & IT professionals
-author: robmazz
-ms.author: robmazz
-manager: laurawi
-ms.topic: hub-page
-keywords: Microsoft Surface, Microsoft Surface Hub, Surface documentation
-localization_priority: Normal
-audience: ITPro
-ms.prod: Surface
-description: Learn about Microsoft Surface and Surface Hub devices.
----
-<div id="main" class="v2">
-    <div class="container">
-        <h1>Microsoft Surface</h1>
-        <p>Learn how to plan, deploy, and manage Microsoft Surface and Surface Hub devices.<br><br></p>
-        <ul class="pivots">
-            <li>
-                <a href="#home"></a>
-                <ul id="home">
-                    <li>
-                        <a href="#home-all"></a>
-                        <ul id="home-all" class="cardsK">
-                            <li>
-                                <a href="get-started.md">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                            <img src="images/surface-devices-400x140.svg" alt="Surface Devices" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>Surface Devices</h3>
-                                                    <p>Harness the power of Surface, Windows, and Office connected together through the cloud. Find tools, step-by-step guides, and other resources to help you plan, deploy, and manage Surface devices in your organization.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="https://docs.microsoft.com/surface-hub/index">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                        <img src="images/surface-hub-400x140.svg" alt="Surface Hub" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>Surface Hub</h3>
-                                                    <p>Surface Hub 2S is an all-in-one digital interactive whiteboard, meetings platform, and collaborative computing device that brings the power of Windows 10 to team collaboration. Learn how to plan, deploy, manage, and support your Surface Hub devices.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="https://www.microsoft.com/surface/business">
-                                    <div class="cardSize">
-                                        <div class="cardPadding">
-                                            <div class="card">
-                                                <div class="cardImageOuter">
-                                                    <div class="cardImage bgdAccent1"> 
-                                                        <img src="images/surface-workplace-400x140.svg" alt="Surface for Business" />
-                                                    </div>
-                                                </div>
-                                                <div class="cardText">
-                                                    <h3>Surface for Business</h3>
-                                                    <p>Explore how Surface devices are transforming the modern workplace with people-centric design and flexible form factors, helping you get the most out of AI, big data, the cloud, and other foundational technologies.</p>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </a>
-                            </li>
-                            <li class="fullSpan">
-                              <hr />
-                              <br>
-                              <ul class="cardsF panelContent singlePanelContent" style="display:flex!important;">
-                                    <li>
-                                        <div class="cardSize">
-                                            <div class="cardPadding">
-                                                <div class="card">
-                                                    <div class="cardImageOuter">
-                                                        <div class="cardImage">
-                                                            <img src="https://docs.microsoft.com/office/media/icons/blog-site-blue.svg" alt="Communities" />
-                                                        </div>
-                                                    </div>
-                                                    <div class="cardText">
-                                                       <h3>Communities</h3>
-                                                        <P><a href="https://techcommunity.microsoft.com/t5/Surface-IT-Pro-Blog/bg-p/SurfaceITPro" target="_blank">Surface IT Pro blog</a></p>
-                                                        <P><a href="https://techcommunity.microsoft.com/t5/Surface-Devices/ct-p/SurfaceDevices" target="_blank">Surface Devices Tech Community</a></p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="cardSize">
-                                            <div class="cardPadding">
-                                                <div class="card">
-                                                    <div class="cardImageOuter">
-                                                        <div class="cardImage">
-                                                            <img src="https://docs.microsoft.com/office/media/icons/education-tutorial-blue.svg" alt="Learn" />
-                                                        </div>
-                                                    </div>
-                                                    <div class="cardText">
-                                                        <h3>Learn</h3>
-                                                        <P><a href="https://docs.microsoft.com/learn/browse/?term=Surface" target="_blank">Surface training on Microsoft Learn</a></p>
-                                                        <P><a href="https://www.youtube.com/watch?v=Uk2kJ5FUZxY&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ" target="_blank">Microsoft Mechanics Surface videos</a></p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="cardSize">
-                                            <div class="cardPadding">
-                                                <div class="card">
-                                                    <div class="cardImageOuter">
-                                                        <div class="cardImage">
-                                                            <img src="https://docs.microsoft.com/office/media/icons/chat.svg" alt="Need help?" />
-                                                        </div>
-                                                    </div>
-                                                    <div class="cardText">
-                                                        <h3>Need help?</h3>
-                                                        <P><a href="https://support.microsoft.com/products/surface-devices" target="_blank">Surface Devices</a></p>
-                                                        <P><a href="https://support.microsoft.com/hub/4343507/surface-hub-help" target="_blank">Surface Hub</a></p>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </div>
-</div>
diff --git a/devices/surface/index-old.md b/devices/surface/index-old.md
deleted file mode 100644
index e559820d25..0000000000
--- a/devices/surface/index-old.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-title: Surface (Surface)
-description: 
-ms.assetid: 2a6aec85-b8e2-4784-8dc1-194ed5126a04
-ms.localizationpriority: high
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.pagetype: surface, devices
-ms.sitesec: library
-author: heatherpoulsen
-ms.author: jdecker
-ms.topic: article
-ms.date: 10/16/2017
----
-
-# Surface
-
-
-This library provides guidance to help you deploy Windows on Microsoft Surface devices, keep those devices up to date, and easily manage and support Surface devices in your organization.
-
-For more information on planning for, deploying, and managing Surface devices in your organization, see the [Surface TechCenter](https://technet.microsoft.com/windows/surface).
-
-## In this section
-
-| Topic | Description |
-| --- | --- |
-| [Deploy Surface devices](deploy.md) | Get deployment guidance for your Surface devices including information about MDT, OOBE customization, Ethernet adaptors, and Surface Deployment Accelerator. |
-| [Surface firmware and driver updates](update.md) | Find out how to download and manage the latest firmware and driver updates for your Surface device. |
-| [Considerations for Surface and System Center Configuration Manager](considerations-for-surface-and-system-center-configuration-manager.md) | Get guidance on how to deploy and manage Surface devices with System Center Configuration Manager. |
-| [Deploy Surface app with Microsoft Store for Business](deploy-surface-app-with-windows-store-for-business.md) | Find out how to add and download Surface app with Microsoft Store for Business, as well as install Surface app with PowerShell and MDT. |
-| [Enable PEAP, EAP-FAST, and Cisco LEAP on Surface devices](enable-peap-eap-fast-and-cisco-leap-on-surface-devices.md) | Find out how to enable support for PEAP, EAP-FAST, or Cisco LEAP protocols on your Surface device. |
-| [Manage Surface UEFI settings](manage-surface-uefi-settings.md) | Use Surface UEFI settings to enable or disable devices, configure security settings, and adjust Surface device boot settings. |
-| [Surface Enterprise Management Mode](surface-enterprise-management-mode.md) | See how this feature of Surface devices with Surface UEFI allows you to secure and manage firmware settings within your organization. |
-| [Surface Diagnostic Toolkit for Business](surface-diagnostic-toolkit-business.md) | Learn how to investigate, troubleshoot, and resolve hardware, software, and firmware issues with Surface devices. |
-| [Surface Data Eraser](microsoft-surface-data-eraser.md) | Find out how the Microsoft Surface Data Eraser tool can help you securely wipe data from your Surface devices. |
-| [Top support solutions for Surface devices](support-solutions-surface.md) | These are the top Microsoft Support solutions for common issues experienced using Surface devices in an enterprise. |
-| [Change history for Surface documentation](change-history-for-surface.md) | This topic lists new and updated topics in the Surface documentation library. |
-
-
-## Learn more
-
-[Certifying Surface Pro 4 and Surface Book as standard devices at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/849/Certifying-Surface-Pro-4-and-Surface-Book-as-standard-devices-at-Microsoft)
-
-
-
-
- 
-
-## Related topics
-
-
-[Surface TechCenter](https://technet.microsoft.com/windows/surface)
-
-[Surface for IT pros blog](http://blogs.technet.com/b/surface/)
-
- 
-
- 
-
-
-
-
-
diff --git a/devices/surface/index.md b/devices/surface/index.md
index c3557eb9db..b6709b00f1 100644
--- a/devices/surface/index.md
+++ b/devices/surface/index.md
@@ -16,128 +16,70 @@ description: Learn about Microsoft Surface and Surface Hub devices.
 <div id="main" class="v2">
     <div class="container">
         <h1>Microsoft Surface</h1>
-        <P>Learn how to plan, deploy, and manage Microsoft Surface and Surface Hub devices.</p>
-        <P></p>
+        <p>Learn how to plan, deploy, and manage Microsoft Surface and Surface Hub devices.<br><br></p>
         <ul class="pivots">
             <li>
                 <a href="#home"></a>
                 <ul id="home">
                     <li>
                         <a href="#home-all"></a>
-                        <ul id="home-all" class="cardsF">
+                        <ul id="home-all" class="cardsK">
                             <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/get-started-blue.svg" alt="Get started" />
+                                <a href="get-started.md">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage bgdAccent1"> 
+                                                            <img src="images/surface-devices-400x140.svg" alt="Surface Devices" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Surface Devices</h3>
+                                                    <p>Harness the power of Surface, Windows, and Office connected together through the cloud. Find tools, step-by-step guides, and other resources to help you plan, deploy, and manage Surface devices in your organization.</p>
                                                 </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Surface Devices</h3>
-                                                <P><a href="get-started.md">Get started</a></p>
-                                                <P><a href="windows-autopilot-and-surface-devices.md">Autopilot on Surface</a></p>
-                                                <P><a href="update.md">Manage Surface updates</a></p>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                </a>
                             </li>
                             <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/deploy-blue.svg" alt="Deploy" />
+                                <a href="https://docs.microsoft.com/surface-hub/index">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage bgdAccent1"> 
+                                                        <img src="images/surface-hub-400x140.svg" alt="Surface Hub" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Surface Hub</h3>
+                                                    <p>Surface Hub 2S is an all-in-one digital interactive whiteboard, meetings platform, and collaborative computing device that brings the power of Windows 10 to team collaboration. Learn how to plan, deploy, manage, and support your Surface Hub devices.</p>
                                                 </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Surface Hub</h3>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/index">Get started</a></p>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-2s-site-readiness-guide" target="_blank">Surface Hub 2S Site Readiness</a></p>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-2s-manage-intune" target="_blank">Intune on Surface Hub 2S</a></p>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-2s-secure-with-uefi" target="_blank">UEFI on Surface Hub 2S</a></p>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                </a>
                             </li>
                             <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/small-business-blue.svg" alt="Business" />
+                                <a href="https://www.microsoft.com/surface/business">
+                                    <div class="cardSize">
+                                        <div class="cardPadding">
+                                            <div class="card">
+                                                <div class="cardImageOuter">
+                                                    <div class="cardImage bgdAccent1"> 
+                                                        <img src="images/surface-workplace-400x140.svg" alt="Surface for Business" />
+                                                    </div>
+                                                </div>
+                                                <div class="cardText">
+                                                    <h3>Surface for Business</h3>
+                                                    <p>Explore how Surface devices are transforming the modern workplace with people-centric design and flexible form factors, helping you get the most out of AI, big data, the cloud, and other foundational technologies.</p>
                                                 </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Surfaces for business</h3>
-                                                <P><a href="https://www.microsoft.com/surface/business" target="_blank">Surface devices for the modern workplace</a></p>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
-                            </li> 
-                            <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/list-123-blue.svg" alt="Specs list" />
-                                                </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Surface Device Tech Specs</h3>
-                                                <P><a href="https://www.microsoft.com/surface/devices/surface-pro/tech-specs" target="_blank">Surface Pro</a></p>
-                                                <P><a href="https://www.microsoft.com/p/surface-book-2/8mcpzjjcc98c?activetab=pivot:techspecstab" target="_blank">Surface Book</a></p>
-                                                <P><a href="https://www.microsoft.com/surface/devices/surface-studio/tech-specs" target="_blank">Surface Studio</a><p>
-                                                <P><a href="https://www.microsoft.com/surface/devices/surface-go/tech-specs" target="_blank">Surface Go</a></p>
-                                                <P><a href="https://www.microsoft.com/surface/devices/surface-laptop/tech-specs" target="_blank">Surface Laptop 2</a></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </li> 
-                            <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/task-list-planning-blue.svg" alt="Specs list" />
-                                                </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Surface Hub Tech Specs</h3>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-2s-techspecs" target="_blank">Surface Hub 2S</a></p>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-technical-55" target="_blank">55" Surface Hub</a></p>
-                                                <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-technical-84" target="_blank">84" Surface Hub</a></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </li>
-                            <li>
-                                <div class="cardSize">
-                                    <div class="cardPadding">
-                                        <div class="card">
-                                            <div class="cardImageOuter">
-                                                <div class="cardImage">
-                                                    <img src="https://docs.microsoft.com/office/media/icons/connector-blue.svg" alt="Support solutions" />
-                                                </div>
-                                            </div>
-                                            <div class="cardText">
-                                                <h3>Support solutions</h3>
-                                                <P><a href="https://docs.microsoft.com/surface/support-solutions-surface" target="_blank">Support for Surface devices</a></p>
-                                                <P><a href="https://support.microsoft.com/hub/4343507/surface-hub-help" target="_blank">Support for Surface Hub</a></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                </a>
                             </li>
                             <li class="fullSpan">
                               <hr />
@@ -153,7 +95,7 @@ description: Learn about Microsoft Surface and Surface Hub devices.
                                                         </div>
                                                     </div>
                                                     <div class="cardText">
-                                                        <h3>Communities</h3>
+                                                       <h3>Communities</h3>
                                                         <P><a href="https://techcommunity.microsoft.com/t5/Surface-IT-Pro-Blog/bg-p/SurfaceITPro" target="_blank">Surface IT Pro blog</a></p>
                                                         <P><a href="https://techcommunity.microsoft.com/t5/Surface-Devices/ct-p/SurfaceDevices" target="_blank">Surface Devices Tech Community</a></p>
                                                     </div>
@@ -172,20 +114,20 @@ description: Learn about Microsoft Surface and Surface Hub devices.
                                                     </div>
                                                     <div class="cardText">
                                                         <h3>Learn</h3>
+                                                        <P><a href="https://docs.microsoft.com/learn/browse/?term=Surface" target="_blank">Surface training on Microsoft Learn</a></p>
                                                         <P><a href="https://www.youtube.com/watch?v=Uk2kJ5FUZxY&list=PLXtHYVsvn_b__1Baibdu4elN4SoF3JTBZ" target="_blank">Microsoft Mechanics Surface videos</a></p>
-                                                        <P><a href="https://docs.microsoft.com/surface-hub/surface-hub-technical-84" target="_blank">Something 2</a></p>
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
-                                    </li> 
+                                    </li>
                                     <li>
                                         <div class="cardSize">
                                             <div class="cardPadding">
                                                 <div class="card">
                                                     <div class="cardImageOuter">
                                                         <div class="cardImage">
-                                                            <img src="https://docs.microsoft.com/office/media/icons/chat.svg" alt="Chat" />
+                                                            <img src="https://docs.microsoft.com/office/media/icons/chat.svg" alt="Need help?" />
                                                         </div>
                                                     </div>
                                                     <div class="cardText">
@@ -197,12 +139,12 @@ description: Learn about Microsoft Surface and Surface Hub devices.
                                             </div>
                                         </div>
                                     </li>
-                              </ul>
+                                </ul>
                             </li>
-                       </ul>
+                        </ul>
                     </li>
                 </ul>
             </li>
         </ul>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/devices/surface/maintain-optimal-power-settings-on-Surface-devices.md b/devices/surface/maintain-optimal-power-settings-on-Surface-devices.md
index e234bd2db5..6dcd9db277 100644
--- a/devices/surface/maintain-optimal-power-settings-on-Surface-devices.md
+++ b/devices/surface/maintain-optimal-power-settings-on-Surface-devices.md
@@ -7,7 +7,6 @@ ms.sitesec: library
 author: dansimp
 ms.author: dansimp
 ms.topic: article
-ms.date: 01/17/2019
 ms.reviewer: 
 manager: dansimp
 ---