diff --git a/src/partials/nav.hbs b/src/partials/nav.hbs
index 43316f7296871ca6196201a2967cb4dee7cf1dc4..8f8b82941ebb9e764f689855e8d8de2cf490069b 100644
--- a/src/partials/nav.hbs
+++ b/src/partials/nav.hbs
@@ -1,7 +1,7 @@
 <div class="nav-container"{{#if page.component}} data-component="{{page.component.name}}" data-version="{{page.version}}"{{/if}}>
   <aside class="nav">
     <div class="panels">
-{{> page-versions}}
+{{!-- {{> page-versions}} --}}
 {{> nav-menu}}
 {{> nav-explore}}
     </div>
diff --git a/src/partials/page-versions.hbs b/src/partials/page-versions.hbs
index e51ba4e75ef105d4f6e426a3ae17d0dcf4aee259..7f148d8f07a736ebeb58db132de6a15ef3f04f2e 100644
--- a/src/partials/page-versions.hbs
+++ b/src/partials/page-versions.hbs
@@ -5,16 +5,16 @@
   <h2 class="title"><a href="{{{relativize ./url}}}">{{page.component.title}}</a></h2>
   <button class="version-menu-toggle" title="Show other versions of page">{{#if (or page.componentVersion.version (ne page.componentVersion.displayVersion 'default'))}}v{{page.componentVersion.displayVersion}}{{/if}}</button>
 
-{{#each site.components}}
-  {{#if (or ./versions.[1] ./versions.[0].version (ne ./versions.[0].displayVersion 'default'))}}
+  {{#with site.components.[0]}}
   <div class="version-menu">
-      {{#each ./versions}}
+    {{#each ./versions}}
     <a class="version
+      {{!-- {{~#if (eq ./version @root.page.version)}} is-current{{/if~}} --}}
       {{~#if (and (eq .. @root.page.component) (eq this @root.page.componentVersion))}} is-current{{/if~}}
-      {{~#if (eq this ../latest)}} is-latest{{/if}}" href="{{{relativize ./url}}}">v{{this.displayVersion}}</a>
-      {{/each}}
+      {{~#if ./missing}} is-missing{{/if}}" href="{{{relativize ./url}}}">v{{./displayVersion}}</a>
+    {{/each}}
   </div>
-  {{/if}}
-{{/each}}
+  {{/with}}
 </div>
 {{/if}}
+{{!-- {{/with}} --}}