diff --git a/src/helpers/is-last.js b/src/helpers/is-last.js
deleted file mode 100644
index 032f167f..00000000
--- a/src/helpers/is-last.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-module.exports = (item, array) => {
-  if (!item || !array) return false
-  if (!Array.isArray(array)) return false
-  return JSON.stringify(item) === JSON.stringify(array.slice(-1)[0])
-}
diff --git a/src/js/01-nav.js b/src/js/01-nav.js
index f72cfd4c..1f5aea50 100644
--- a/src/js/01-nav.js
+++ b/src/js/01-nav.js
@@ -15,10 +15,10 @@
     })
   }
 
-  // Open first nav collapse if none are open.
-  // Useful for pages with no nav links i.e. landing pages.
   const sideNav = document.querySelector('#side-nav')
   if (sideNav) {
+    // Open first nav collapse if none are open.
+    // Useful for pages with no nav links i.e. landing pages.
     const activeCollapses = sideNav.querySelectorAll('.collapse > .collapse-content.active')
     if (!activeCollapses.length) {
       const firstCollapse = sideNav.querySelector('.collapse > .collapse-content')
@@ -26,6 +26,11 @@
         firstCollapse.classList.add('active')
       }
     }
+    // Auto scroll the side nav to the current page's side nav link
+    const currentPageLink = sideNav.querySelector('.nav-link.current-page')
+    if (currentPageLink) {
+      currentPageLink.scrollIntoView({ block: 'center' })
+    }
   }
 
   // Top Global Nav horizontal scrolling
diff --git a/src/partials/breadcrumbs.hbs b/src/partials/breadcrumbs.hbs
index 35234a0f..e22a9fd3 100644
--- a/src/partials/breadcrumbs.hbs
+++ b/src/partials/breadcrumbs.hbs
@@ -1,24 +1,28 @@
 {{#unless (or (eq page.layout 'landing') (eq page.layout 'full') (eq page.layout 'home'))}}
-<nav class="flex" aria-label="breadcrumbs">
-  {{#if page.breadcrumbs}}
-  <ul class="flex flex-wrap !list-none !m-0 !p-0">
+{{#if page.breadcrumbs}}
+<nav id="breadcrumbs" class="flex" aria-label="breadcrumbs">
+  <ol class="flex flex-wrap !list-none !m-0 !p-0">
     {{#with page.componentVersion}}
     {{#if (and ./title (ne ./title @root.page.breadcrumbs.0.content))}}
-    <li class="text-link !m-0 !p-0 after:content-['/'] last-of-type:after:content-none after:text-tertiary after:px-2"><a href="{{{relativize ./url}}}">{{{./title}}}</a></li>
+    <li class="text-link !m-0 !p-0 after:content-['/'] last-of-type:after:content-none after:text-tertiary after:px-2">
+      <a class="component-home" href="{{{relativize ./url}}}">{{{./title}}}</a>
+    </li>
     {{/if}}
     {{/with}}
     {{#each page.breadcrumbs}}
-    {{#if (and ./url (eq ./urlType 'internal'))}}
-    {{#if (is-last this ../page.breadcrumbs)}}
-    <li class="text-tertiary !m-0 !p-0">{{{./content}}}</li>
-    {{else}}
+    {{#if ./content}}
+    {{#if (not (eq ./url @root.page.url))}}
+    {{#if (eq ./urlType 'internal')}}
     <li class="text-link !m-0 !p-0 after:content-['/'] last-of-type:after:content-none after:text-tertiary after:px-2">
       <a href="{{{relativize ./url}}}">{{{./content}}}</a>
     </li>
+    {{else}}
+    <li class="text-tertiary !m-0 !p-0 after:content-['/'] last-of-type:after:content-none after:text-tertiary after:px-2">{{{./content}}}</li>
+    {{/if}}
     {{/if}}
     {{/if}}
     {{/each}}
-  </ul>
-  {{/if}}
+  </ol>
 </nav>
+{{/if}}
 {{/unless}}
diff --git a/src/partials/nav-tree.hbs b/src/partials/nav-tree.hbs
index af0c8e1e..94bb3a87 100644
--- a/src/partials/nav-tree.hbs
+++ b/src/partials/nav-tree.hbs
@@ -5,7 +5,7 @@
   <li class="nav-item{{#if ./items.length}} collapse{{/if}}" data-depth="{{or ../level 0}}">
     {{#if (and ./url (not ./items.length))}}
     <a 
-      class="nav-link !no-underline" 
+      class="nav-link !no-underline{{#if (eq ./url @root.page.url)}} current-page{{/if}}" 
       href="{{~#if (eq ./urlType 'internal')}}{{{relativize ./url}}}{{~else}}{{{./url}}}{{~/if}}"
       {{#if (eq ./url @root.page.url)}} aria-current="page"{{/if}}
       {{#if (eq ./urlType 'external')}} target="_blank"{{/if}}>
diff --git a/src/partials/nav.hbs b/src/partials/nav.hbs
index dee24729..65640903 100644
--- a/src/partials/nav.hbs
+++ b/src/partials/nav.hbs
@@ -6,9 +6,9 @@
   {{~/if}}
   id="side-nav" 
   class="h-full bg-level1 overflow-y-scroll flex flex-col w-[18.5rem] px-2 pt-2">
-    <div class="flex items-start gap-1 mb-1 ">
+    <div class="flex items-start gap-1 mb-1">
       {{#with @root.page.componentVersion}}
-      <a class="flex flex-grow py-1 px-2 text-h4 hover:bg-level2 rounded transition-colors !no-underline" href="{{{relativize ./url}}}">{{./title}}</a>
+      <a class="component-home flex flex-grow py-1 px-2 text-h4 hover:bg-level2 rounded transition-colors !no-underline" href="{{{relativize ./url}}}">{{./title}}</a>
       {{/with}}
       {{> page-versions page=../page}}
     </div>