diff --git a/windows/manage/set-up-shared-or-guest-pc.md b/windows/manage/set-up-shared-or-guest-pc.md
index 5d7e392f86..14f3ec5400 100644
--- a/windows/manage/set-up-shared-or-guest-pc.md
+++ b/windows/manage/set-up-shared-or-guest-pc.md
@@ -69,15 +69,22 @@ text
 
 ## Policies set by shared PC mode
 
-<table border="1" style="width:100%">
-<tr><th><p>Policy name</p></th><th><p>Value</p></th> </tr>
-<tr><td colspan="2"><p><strong>Admin Templates</strong> > <strong>Control Panel</strong> > <strong>Personalization</strong></p></td> 
+> **Important**: It is not recommended to set additional policies on PCs configured for **Shared PC Mode**.	The shared PC mode has been optimized to be fast and reliable over time with minimal to no manual maintenance required.
+
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong> > <strong>Control Panel</strong> > <strong>Personalization</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
+
 <tr><td><p>Prevent enabling lock screen slide show</p></td><td><p>Enabled</p></td>
 </tr> 
 <tr><td><p>Prevent changing lock screen and logon image</p></td><td><p>Enabled</p></td>
-</tr> <tr><td colspan="2"><p><strong>Admin Templates</strong> > <strong>System</strong> > <strong>Power Management</strong> > <strong>Button Settings</strong></p></td> 
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong> > <strong>System</strong> > <strong>Power Management</strong> > <strong>Button Settings</strong></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
+
 <tr><td><p>Select the Power button action (plugged in)</p></td><td><p>Sleep</p></td> 
 </tr> 
 <tr><td><p>Select the Power button action (on battery)</p></td><td><p>Sleep</p></td> 
@@ -87,25 +94,24 @@ text
 <tr><td><p>Select the lid switch action (plugged in)</p></td><td><p>Sleep</p></td>
 </tr> 
 <tr><td><p>Select the lid switch action (on battery)</p></td><td><p>Sleep</p></td>
-</tr> <tr><td colspan="2"><p><strong>Admin Templates</strong> > <strong>System</strong> > <strong>Power Management</strong> > <strong>Sleep Settings</strong></p></td> 
-</tr> <tr><td><p>Require a password when a computer wakes (plugged in)</p></td><td><p>Enabled</p></td>
-</tr><tr><td><p>Require a password when a computer wakes (on battery)</p></td><td><p>Enabled</p></td>
-</tr><tr><td><p>Specify the system sleep timeout (plugged in)</p></td><td><p>1 hour</p></td>
-</tr><tr><td><p>Specify the system sleep timeout (on battery)</p></td><td><p>1 hour</p></td>
-</tr><tr><td><p>Turn off hybrid sleep (plugged in) </p></td><td><p>Enabled </p></td>  
-</tr><tr><td><p>Turn off hybrid sleep (on battery) </p></td><td><p>Enabled </p></td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong> > <strong>System</strong> > <strong>Power Management</strong> > <strong>Sleep Settings</strong></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-</table>
-
-<table border="1"> 
-
-
- 
-
- 
-
- 
 
+<tr><td><p>Require a password when a computer wakes (plugged in)</p></td><td><p>Enabled</p></td>
+</tr> 
+<tr><td><p>Require a password when a computer wakes (on battery)</p></td><td><p>Enabled</p></td>
+</tr>
+<tr><td><p>Specify the system sleep timeout (plugged in)</p></td><td><p>1 hour</p></td>
+</tr> 
+<tr><td><p>Specify the system sleep timeout (on battery)</p></td><td><p>1 hour</p></td>
+</tr> 
+<tr> <td> <p> Turn off hybrid sleep (plugged in) </p> </td> <td> <p> Enabled </p> </td>  
+</tr> 
+<tr> <td> <p> Turn off hybrid sleep (on battery) </p> </td> <td> <p> Enabled </p> </td>  
+</tr> 
 <tr> <td> <p> Specify the unattended sleep timeout (plugged in) </p> </td> <td> <p> 1 hour </p> </td>  
 </tr> 
 <tr> <td> <p> Specify the unattended sleep timeout (on battery) </p> </td> <td> <p> 1 hour </p> </td> 
@@ -117,14 +123,21 @@ text
 <tr> <td> <p> Specify the system hibernate timeout (plugged in) </p> </td> <td> <p> Enabled, 0 </p> </td> 
 </tr> 
 <tr> <td> <p> Specify the system hibernate timeout (on battery) </p> </td> <td> <p> Enabled, 0 </p> </td> 
