diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
index d6df21f..0469308 100644
Binary files a/build/ui-bundle.zip and b/build/ui-bundle.zip differ
diff --git a/src/css/toc.css b/src/css/toc.css
index 0e05d06..5d97486 100644
--- a/src/css/toc.css
+++ b/src/css/toc.css
@@ -67,7 +67,7 @@
   color: inherit;
   border-left: 2px solid var(--toc-border-color);
   display: inline-block;
-  padding: 10px 0 10px 8px;
+  padding: 7px 0 7px 8px;
   text-decoration: none;
 }
 
diff --git a/src/partials/nav-explore.hbs b/src/partials/nav-explore.hbs
index 5700c31..ed2437b 100644
--- a/src/partials/nav-explore.hbs
+++ b/src/partials/nav-explore.hbs
@@ -29,19 +29,19 @@
     {{/each}}
   </ul>
 
-  {{#each (sort-components site.components 'name' page.attributes.component-order)}}
-    {{#if (and (not-eq this.name 'cloud') (not-eq this.name 'home') (not-eq this.name 'templates') (eq this @root.page.component))}}
+  {{#with page.versions}}
+    {{#if (and (not-eq @root.page.component.name 'cloud') (not-eq @root.page.component.name 'home') (not-eq @root.page.component.name 'templates'))}}
       <ul class="nav-version-picker-versions" id="navbarVersionsList">
-        {{#each ./versions}}
-          {{#if (lte @index 6)}}
-            <li class="version
-                      {{~#if (and (eq .. @root.page.component) (eq this @root.page.componentVersion))}} is-current{{/if~}}
-              {{~#if (eq this ../latest)}} is-latest{{/if}}">
+        {{#each this}}
+          {{#if (lte @index 10)}}
+            <li
+              class="version {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}"
+            >
               <a href="{{{relativize ./url}}}">{{./displayVersion}}</a>
             </li>
           {{/if}}
         {{/each}}
       </ul>
     {{/if}}
-  {{/each}}
+  {{/with}}
 </div>
diff --git a/src/partials/page-versions.hbs b/src/partials/page-versions.hbs
index 1a8e500..8be3236 100644
--- a/src/partials/page-versions.hbs
+++ b/src/partials/page-versions.hbs
@@ -1,14 +1,14 @@
 {{#with page.versions}}
-<div class="page-versions">
-  <button class="version-menu-toggle" title="Show other versions of page">Version {{@root.page.componentVersion.displayVersion}}</button>
-  <div class="version-menu">
-    {{#each this}}
-      {{#if (lte @index 10)}}
-        <a class="version
-          {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}
-          {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize ./url}}}">{{./displayVersion}}</a>
-      {{/if}}
-    {{/each}}
+  <div class="page-versions">
+    <button class="version-menu-toggle" title="Show other versions of page">Version {{@root.page.componentVersion.displayVersion}}</button>
+    <div class="version-menu">
+      {{#each this}}
+        {{#if (lte @index 10)}}
+          <a class="version
+            {{~#if (eq ./version @root.page.version)}} is-current{{/if~}}
+            {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize ./url}}}">{{./displayVersion}}</a>
+        {{/if}}
+      {{/each}}
+    </div>
   </div>
-</div>
 {{/with}}