diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index 762105359..498e56b8d 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -25,9 +25,7 @@
                                     {% for report in module_reports %}
                                         <tr>
                                             <td>
-                                                <a href="{% url 'extras:report' module=report.module name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">
-                                                    <strong>{{ report.name }}</strong>
-                                                </a>
+                                                <a href="{% url 'extras:report' module=report.module name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">{{ report.name }}</a>
                                             </td>
                                             <td>
                                                 {% include 'extras/inc/job_label.html' with result=report.result %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 6d394b874..6187e6f71 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -10,50 +10,58 @@
   <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
 {% endblock %}
 
-{% block content %}
+{% block subtitle %}
+  <div class="object-subtitle">
     <div class="text-muted">{{ script.Meta.description|render_markdown }}</div>
-    <ul class="nav nav-tabs" role="tablist">
-        <li class="nav-item" role="presentation">
-            <a href="#run" role="tab" data-bs-toggle="tab" class="nav-link active">Run</a>
-        </li>
-        <li class="nav-item" role="presentation">
-            <a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">Source</a>
-        </li>
-    </ul>
-    <div class="tab-content py-3">
-        <div role="tabpanel" class="tab-pane active" id="run">
-            <div class="row">
-                <div class="col col-md-6">
-                    {% if not perms.extras.run_script %}
-                        <div class="alert alert-warning">
-                            <i class="mdi mdi-alert"></i>
-                            You do not have permission to run scripts.
-                        </div>
-                    {% endif %}
-                    <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
-                        {% csrf_token %}
-                        <div class="field-group mb-3">
-                        {% if form.requires_input %}
-                            <h4>Script Data</h4>
-                        {% else %}
-                            <div class="alert alert-info">
-                                <i class="mdi mdi-information"></i>
-                                This script does not require any input to run.
-                            </div>
-                        {% endif %}
-                        {% render_form form %}
-                        </div>
-                        <div class="float-end">
-                            <a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">Cancel</a>
-                            <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> Run Script</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <div role="tabpanel" class="tab-pane" id="source">
-            <code class="h6 my-3 d-block">{{ script.filename }}</code>
-            <pre>{{ script.source }}</pre>
-        </div>
-    </div>
+  </div>
 {% endblock %}
+
+{% block tabs %}
+<ul class="nav nav-tabs px-3">
+  <li class="nav-item" role="presentation">
+    <a href="#run" role="tab" data-bs-toggle="tab" class="nav-link active">Run</a>
+  </li>
+  <li class="nav-item" role="presentation">
+    <a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">Source</a>
+  </li>
+</ul>
+{% endblock %}
+
+{% block content-wrapper %}
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="run">
+      <div class="row">
+        <div class="col">
+          {% if not perms.extras.run_script %}
+            <div class="alert alert-warning">
+              <i class="mdi mdi-alert"></i>
+              You do not have permission to run scripts.
+            </div>
+          {% endif %}
+          <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
+            {% csrf_token %}
+            <div class="field-group mb-3">
+              {% if form.requires_input %}
+                <h4 class="text-center">Script Data</h4>
+              {% else %}
+                <div class="alert alert-info">
+                  <i class="mdi mdi-information"></i>
+                  This script does not require any input to run.
+                </div>
+              {% endif %}
+              {% render_form form %}
+            </div>
+            <div class="float-end">
+              <a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">Cancel</a>
+              <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> Run Script</button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+    <div role="tabpanel" class="tab-pane" id="source">
+      <code class="h6 my-3 d-block">{{ script.filename }}</code>
+      <pre>{{ script.source }}</pre>
+    </div>
+  </div>
+{% endblock content-wrapper %}
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index b06520c94..1cc35d36c 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -22,7 +22,7 @@
                             {% for class_name, script in module_scripts.items %}
                                 <tr>
                                     <td>
-                                        <a href="{% url 'extras:script' module=script.module name=class_name %}" name="script.{{ class_name }}"><strong>{{ script }}</strong></a>
+                                        <a href="{% url 'extras:script' module=script.module name=class_name %}" name="script.{{ class_name }}">{{ script }}</a>
                                     </td>
                                     <td>
                                         {% include 'extras/inc/job_label.html' with result=script.result %}