diff --git a/allianceauth/eveonline/templatetags/examples.html b/allianceauth/eveonline/templatetags/examples.html
index 69482457..47962f5e 100644
--- a/allianceauth/eveonline/templatetags/examples.html
+++ b/allianceauth/eveonline/templatetags/examples.html
@@ -14,15 +14,13 @@ Needs to be called with a context containing three objects:
 {% block page_title %}Evelinks Examples{% endblock page_title %}
 
 {% block content %}
+    <div>
+        {% include "framework/header/page-header.html" with title="Evelinks templatetags examples" %}
 
-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">Evelinks templatetags examples</h1>
         <div class="col-lg-12 container">
-
             <h2>profile URLs</h2>
 
             <div class="rows">
-
                 <div class="col-md-4">
                     <h3>evewho</h3>
                     <p><a href="{{ my_character|evewho_character_url }}">character from character object</a></p>
@@ -57,7 +55,6 @@ Needs to be called with a context containing three objects:
             <h2>image URLs</h2>
 
             <div class="rows">
-
                 <div class="col-md-4">
                     <p>character from ID: <img src="{{ my_character.character_id|character_portrait_url:128 }}"></p>
                     <p>character from character object: <img src="{{ my_character|character_portrait_url:128 }}"></p>
@@ -77,5 +74,4 @@ Needs to be called with a context containing three objects:
             </div>
         </div>
     </div>
