diff --git a/ui/app/templates/allocations/allocation.hbs b/ui/app/templates/allocations/allocation.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/allocations/allocation.hbs
+++ b/ui/app/templates/allocations/allocation.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/allocations/allocation/task.hbs b/ui/app/templates/allocations/allocation/task.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/allocations/allocation/task.hbs
+++ b/ui/app/templates/allocations/allocation/task.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/clients.hbs b/ui/app/templates/clients.hbs
index 6e448d265..82ed74cdc 100644
--- a/ui/app/templates/clients.hbs
+++ b/ui/app/templates/clients.hbs
@@ -1,4 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 <PageLayout>
   {{outlet}}
-</PageLayout>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</PageLayout>
\ No newline at end of file
diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/components/app-breadcrumbs.hbs b/ui/app/templates/components/app-breadcrumbs.hbs
index 86f7f5233..7c1e105a9 100644
--- a/ui/app/templates/components/app-breadcrumbs.hbs
+++ b/ui/app/templates/components/app-breadcrumbs.hbs
@@ -1,7 +1,7 @@
-<Breadcrumbs as |bb|>
-  {{#each bb as |breadcrumb|}}
-    {{#each breadcrumb.args.crumb as |b|}}
-      {{component (concat "breadcrumbs/" (or b.type "default")) crumb=b}}
-    {{/each}}
+<Breadcrumbs as |breadcrumbs|>
+  {{#each breadcrumbs as |crumb|}}
+    {{#let crumb.args.crumb as |c|}}
+      {{component (concat "breadcrumbs/" (or c.type "default")) crumb=c}}
+    {{/let}}
   {{/each}}
 </Breadcrumbs>
\ No newline at end of file
diff --git a/ui/app/templates/csi/plugins.hbs b/ui/app/templates/csi/plugins.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/csi/plugins.hbs
+++ b/ui/app/templates/csi/plugins.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/csi/plugins/plugin.hbs b/ui/app/templates/csi/plugins/plugin.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/csi/plugins/plugin.hbs
+++ b/ui/app/templates/csi/plugins/plugin.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/csi/volumes.hbs b/ui/app/templates/csi/volumes.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/csi/volumes.hbs
+++ b/ui/app/templates/csi/volumes.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/csi/volumes/volume.hbs b/ui/app/templates/csi/volumes/volume.hbs
index 2419f31ca..7ac8e68f9 100644
--- a/ui/app/templates/csi/volumes/volume.hbs
+++ b/ui/app/templates/csi/volumes/volume.hbs
@@ -1,3 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 {{page-title "CSI Volume " this.model.name}}
 <section class="section with-headspace">
   <h1 class="title" data-test-title>
@@ -187,5 +190,4 @@
       </table>
     </div>
   </div>
-</section>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/ui/app/templates/jobs.hbs b/ui/app/templates/jobs.hbs
index 44a687f0c..82ed74cdc 100644
--- a/ui/app/templates/jobs.hbs
+++ b/ui/app/templates/jobs.hbs
@@ -1,4 +1,6 @@
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 <PageLayout>
   {{outlet}}
 </PageLayout>
\ No newline at end of file
diff --git a/ui/app/templates/jobs/job.hbs b/ui/app/templates/jobs/job.hbs
index bc4208e20..0915a337c 100644
--- a/ui/app/templates/jobs/job.hbs
+++ b/ui/app/templates/jobs/job.hbs
@@ -1 +1,4 @@
-{{outlet}}<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
+{{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/jobs/job/dispatch.hbs b/ui/app/templates/jobs/job/dispatch.hbs
index 14fab8f07..2387f0af0 100644
--- a/ui/app/templates/jobs/job/dispatch.hbs
+++ b/ui/app/templates/jobs/job/dispatch.hbs
@@ -1,6 +1,8 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 {{page-title "Dispatch new " this.model.name}}
 <JobSubnav @job={{this.model}} />
 <section class="section">
   <JobDispatch @job={{this.model}} />
-</section>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index 9e9593135..ee56ba4b0 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -1,3 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 {{page-title "Task group " this.model.name " - Job " this.model.job.name}}
 <div class="tabs is-subnav">
   <ul>
@@ -318,5 +321,4 @@
       </div>
     </div>
   {{/if}}
-</section>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/ui/app/templates/jobs/run.hbs b/ui/app/templates/jobs/run.hbs
index 62295e9d9..89e14da82 100644
--- a/ui/app/templates/jobs/run.hbs
+++ b/ui/app/templates/jobs/run.hbs
@@ -1,5 +1,7 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 {{page-title "Run a job"}}
 <section class="section">
   <JobEditor @job={{this.model}} @context="new" @onSubmit={{action this.onSubmit}} />
-</section>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/ui/app/templates/optimize.hbs b/ui/app/templates/optimize.hbs
index eff320747..35c289fc6 100644
--- a/ui/app/templates/optimize.hbs
+++ b/ui/app/templates/optimize.hbs
@@ -1,3 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 <PageLayout>
   <section class="section">
     {{#if this.summaries}}
@@ -12,7 +15,7 @@
                 {{this.summaries.length}}
 
                 {{pluralize "recommendation" this.summaries.length}}
-                ..."
+                 ..."
             />
           {{/if}}
         </div>
@@ -122,5 +125,4 @@
       </div>
     {{/if}}
   </section>
-</PageLayout>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</PageLayout>
\ No newline at end of file
diff --git a/ui/app/templates/servers.hbs b/ui/app/templates/servers.hbs
index 6e448d265..82ed74cdc 100644
--- a/ui/app/templates/servers.hbs
+++ b/ui/app/templates/servers.hbs
@@ -1,4 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 <PageLayout>
   {{outlet}}
-</PageLayout>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</PageLayout>
\ No newline at end of file
diff --git a/ui/app/templates/topology.hbs b/ui/app/templates/topology.hbs
index 30cb1e1a1..d1c2cd42c 100644
--- a/ui/app/templates/topology.hbs
+++ b/ui/app/templates/topology.hbs
@@ -1,3 +1,6 @@
+{{#each this.breadcrumbs as |crumb|}}
+  <Breadcrumb @crumb={{crumb}} />
+{{/each}}
 {{page-title "Cluster Topology"}}
 <PageLayout>
   <section class="section is-full-width">
@@ -16,7 +19,7 @@
                 {{if (eq this.filteredNodes.length 1) "client was" "clients were"}}
                 filtered from the topology visualization. This is most likely due to the
                 {{pluralize "client" this.filteredNodes.length}}
-                running a version of Nomad <0.9.0.
+                running a version of Nomad
               </p>
             </div>
             <div class="column is-centered is-minimum">
@@ -473,5 +476,4 @@
       </div>
     {{/if}}
   </section>
-</PageLayout>
-<Breadcrumb @bucket="navigation" @crumb={{this.breadcrumbs}} />
\ No newline at end of file
+</PageLayout>
\ No newline at end of file