diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index 4fe7ff024..92ce9ef19 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -3,12 +3,15 @@
 {% load i18n %}
 
 {% block title %}
-  {% blocktrans trimmed with object_type=object|meta:"verbose_name"|bettertitle %}
-    Cable Trace for {{ object_type }} {{ object }}
-  {% endblocktrans %}
 {% endblock %}
 
 {% block content %}
+    <h2>
+      {% blocktrans trimmed with object_type=object|meta:"verbose_name"|bettertitle %}
+        Cable Trace for {{ object_type }} {{ object }}
+      {% endblocktrans %}
+    </h2>
+
     <div class="row">
 
         {# Cable trace SVG & options #}
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index 2e7fb72b8..2c0ba8d9c 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -3,29 +3,31 @@
 {% load i18n %}
 
 {% block title %}
-  {% blocktrans trimmed %}
-    Add New Member to Virtual Chassis {{ virtual_chassis }}
-  {% endblocktrans %}
 {% endblock %}
 
 {% block content %}
-    <form action="" method="post" enctype="multipart/form-data" class="object-edit">
-        {% render_errors membership_form %}
-        
-        {% csrf_token %}
-        <div class="card">
-            <h5 class="card-header">{% trans "Add New Member" %}</h5>
-            <div class="card-body">
-                {% render_form member_select_form %}
-                {% render_form membership_form %}
-            </div>
-        </div>
-        <div class="text-end my-3">
-          <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
-          <div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
-            <button type="submit" name="_save" class="btn btn-primary">{% trans "Save" %}</button>
-            <button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Save & Add Another" %}</button>
+  <h2>
+    {% blocktrans trimmed %}
+      Add New Member to Virtual Chassis {{ virtual_chassis }}
+    {% endblocktrans %}
+  </h2>
+  <form action="" method="post" enctype="multipart/form-data" class="object-edit">
+      {% render_errors membership_form %}
+
+      {% csrf_token %}
+      <div class="card">
+          <h5 class="card-header">{% trans "Add New Member" %}</h5>
+          <div class="card-body">
+              {% render_form member_select_form %}
+              {% render_form membership_form %}
           </div>
+      </div>
+      <div class="text-end my-3">
+        <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
+        <div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
+          <button type="submit" name="_save" class="btn btn-primary">{% trans "Save" %}</button>
+          <button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Save & Add Another" %}</button>
         </div>
-    </form>
+      </div>
+  </form>
 {% endblock %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 14355d1cb..985c58d63 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -10,21 +10,18 @@
   {{ script.Meta.description|markdown }}
 {% endblock %}
 
-{% block header %}
-  <div class="row d-print-none">
-    <div class="col col-md-12">
-      <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
-        <ol class="breadcrumb">
-          <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">{% trans "Scripts" %}</a></li>
-          <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ script.module }}">{{ script.module|bettertitle }}</a></li>
-          <li class="breadcrumb-item"><a href="{% url 'extras:script' module=script.module name=script.class_name %}">{{ script }}</a></li>
-          <li class="breadcrumb-item">{{ job.created|annotated_date }}</li>
-        </ol>
-      </nav>
-    </div>
+{% block page-header %}
+  <div class="container-xl mt-2">
+    <nav class="breadcrumb-container" aria-label="breadcrumb">
+      <ol class="breadcrumb">
+        <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">{% trans "Scripts" %}</a></li>
+        <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ script.module }}">{{ script.module|bettertitle }}</a></li>
+        <li class="breadcrumb-item"><a href="{% url 'extras:script' module=script.module name=script.class_name %}">{{ script }}</a></li>
+        <li class="breadcrumb-item">{{ job.created|annotated_date }}</li>
+      </ol>
+    </nav>
   </div>
-  {{ block.super }}
-{% endblock header %}
+{% endblock page-header %}
 
 {% block controls %}
   {% if request.user|can_delete:job %}