-
 {% endblock content %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
index 8183da5d..3feec878 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/characternotexisting.html
@@ -12,9 +12,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Character not found!" %}
-        </h1>
+        {% translate "Character not found!" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="col-lg-12 container">
             <div class="row">
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
index e23df8de..cd0106f6 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
@@ -13,9 +13,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create Fatlink" %}
-        </h1>
+        {% translate "Create Fatlink" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div>
             {% if badrequest %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
index c935d853..53519714 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
@@ -14,16 +14,16 @@
     <div>
         <h1 class="page-header text-center mb-3">
             {% translate "Edit fatlink" %} "{{ fatlink }}"
-
-            <div class="text-end">
-                <form>
-                    <button type="submit" onclick="return confirm('{% translate "Are you sure?" %}')" class="btn btn-danger" name="deletefat" value="True">
-                        {% translate "Delete fat" %}
-                    </button>
-                </form>
-            </div>
         </h1>
 
+        <div class="text-end mb-3">
+            <form>
+                <button type="submit" onclick="return confirm('{% translate "Are you sure?" %}')" class="btn btn-danger" name="deletefat" value="True">
+                    {% translate "Delete fat" %}
+                </button>
+            </form>
+        </div>
+
         <div class="card card-default">
             <div class="card-header">
                 <div class="card-title mb-0">{% translate "Registered characters" %}</div>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index fa0f9138..697c2b5a 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -14,20 +14,20 @@
     <div>
         <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-
-            {% if char_id %}
-                <div class="text-end">
-                    <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
-                        {% translate "Previous month" %}
-                    </a>
-                    <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">
-                        {% translate "Next month" %}
-                    </a>
-                </div>
-            {% endif %}
         </h1>
 
-        <div class="card card-default mb-4">
+        {% if char_id %}
+            <div class="text-end mb-3">
+                <a href="{% url 'fatlink:user_statistics_month' char_id previous_month|date:'Y' previous_month|date:'m' %}" class="btn btn-info">
+                    {% translate "Previous month" %}
+                </a>
+                <a href="{% url 'fatlink:user_statistics_month' char_id next_month|date:'Y' next_month|date:'m'  %}" class="btn btn-info">
+                    {% translate "Next month" %}
+                </a>
+            </div>
+        {% endif %}
+
+        <div class="card card-default mb-3">
             <div class="card-header">
                 <div class="card-title mb-0">
                     {% blocktranslate count links=n_fats trimmed %}
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
index 30b19512..fbff4660 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalstatisticsview.html
@@ -14,16 +14,16 @@
     <div>
         <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ year }}{% endblocktranslate %}
-
-            <div class="text-end">
-                <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
-
-                {% if next_year %}
-                    <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
-                {% endif %}
-            </div>
         </h1>
 
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:personal_statistics_year" previous_year %}" class="btn btn-info"><i class="fa-solid fa-chevron-left"></i> {% translate "Previous year" %}</a>
+
+            {% if next_year %}
+                <a href="{% url "fatlink:personal_statistics_year" next_year %}" class="btn btn-info">{% translate "Next year" %} <i class="fa-solid fa-chevron-right"></i></a>
+            {% endif %}
+        </div>
+
         <div class="col-lg-2 offset-lg-5">
             <table class="table table-responsive">
                 <tr>
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
index 3132d889..e05b7f0a 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html
@@ -11,19 +11,19 @@
 {% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div>
         <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-
-            <div class="text-end">
-                <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-
-                {% if next_month %}
-                    <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
-                {% endif %}
-            </div>
         </h1>
 
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:statistics_corp_month" corpid previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+
+            {% if next_month %}
+                <a href="{% url "fatlink:statistics_corp_month" corpid next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% translate "Next month" %}</a>
+            {% endif %}
+        </div>
+
         {% if fatStats %}
             <div class="table-responsive">
                 <table class="table table-striped">
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
index f48a1d64..724fe95c 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html
@@ -14,16 +14,16 @@
     <div>
         <h1 class="page-header text-center mb-3">
             {% blocktranslate %}Participation data statistics for {{ month }}, {{ year }}{% endblocktranslate %}
-
-            <div class="text-end">
-                <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
-
-                {% if next_month %}
-                    <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
-                {% endif %}
-            </div>
         </h1>
 
+        <div class="text-end mb-3">
+            <a href="{% url "fatlink:statistics_month" previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% translate "Previous month" %}</a>
+
+            {% if next_month %}
+                <a href="{% url 'fatlink:statistics_month' next_month|date:"Y" next_month|date:"m"  %}" class="btn btn-info">{% translate "Next month" %}</a>
+            {% endif %}
+        </div>
+
         {% if fatStats %}
             <div class="table-responsive">
                 <table class="table table-striped">
diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
index 53131194..72470ab0 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
@@ -11,10 +11,9 @@
 {% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">
-            {% translate "Participation data" %}
-        </h1>
+    <div>
+        {% translate "Participation data" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="table-responsive">
             <table class="table table-striped">
diff --git a/allianceauth/framework/templates/framework/header/page-header.html b/allianceauth/framework/templates/framework/header/page-header.html
index c8c823ba..ed067db3 100644
--- a/allianceauth/framework/templates/framework/header/page-header.html
+++ b/allianceauth/framework/templates/framework/header/page-header.html
@@ -1,5 +1,5 @@
 {#Usage:#}
-{#    {%  include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}
+{#    {% include "framework/header/page-header.html" with title="Foobar" subtitle="Barfoo" %}#}
 
 {% if title %}
     <h1 class="page-header text-center mb-3">
diff --git a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
index e36a18ba..07166a4e 100644
--- a/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
+++ b/allianceauth/hrapplications/templates/hrapplications/corpchoice.html
@@ -12,9 +12,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Choose a Corp" %}
-        </h1>
+        {% translate "Choose a Corp" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         {% if choices %}
             <div class="card card-primary">
diff --git a/allianceauth/hrapplications/templates/hrapplications/management.html b/allianceauth/hrapplications/templates/hrapplications/management.html
index f7016c4d..6af139b7 100644
--- a/allianceauth/hrapplications/templates/hrapplications/management.html
+++ b/allianceauth/hrapplications/templates/hrapplications/management.html
@@ -13,17 +13,18 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">{% translate "Personal Applications" %}
-            <div class="text-end">
-                {% if create %}
-                    <a href="{% url 'hrapplications:create_view' %}">
-                        <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
-                    </a>
-                {% else %}
-                    <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
-                {% endif %}
-            </div>
-        </h1>
+        {% translate "Personal Applications" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        <div class="text-end mb-3">
+            {% if create %}
+                <a href="{% url 'hrapplications:create_view' %}">
+                    <button type="button" class="btn btn-success">{% translate "Create Application" %}</button>
+                </a>
+            {% else %}
+                <button type="button" class="btn btn-success" disabled>{% translate "Create Application" %}</button>
+            {% endif %}
+        </div>
 
         {% if personal_apps %}
             <div class="card card-default mb-3">
@@ -68,16 +69,17 @@
         {% endif %}
 
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center mb-3">{% translate "Application Management" %}
-                <div class="text-end">
-                    <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-hr-search">
-                        {% translate "Search Applications" %}
-                    </button>
-                </div>
-            </h1>
+            {% translate "Application Management" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}
 
-            <div class="card card-default mt-4">
+            <div class="text-end mb-3">
+                <!-- Button trigger modal -->
+                <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#modal-hr-search">
+                    {% translate "Search Applications" %}
+                </button>
+            </div>
+
+            <div class="card card-default">
                 <div class="card-body clearfix">
                     <ul class="nav nav-tabs" id="application-list" role="tablist">
                         <li class="nav-item" role="presentation">
diff --git a/allianceauth/hrapplications/templates/hrapplications/searchview.html b/allianceauth/hrapplications/templates/hrapplications/searchview.html
index 41077232..1b1eeff8 100644
--- a/allianceauth/hrapplications/templates/hrapplications/searchview.html
+++ b/allianceauth/hrapplications/templates/hrapplications/searchview.html
@@ -14,9 +14,8 @@
 {% block content %}
     <div>
         {% if perms.auth.human_resources %}
-            <h1 class="page-header text-center mb-3">
-                {% translate "Application Search Results" %}
-            </h1>
+            {% translate "Application Search Results" as page_header %}
+            {% include "framework/header/page-header.html" with title=page_header %}
 
             <div class="text-end mb-3">
                 <!-- Button trigger modal -->
diff --git a/allianceauth/hrapplications/templates/hrapplications/view.html b/allianceauth/hrapplications/templates/hrapplications/view.html
index 9b621bb4..4b01a27f 100644
--- a/allianceauth/hrapplications/templates/hrapplications/view.html
+++ b/allianceauth/hrapplications/templates/hrapplications/view.html
@@ -13,7 +13,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">{% translate "View Application" %}</h1>
+        {% translate "View Application" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div>
             {% if app.approved %}
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index 8bcb58bd..64044f63 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -18,9 +18,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create Fleet Operation" %}
-        </h1>
+        {% translate "Create Fleet Operation" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="card card-primary border-0">
             <div class="card-header">
diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html
index bb9f4a17..18998bd8 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -18,9 +18,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Update Fleet Operation" %}
-        </h1>
+        {% translate "Update Fleet Operation" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="card card-primary border-0">
             <div class="card-header">
diff --git a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
index 3a72d034..958005de 100644
--- a/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
+++ b/allianceauth/services/modules/teamspeak3/templates/services/teamspeak3/teamspeakjoin.html
@@ -7,9 +7,8 @@
 
 {% block content %}
     <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">
-            {% translate "Verify TeamSpeak3 Identity" %}
-        </h1>
+        {% translate "Verify TeamSpeak3 Identity" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="row justify-content-center">
             <div class="col-md-4">
diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html
index 24e99a58..cfa63c16 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -11,7 +11,7 @@
 {% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div>
         <h1 class="page-header text-center mb-3">
             {% blocktranslate with service_name=view.service_name|title %}{{ service_name }} Credentials{% endblocktranslate %}
         </h1>
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index 502d21a1..0f2c477e 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -17,9 +17,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create SRP Fleet" %}
-        </h1>
+        {% translate "Create SRP Fleet" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="card card-primary border-0">
             <div class="card-header">
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index d649cdc2..ffb29a1a 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -13,23 +13,22 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "SRP Fleet Data" %}
+        {% translate "SRP Fleet Data" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
-            <div class="text-end">
-                {% if perms.auth.srp_management %}
-                    {% if fleet_status == "Completed" %}
-                        <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
-                            {% translate "Mark Incomplete" %}
-                        </a>
-                    {% else %}
-                        <a href="{% url 'srp:mark_completed' fleet_id %}" class="btn btn-success">
-                            {% translate "Mark Completed" %}
-                        </a>
-                    {% endif %}
+        <div class="text-end mb-3">
+            {% if perms.auth.srp_management %}
+                {% if fleet_status == "Completed" %}
+                    <a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
+                        {% translate "Mark Incomplete" %}
+                    </a>
+                {% else %}
+                    <a href="{% url 'srp:mark_completed' fleet_id %}" class="btn btn-success">
+                        {% translate "Mark Completed" %}
+                    </a>
                 {% endif %}
-            </div>
-        </h1>
+            {% endif %}
+        </div>
 
         {% if srpfleetrequests %}
             <form method="POST">
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index 550d5e6e..7fc10169 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -13,9 +13,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Create SRP Request" %}
-        </h1>
+        {% translate "Create SRP Request" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="card card-primary border-0">
             <div class="card-header">
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index 1641a234..55bbe8d1 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -13,9 +13,8 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Update AAR Link" %}
-        </h1>
+        {% translate "Update AAR Link" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
 
         <div class="card card-primary border-0">
             <div class="card-header">
diff --git a/allianceauth/templates/allianceauth/error.html b/allianceauth/templates/allianceauth/error.html
index 50ef031d..5d65c676 100644
--- a/allianceauth/templates/allianceauth/error.html
+++ b/allianceauth/templates/allianceauth/error.html
@@ -5,8 +5,8 @@
 {% endblock page_title %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <h1 class="page-header text-center mb-3">{{ error_title }}</h1>
+    <div>
+        {% include "framework/header/page-header.html" with title=error_title %}
 
         <div class="text-center">
             <svg
diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html
index d88fcb59..d15fd65a 100644
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@@ -15,9 +15,10 @@
         <h1 class="page-header text-center mb-3">
             {% block page_header %}
             {% endblock page_header %}
-            {% include "timerboard/index_button.html" %}
         </h1>
 
+        {% include "timerboard/index_button.html" %}
+
         <div class="card card-primary border-0">
             <div class="card-header">
                 <div class="card-title mb-0">
diff --git a/allianceauth/timerboard/templates/timerboard/index_button.html b/allianceauth/timerboard/templates/timerboard/index_button.html
index 0e13ba76..8efd4086 100644
--- a/allianceauth/timerboard/templates/timerboard/index_button.html
+++ b/allianceauth/timerboard/templates/timerboard/index_button.html
@@ -1,5 +1,5 @@
 {% load i18n %}
 
-<div class="text-end">
+<div class="text-end mb-3">
     <a href="{% url 'timerboard:view' %}" class="btn btn-secondary">{% translate "Back" %}</a>
 </div>
diff --git a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
index be01c3e7..808aa7e6 100644
--- a/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
+++ b/allianceauth/timerboard/templates/timerboard/timer_confirm_delete.html
@@ -12,13 +12,13 @@
 
 {% block content %}
     <div>
-        <h1 class="page-header text-center mb-3">
-            {% translate "Delete Timer" %}
-            {% include "timerboard/index_button.html" %}
-        </h1>
+        {% translate "Delete Timer" as page_header %}
+        {% include "framework/header/page-header.html" with title=page_header %}
+
+        {% include "timerboard/index_button.html" %}
 
         <div class="row justify-content-center">
-            <div class="col-md-2">
+            <div class="col-md-4">
                 <div class="row">
                     <form action="" method="post">
                         {% csrf_token %}