diff --git a/README.md b/README.md
index 0f9b57f..dc2c1a0 100644
--- a/README.md
+++ b/README.md
@@ -12,51 +12,11 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 
 
 ## Table of Contents
-- [Conditional access](#section-1)
-
-  - [Conditional access policies](#section-2)
-
-    - [CA000-Global-IdentityProtection-AnyApp-AnyPlatform-MFA](#section-3)
-
-    - [CA001-Global-AttackSurfaceReduction-AnyApp-AnyPlatform-BLOCK-CountryWhitelist](#section-4)
-
-    - [CA002-Global-IdentityProtection-AnyApp-AnyPlatform-Block-LegacyAuthentication](#section-5)
-
-    - [CA003-Global-BaseProtection-RegisterOrJoin-AnyPlatform-MFA](#section-6)
-
-    - [CA004-Global-IdentityProtection-AnyApp-AnyPlatform-AuthenticationFlows](#section-7)
-
-    - [CA005-Global-DataProtection-Office365-AnyPlatform-Unmanaged-AppEnforcedRestrictions-BlockDownload](#section-8)
-
-    - [CA100-Admins-IdentityProtection-AdminPortals-AnyPlatform-MFA](#section-9)
-
-    - [CA101-Admins-IdentityProtection-AnyApp-AnyPlatform-MFA](#section-10)
-
-    - [CA102-Admins-IdentityProtection-AllApps-AnyPlatform-SigninFrequency](#section-11)
-
-    - [CA200-Internals-IdentityProtection-AnyApp-AnyPlatform-MFA](#section-12)
-
-    - [CA201-Internals-IdentityProtection-AnyApp-AnyPlatform-BLOCK-HighRisk](#section-13)
-
-    - [CA202-Internals-IdentityProtection-AllApps-WindowsMacOS-SigninFrequency-UnmanagedDevices](#section-14)
-
-    - [CA203-Internals-AppProtection-MicrosoftIntuneEnrollment-AnyPlatform-MFA](#section-15)
-
-    - [CA204-Internals-AttackSurfaceReduction-AllApps-AnyPlatform-BlockUnknownPlatforms](#section-16)
-
-    - [CA205-Internals-IdentityProtection-AllApps-AnyPlatform-CombinedRegistration](#section-17)
-
-    - [CA206-Internals-BaseProtection-AnyApp-Windows-CompliantorAADHJ](#section-18)
-
-    - [CA400-GuestUsers-IdentityProtection-AnyApp-AnyPlatform-MFA](#section-19)
-
-    - [CA401-GuestUsers-AttackSurfaceReduction-AllApps-AnyPlatform-BlockNonGuestAppAccess](#section-20)
-
-    - [CA402-GuestUsers-IdentityProtection-AllApps-AnyPlatform-SigninFrequency](#section-21)
-
-  - [Named Locations](#section-22)
-
-    - [ALLOWED COUNTRIES](#section-23)
+- [Conditional Access Baseline](#conditional-access-baseline)
+  - [Resources](#resources)
+  - [Table of Contents](#table-of-contents)
+          - [Table 3. Basics - CA001-Global-AttackSurfaceReduction-AnyApp-AnyPlatform-BLOCK-CountryWhitelist](#table-3-basics---ca001-global-attacksurfacereduction-anyapp-anyplatform-block-countrywhitelist)
+          - [Table 14. Settings - CA100-Admins-IdentityProtection-AdminPortals-AnyPlatform-MFA](#table-14-settings---ca100-admins-identityprotection-adminportals-anyplatform-mfa)
 
 
 <h1 id="section-1">Conditional access</h1>
@@ -93,9 +53,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 1. Basics - CA000-Global-IdentityProtection-AnyApp-AnyPlatform-MFA
-
-
 <table class='table-settings'>
 <tr class='table-header1'>
 <td>Name</td>
@@ -149,8 +106,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 2. Settings - CA000-Global-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <h3 id="section-4">CA001-Global-AttackSurfaceReduction-AnyApp-AnyPlatform-BLOCK-CountryWhitelist</h3>
 
@@ -242,9 +197,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 4. Settings - CA001-Global-AttackSurfaceReduction-AnyApp-AnyPlatform-BLOCK-CountryWhitelist
-
-
 <h3 id="section-5">CA002-Global-IdentityProtection-AnyApp-AnyPlatform-Block-LegacyAuthentication</h3>
 
 <table class='table-settings'>
@@ -277,9 +229,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 5. Basics - CA002-Global-IdentityProtection-AnyApp-AnyPlatform-Block-LegacyAuthentication
-
-
 <table class='table-settings'>
 <tr class='table-header1'>
 <td>Name</td>
@@ -331,8 +280,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 6. Settings - CA002-Global-IdentityProtection-AnyApp-AnyPlatform-Block-LegacyAuthentication
-
 
 <h3 id="section-6">CA003-Global-BaseProtection-RegisterOrJoin-AnyPlatform-MFA</h3>
 
@@ -362,8 +309,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 7. Basics - CA003-Global-BaseProtection-RegisterOrJoin-AnyPlatform-MFA
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -414,8 +359,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 8. Settings - CA003-Global-BaseProtection-RegisterOrJoin-AnyPlatform-MFA
-
 
 <h3 id="section-7">CA004-Global-IdentityProtection-AnyApp-AnyPlatform-AuthenticationFlows</h3>
 
@@ -449,8 +392,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 9. Basics - CA004-Global-IdentityProtection-AnyApp-AnyPlatform-AuthenticationFlows
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -493,8 +434,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 10. Settings - CA004-Global-IdentityProtection-AnyApp-AnyPlatform-AuthenticationFlows
-
 
 <h3 id="section-8">CA005-Global-DataProtection-Office365-AnyPlatform-Unmanaged-AppEnforcedRestrictions-BlockDownload</h3>
 
@@ -528,8 +467,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 11. Basics - CA005-Global-DataProtection-Office365-AnyPlatform-Unmanaged-AppEnforcedRestrictions-BlockDownload
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -600,8 +537,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 12. Settings - CA005-Global-DataProtection-Office365-AnyPlatform-Unmanaged-AppEnforcedRestrictions-BlockDownload
-
 
 <h3 id="section-9">CA100-Admins-IdentityProtection-AdminPortals-AnyPlatform-MFA</h3>
 
@@ -635,8 +570,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 13. Basics - CA100-Admins-IdentityProtection-AdminPortals-AnyPlatform-MFA
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -726,8 +659,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 15. Basics - CA101-Admins-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -799,8 +730,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 16. Settings - CA101-Admins-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <h3 id="section-11">CA102-Admins-IdentityProtection-AllApps-AnyPlatform-SigninFrequency</h3>
 
@@ -834,8 +763,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 17. Basics - CA102-Admins-IdentityProtection-AllApps-AnyPlatform-SigninFrequency
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -893,7 +820,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 18. Settings - CA102-Admins-IdentityProtection-AllApps-AnyPlatform-SigninFrequency
 
 
 <h3 id="section-12">CA200-Internals-IdentityProtection-AnyApp-AnyPlatform-MFA</h3>
@@ -928,7 +854,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 19. Basics - CA200-Internals-IdentityProtection-AnyApp-AnyPlatform-MFA
 
 
 <table class='table-settings'>
@@ -1001,8 +926,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 20. Settings - CA200-Internals-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <h3 id="section-13">CA201-Internals-IdentityProtection-AnyApp-AnyPlatform-BLOCK-HighRisk</h3>
 
@@ -1036,8 +959,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 21. Basics - CA201-Internals-IdentityProtection-AnyApp-AnyPlatform-BLOCK-HighRisk
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1101,8 +1022,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 22. Settings - CA201-Internals-IdentityProtection-AnyApp-AnyPlatform-BLOCK-HighRisk
-
 
 <h3 id="section-14">CA202-Internals-IdentityProtection-AllApps-WindowsMacOS-SigninFrequency-UnmanagedDevices</h3>
 
@@ -1136,8 +1055,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 23. Basics - CA202-Internals-IdentityProtection-AllApps-WindowsMacOS-SigninFrequency-UnmanagedDevices
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1212,8 +1129,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 24. Settings - CA202-Internals-IdentityProtection-AllApps-WindowsMacOS-SigninFrequency-UnmanagedDevices
-
 
 <h3 id="section-15">CA203-Internals-AppProtection-MicrosoftIntuneEnrollment-AnyPlatform-MFA</h3>
 
@@ -1247,8 +1162,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 25. Basics - CA203-Internals-AppProtection-MicrosoftIntuneEnrollment-AnyPlatform-MFA
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1310,8 +1223,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 26. Settings - CA203-Internals-AppProtection-MicrosoftIntuneEnrollment-AnyPlatform-MFA
-
 
 <h3 id="section-16">CA204-Internals-AttackSurfaceReduction-AllApps-AnyPlatform-BlockUnknownPlatforms</h3>
 
@@ -1345,8 +1256,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 27. Basics - CA204-Internals-AttackSurfaceReduction-AllApps-AnyPlatform-BlockUnknownPlatforms
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1407,7 +1316,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 28. Settings - CA204-Internals-AttackSurfaceReduction-AllApps-AnyPlatform-BlockUnknownPlatforms
 
 
 <h3 id="section-17">CA205-Internals-IdentityProtection-AllApps-AnyPlatform-CombinedRegistration</h3>
@@ -1438,9 +1346,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 29. Basics - CA205-Internals-IdentityProtection-AllApps-AnyPlatform-CombinedRegistration
-
-
 <table class='table-settings'>
 <tr class='table-header1'>
 <td>Name</td>
@@ -1498,9 +1403,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 30. Settings - CA205-Internals-IdentityProtection-AllApps-AnyPlatform-CombinedRegistration
-
-
 <h3 id="section-18">CA206-Internals-BaseProtection-AnyApp-Windows-CompliantorAADHJ</h3>
 
 <table class='table-settings'>
@@ -1533,8 +1435,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 31. Basics - CA206-Internals-BaseProtection-AnyApp-Windows-CompliantorAADHJ
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1607,9 +1507,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 32. Settings - CA206-Internals-BaseProtection-AnyApp-Windows-CompliantorAADHJ
-
-
 <h3 id="section-19">CA400-GuestUsers-IdentityProtection-AnyApp-AnyPlatform-MFA</h3>
 
 <table class='table-settings'>
@@ -1642,8 +1539,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 33. Basics - CA400-GuestUsers-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1694,8 +1589,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 34. Settings - CA400-GuestUsers-IdentityProtection-AnyApp-AnyPlatform-MFA
-
 
 <h3 id="section-20">CA401-GuestUsers-AttackSurfaceReduction-AllApps-AnyPlatform-BlockNonGuestAppAccess</h3>
 
@@ -1729,8 +1622,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 35. Basics - CA401-GuestUsers-AttackSurfaceReduction-AllApps-AnyPlatform-BlockNonGuestAppAccess
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1777,8 +1668,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 36. Settings - CA401-GuestUsers-AttackSurfaceReduction-AllApps-AnyPlatform-BlockNonGuestAppAccess
-
 
 <h3 id="section-21">CA402-GuestUsers-IdentityProtection-AllApps-AnyPlatform-SigninFrequency</h3>
 
@@ -1812,7 +1701,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 37. Basics - CA402-GuestUsers-IdentityProtection-AllApps-AnyPlatform-SigninFrequency
 
 
 <table class='table-settings'>
@@ -1867,8 +1755,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 38. Settings - CA402-GuestUsers-IdentityProtection-AllApps-AnyPlatform-SigninFrequency
-
 
 <h2 id="section-22">Named Locations</h2>
 <h3 id="section-23">ALLOWED COUNTRIES</h3>
@@ -1903,8 +1789,6 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 39. Basics - ALLOWED COUNTRIES
-
 
 <table class='table-settings'>
 <tr class='table-header1'>
@@ -1925,7 +1809,5 @@ This conditional access baseline is based on the Microsoft Conditional Access Ba
 </tr>
 </table>
 
-###### Table 40. Settings - ALLOWED COUNTRIES
-