diff --git a/src/helpers/versionTree.js b/src/helpers/versionTree.js
index 3384a7d..d5810b1 100644
--- a/src/helpers/versionTree.js
+++ b/src/helpers/versionTree.js
@@ -1,16 +1,5 @@
 'use strict'
 
-module.exports = (components) => versionTree(components)
-
-function versionTree (components) {
-  return components.map((comp) => {
-    return {
-      ...comp,
-      versions: splitVersions(comp.versions),
-    }
-  })
-}
-
 function splitVersions (versions) {
   const snapshot = versions.filter((v) => v.version.includes('SNAPSHOT'))
   const stable = versions.filter((v) => {
@@ -25,3 +14,12 @@ function splitVersions (versions) {
     preview: preview.length > 0 ? preview : null,
   }
 }
+
+module.exports = (components) => {
+  return Object.values(components)?.map((comp) => {
+    return {
+      ...comp,
+      versions: splitVersions(comp.versions),
+    }
+  })
+}
diff --git a/src/partials/version.hbs b/src/partials/version.hbs
index 3a54416..0da5636 100644
--- a/src/partials/version.hbs
+++ b/src/partials/version.hbs
@@ -7,52 +7,23 @@
               </button>
               <div class="colset">
                 <div class="col-left">
-
                   <ul class="nav-versions">
-                    {{#each (versionTree site.components)}}
-                      <li class="component">
-                        <div>
-                          <a class="title" href="{{{relativize ./url}}}">{{{./title}}}</a>
-                        </div>
-
-                        
-                        {{~#if (notEmpty ./versions.stable)}}
-                        <div class="version-item is-active">
-                          <div>
-                            <button class="version-toggle" type="button">
-                              <span></span>
-                              Stable
-                            </button>
-                          </div>
-                          {{> version-nav ./versions.stable}}
-                        </div>
-                        {{/if}}
-
-                        {{~#if (notEmpty ./versions.preview)}}
-                        <div class="version-item">
-                          <div>
-                            <button class="version-toggle" type="button">
-                              <span></span>
-                              Preview
-                            </button>
-                          </div>
-                          {{> version-nav ./versions.preview}}
-                        </div>
-                        {{/if}}
-
-                        {{~#if (notEmpty ./versions.snapshot)}}
-                        <div class="version-item">
-                          <div>
-                            <button class="version-toggle" type="button">
-                              <span></span>
-                              Snapshot
-                            </button>
-                          </div>
-                          {{> version-nav ./versions.snapshot}}
-                        </div>
-                        {{/if}}
-                        
-                      </li>
+                    {{#each site.components}}
+                    <li class="component{{#if (eq this @root.page.component)}} is-current{{/if}}">
+                      <a class="title" href="{{{relativize ./url}}}">{{{./title}}}</a>
+                      <ul class="versions">
+                        {{#each ./versions}}
+                        <li class="version
+                          {{~#if (and (eq .. @root.page.component) (eq this @root.page.componentVersion))}} is-current{{/if~}}
+                          {{~#if (eq this ../latest)}} is-latest{{/if}}">
+                          <a href="{{{relativize ./url}}}">
+                            {{./displayVersion}}
+                            {{~#if (eq this ../latest)}}<span class="current">current</span>{{/if}}
+                          </a>
+                        </li>
+                        {{/each}}
+                      </ul>
+                    </li>
                     {{/each}}
                   </ul>
                 </div>