+</tr> </table><bbr/>
+<table style="width:100%" border="1"> 
+<caption <strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>Power Management</strong>  >  <strong>Video and Display Settings</strong>  ></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>Power Management</strong>  >  <strong>Video and Display Settings</strong> </p> </td> </tr> 
+
 <tr> <td> <p> Turn off the display (plugged in) </p> </td> <td> <p> 1 hour </p> </td> 
 </tr>
  <tr> <td> <p> Turn off the display (on battery </p> </td> <td> <p> 1 hour </p> </td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption> <strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>Logon</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>Logon</strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Show first sign-in animation </p> </td> <td> <p> Disabled </p> </td>  
 </tr> 
 <tr> <td> <p> Hide entry points for Fast User Switching </p> </td> <td> <p> Enabled </p> </td> 
@@ -138,13 +151,19 @@ text
 <tr> <td> <p> Allow users to select when a password is required when resuming from connected standby </p> </td> <td> <p> Disabled </p> </td> 
 </tr> 
 <tr> <td> <p> Block user from showing account details on sign-in </p> </td> <td> <p> Enabled </p> </td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>User Profiles</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>System</strong>  >  <strong>User Profiles</strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Turn off the advertising ID </p> </td> <td> <p> Enabled </p> </td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption> <strong>Admin Templates</strong>  >  <strong>Windows Components </strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components </strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Do not show Windows Tips </p> </td> <td> <p> Enabled </p> </td> 
 </tr> 
 <tr> <td> <p> Turn off Microsoft consumer experiences </p> </td> <td> <p> Enabled </p> </td> 
@@ -152,47 +171,68 @@ text
 <tr> <td> <p> Microsoft Passport for Work </p> </td> <td> <p> Disabled </p> </td>  
 </tr> 
 <tr> <td> <p> Prevent the usage of OneDrive for file storage </p> </td> <td> <p> Enabled </p> </td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Biometrics</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Biometrics</strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Allow the use of biometrics </p> </td> <td> <p> Disabled </p> </td>  
 </tr> 
 <tr> <td> <p> Allow users to log on using biometrics </p> </td> <td> <p> Disabled </p> </td> 
 </tr> 
 <tr> <td> <p> Allow domain users to log on using biometrics </p> </td> <td> <p> Disabled </p> </td> 
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Data Collection and Preview Builds</strong></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Data Collection and Preview Builds</strong> </p> </td> 
-</tr> 
+ 
 <tr> <td> <p> Toggle user control over Insider builds </p> </td> <td> <p> Disabled </p> </td>  
 </tr> 
 <tr> <td> <p> Disable pre-release features or settings </p> </td> <td> <p> Disabled </p> </td> 
 </tr> 
 <tr> <td> <p> Do not show feedback notifications </p> </td> <td> <p> Enabled </p> </td> 
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>File Explorer</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>File Explorer</strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Show lock in the user tile menu </p> </td> <td> <p> Disabled </p> </td>  
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Maintenance Scheduler</strong></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Maintenance Scheduler</strong> </p> </td> 
-</tr> 
+ 
 <tr> <td> <p> Automatic Maintenance Activation Boundary </p> </td> <td> <p> 12am </p> </td>  
 </tr> 
 <tr> <td> <p> Automatic Maintenance Random Delay </p> </td> <td> <p> Enabled, 2 hours </p> </td> 
 </tr> 
 <tr> <td> <p> Automatic Maintenance WakeUp Policy </p> </td> <td> <p> Enabled </p> </td> 
+</tr> </table><br/>
+<table style="width:100%" border="1">
+<caption> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Microsoft Edge</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Microsoft Edge</strong> </p> </td> 
-</tr> 
+
 <tr> <td> <p> Open a new tab with an empty tab </p> </td> <td> <p> Disabled </p> </td> 
 </tr> 
 <tr> <td> <p> Configure corporate home pages </p> </td> <td> <p> Enabled, about:blank </p> </td> 
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Search</strong></caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Admin Templates</strong>  >  <strong>Windows Components</strong>  >  <strong>Search</strong> </p> </td> 
-</tr> 
+ 
 <tr> <td> <p> Allow Cortana </p> </td> <td> <p> Disabled </p> </td> 
+</tr> </table><br/>
+<table style="width:100%" border="1"> 
+<caption><strong>Windows Settings</strong>  >  <strong>Security Settings</strong>  >  <strong>Local Policies</strong>  >  <strong>Security Options</strong> </caption>
+<tr><th><p>Policy name</p></th><th><p>Value</p></th> 
 </tr> 
-<tr> <td colspan="2"> <p> <strong>Windows Settings</strong>  >  <strong>Security Settings</strong>  >  <strong>Local Policies</strong>  >  <strong>Security Options</strong> </p> </td> 
-</tr> 
+ 
 <tr> <td> <p> Interactive logon: Do not display last user name </p> </td> <td> <p> Enabled </p>   </td>
 </tr> 
 <tr> <td> <p> Interactive logon: Sign-in last interactive user automatically after a system-initiated restart </p> </td> <td> <p> Disabled </p> </td> 
@@ -201,9 +241,9 @@ text
 </tr> 
 <tr> <td> <p> User Account Control: Behavior of the elevation prompt for standard users </p> </td> <td> <p> Auto deny </p> </td>  
 </tr> 
-</table> 
+</table> </br></br>
+
 
-</br></br>
 
 ## Related topics