diff --git a/docs/appliesToList.json b/docs/appliesToList.json
index edd3654..3877413 100644
--- a/docs/appliesToList.json
+++ b/docs/appliesToList.json
@@ -5,54 +5,54 @@
       "PlatformName": ".NET Standard 1.4",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/netstd/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netstd/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netstd/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/netstd/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netstd/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netstd/.manifest" },
       ]
     },
     { 
       "PlatformName": ".NET Framework",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/netfx/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netfx/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netfx/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/netfx/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netfx/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netfx/.manifest" },
       ]
     },
     { 
       "PlatformName": ".NET Core",
       "Versions" : [
          { "Name": "GitHub", "Manifest": "../artifacts/docs/api/netcore/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netcore/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netcore/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/netcore/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/netcore/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/netcore/.manifest" },
       ]
     },
     { 
       "PlatformName": "Xamarin.Android",
       "Versions" : [
          { "Name": "GitHub", "Manifest": "../artifacts/docs/api/android/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/android/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/android/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/android/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/android/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/android/.manifest" },
       ]
     },
     {
       "PlatformName": "Xamarin.iOS",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/ios/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/ios/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/ios/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/ios/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/ios/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/ios/.manifest" },
       ]
     },
     { 
       "PlatformName": "UWP",
       "Versions" : [
          { "Name" : "GitHub", "Manifest": "../artifacts/docs/api/uwp/.manifest" },
-         { "Name" : "v2.0", "Manifest": "manifests/v2.0/uwp/.manifest" },
-         { "Name" : "v2.1", "Manifest": "manifests/v2.1/uwp/.manifest" },
          { "Name" : "v2.2", "Manifest": "manifests/v2.2/uwp/.manifest" }      
+         { "Name" : "v2.1", "Manifest": "manifests/v2.1/uwp/.manifest" },
+         { "Name" : "v2.0", "Manifest": "manifests/v2.0/uwp/.manifest" },
       ]
     }
    ]
diff --git a/docs/template_overrides/partials/class.tmpl.partial b/docs/template_overrides/partials/class.tmpl.partial
index f8d8041..548c5bc 100644
--- a/docs/template_overrides/partials/class.tmpl.partial
+++ b/docs/template_overrides/partials/class.tmpl.partial
@@ -59,11 +59,20 @@
 {{/seealso.0}}
 {{#appliesTo.0}}
 <h3 id="appliesTo">Applies to</h3>
-<div class="seealso">
+
+<div class="appliesto">
+  <div>
+    <table>
+      <thead><th>Target</th><th>Versions</th></thead>
+        <tbody>
 {{/appliesTo.0}}
 {{#appliesTo}}
-<div><b>{{{platform}}}</b><br/>{{{versions}}}<br/><br/></div>
+          <tr><td><b>{{platform}}</b></td><td>{{versions}}</td></tr>
 {{/appliesTo}}
-{{#appliesTo.0}}
+{{#appliesTo.0}}  
+        </tbody>
+      </thead>
+    </table>
+  </div>
 </div>
 {{/appliesTo.0}}
diff --git a/docs/template_overrides/partials/collection.tmpl.partial b/docs/template_overrides/partials/collection.tmpl.partial
index c282e9a..151ca4f 100644
--- a/docs/template_overrides/partials/collection.tmpl.partial
+++ b/docs/template_overrides/partials/collection.tmpl.partial
@@ -204,12 +204,25 @@
 {{/seealso.0}}
 {{#appliesTo.0}}
 <h3 id="appliesTo">Applies to</h3>
-<div class="seealso">
+<div class="appliesto">
+  <details>
+   <summary class="has-margin-bottom-medium">
+      Platforms and versions
+    </summary>
+    <div>
+      <table>
+        <thead><th>Target</th><th>Versions</th></thead>
+        <tbody>	
 {{/appliesTo.0}}
 {{#appliesTo}}
-<div><b>{{platform}}</b><br/>{{versions}}<br/><br/></div>
+          <tr><td><b>{{platform}}</b></td><td>{{versions}}</td></tr>
 {{/appliesTo}}
-{{#appliesTo.0}}
+{{#appliesTo.0}}  
+        </tbody>
+        </thead>
+      </table>
+    </div>
+  </details>
 </div>
 {{/appliesTo.0}}
 {{/children}}
diff --git a/docs/template_overrides/styles/main.css b/docs/template_overrides/styles/main.css
index 9174371..e904631 100644
--- a/docs/template_overrides/styles/main.css
+++ b/docs/template_overrides/styles/main.css
@@ -251,3 +251,12 @@ pre {
   border: none;
   box-shadow: var(--custom-box-shadow);
 }
+details
+{
+  display:block;
+}
+summary
+{
+  cursor: pointer;
+  display: list-item;
+}
\ No newline at end of file