diff --git a/ui/app/templates/allocations.hbs b/ui/app/templates/allocations.hbs
index 8fab3547f..a766b9ff6 100644
--- a/ui/app/templates/allocations.hbs
+++ b/ui/app/templates/allocations.hbs
@@ -1,3 +1,6 @@
 <div class="page-layout">
+  {{#global-header class="page-header"}}
+    {{app-breadcrumbs}}
+  {{/global-header}}
   {{outlet}}
 </div>
diff --git a/ui/app/templates/allocations/allocation/index.hbs b/ui/app/templates/allocations/allocation/index.hbs
index 0e59ce277..34389a657 100644
--- a/ui/app/templates/allocations/allocation/index.hbs
+++ b/ui/app/templates/allocations/allocation/index.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
     <h1 data-test-title class="title">
diff --git a/ui/app/templates/allocations/allocation/task/index.hbs b/ui/app/templates/allocations/allocation/task/index.hbs
index b9dd5871c..d24ec3819 100644
--- a/ui/app/templates/allocations/allocation/task/index.hbs
+++ b/ui/app/templates/allocations/allocation/task/index.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
   <section class="section">
diff --git a/ui/app/templates/allocations/allocation/task/logs.hbs b/ui/app/templates/allocations/allocation/task/logs.hbs
index 46302513f..6799e39d6 100644
--- a/ui/app/templates/allocations/allocation/task/logs.hbs
+++ b/ui/app/templates/allocations/allocation/task/logs.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   {{partial "allocations/allocation/task/subnav"}}
   <section class="section">
diff --git a/ui/app/templates/clients.hbs b/ui/app/templates/clients.hbs
index 8fab3547f..a766b9ff6 100644
--- a/ui/app/templates/clients.hbs
+++ b/ui/app/templates/clients.hbs
@@ -1,3 +1,6 @@
 <div class="page-layout">
+  {{#global-header class="page-header"}}
+    {{app-breadcrumbs}}
+  {{/global-header}}
   {{outlet}}
 </div>
diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs
index 05b44e757..f83069ccf 100644
--- a/ui/app/templates/clients/client.hbs
+++ b/ui/app/templates/clients/client.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
     <h1 data-test-title class="title">
diff --git a/ui/app/templates/clients/index.hbs b/ui/app/templates/clients/index.hbs
index 1ff87db6a..2f7d0894f 100644
--- a/ui/app/templates/clients/index.hbs
+++ b/ui/app/templates/clients/index.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section">
     {{#if isForbidden}}
diff --git a/ui/app/templates/clients/loading.hbs b/ui/app/templates/clients/loading.hbs
index 39002f28a..3298bc9c0 100644
--- a/ui/app/templates/clients/loading.hbs
+++ b/ui/app/templates/clients/loading.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   <section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
 {{/gutter-menu}}
diff --git a/ui/app/templates/components/job-page/batch.hbs b/ui/app/templates/components/job-page/batch.hbs
index aa4036356..04c352fa8 100644
--- a/ui/app/templates/components/job-page/batch.hbs
+++ b/ui/app/templates/components/job-page/batch.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/parameterized-child.hbs b/ui/app/templates/components/job-page/parameterized-child.hbs
index 6b53b2d72..5eb736ee0 100644
--- a/ui/app/templates/components/job-page/parameterized-child.hbs
+++ b/ui/app/templates/components/job-page/parameterized-child.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/parameterized.hbs b/ui/app/templates/components/job-page/parameterized.hbs
index b60677f4b..8fca16924 100644
--- a/ui/app/templates/components/job-page/parameterized.hbs
+++ b/ui/app/templates/components/job-page/parameterized.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/periodic-child.hbs b/ui/app/templates/components/job-page/periodic-child.hbs
index 3ac3b61de..87c8c500d 100644
--- a/ui/app/templates/components/job-page/periodic-child.hbs
+++ b/ui/app/templates/components/job-page/periodic-child.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/periodic.hbs b/ui/app/templates/components/job-page/periodic.hbs
index 8767d24cd..bc70771dc 100644
--- a/ui/app/templates/components/job-page/periodic.hbs
+++ b/ui/app/templates/components/job-page/periodic.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/service.hbs b/ui/app/templates/components/job-page/service.hbs
index fdfdd4761..1dce65f3a 100644
--- a/ui/app/templates/components/job-page/service.hbs
+++ b/ui/app/templates/components/job-page/service.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/components/job-page/system.hbs b/ui/app/templates/components/job-page/system.hbs
index aa4036356..04c352fa8 100644
--- a/ui/app/templates/components/job-page/system.hbs
+++ b/ui/app/templates/components/job-page/system.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#job-page/parts/body job=job onNamespaceChange=onNamespaceChange}}
   {{job-page/parts/error errorMessage=errorMessage onDismiss=(action "clearErrorMessage")}}
 
diff --git a/ui/app/templates/jobs.hbs b/ui/app/templates/jobs.hbs
index 8fab3547f..a766b9ff6 100644
--- a/ui/app/templates/jobs.hbs
+++ b/ui/app/templates/jobs.hbs
@@ -1,3 +1,6 @@
 <div class="page-layout">
+  {{#global-header class="page-header"}}
+    {{app-breadcrumbs}}
+  {{/global-header}}
   {{outlet}}
 </div>
diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 5da19f183..7b409cadb 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "refresh")}}
   <section class="section">
     {{#if isForbidden}}
diff --git a/ui/app/templates/jobs/job/definition.hbs b/ui/app/templates/jobs/job/definition.hbs
index ca592fef2..924d18000 100644
--- a/ui/app/templates/jobs/job/definition.hbs
+++ b/ui/app/templates/jobs/job/definition.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
   {{partial "jobs/job/subnav"}}
   <section class="section">
diff --git a/ui/app/templates/jobs/job/deployments.hbs b/ui/app/templates/jobs/job/deployments.hbs
index 1f17dcfa3..241a0d32d 100644
--- a/ui/app/templates/jobs/job/deployments.hbs
+++ b/ui/app/templates/jobs/job/deployments.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
   {{partial "jobs/job/subnav"}}
   <section class="section">
diff --git a/ui/app/templates/jobs/job/loading.hbs b/ui/app/templates/jobs/job/loading.hbs
index f0b82dd3d..a90321c31 100644
--- a/ui/app/templates/jobs/job/loading.hbs
+++ b/ui/app/templates/jobs/job/loading.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body"}}
   {{partial "jobs/job/subnav"}}
   <section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
diff --git a/ui/app/templates/jobs/job/task-group.hbs b/ui/app/templates/jobs/job/task-group.hbs
index 19eddaf63..b2b08c701 100644
--- a/ui/app/templates/jobs/job/task-group.hbs
+++ b/ui/app/templates/jobs/job/task-group.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
   <div class="tabs is-subnav">
     <ul>
diff --git a/ui/app/templates/jobs/job/versions.hbs b/ui/app/templates/jobs/job/versions.hbs
index 541fb1bb4..9b03e23ad 100644
--- a/ui/app/templates/jobs/job/versions.hbs
+++ b/ui/app/templates/jobs/job/versions.hbs
@@ -1,6 +1,3 @@
-{{#global-header class="page-header"}}
-  {{app-breadcrumbs}}
-{{/global-header}}
 {{#gutter-menu class="page-body" onNamespaceChange=(action "gotoJobs")}}
   {{partial "jobs/job/subnav"}}
   <section class="section">
diff --git a/ui/app/templates/loading.hbs b/ui/app/templates/loading.hbs
index 14013c55b..206f1ebac 100644
--- a/ui/app/templates/loading.hbs
+++ b/ui/app/templates/loading.hbs
@@ -1,5 +1,6 @@
 <div class="page-layout">
   {{#global-header class="page-header"}}
+    {{app-breadcrumbs}}
   {{/global-header}}
   {{#gutter-menu class="page-body"}}
     <section class="section has-text-centered">{{partial "partials/loading-spinner"}}</section>
diff --git a/ui/app/templates/settings.hbs b/ui/app/templates/settings.hbs
index e781df8a2..2e4ddc936 100644
--- a/ui/app/templates/settings.hbs
+++ b/ui/app/templates/settings.hbs
@@ -1,5 +1,6 @@
 <div class="page-layout">
   {{#global-header class="page-header"}}
+    {{app-breadcrumbs}}
   {{/global-header}}
   {{#gutter-menu class="page-body"}}
     {{outlet}}