diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index 5b38500d..750d0284 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -1,16 +1,25 @@
-{% extends "allianceauth/base.html" %}
+{% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "SRP Fleet Create" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "SRP Fleet Create" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Ship Replacement Program" %}
+{% endblock header_nav_brand %}
+
 {% block extra_css %}
     {% include 'bundles/jquery-datetimepicker-css.html' %}
 {% endblock extra_css %}
 
 {% block content %}
-
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Create SRP Fleet" %}</h1>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "Create SRP Fleet" %}
+        </h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -35,7 +44,6 @@
             </div>
         </div>
     </div>
-
 {% endblock content %}
 
 {% block extra_javascript %}
@@ -45,11 +53,6 @@
 {% block extra_script %}
     $('#id_fleet_time').datetimepicker({
         setlocale: '{{ LANGUAGE_CODE }}',
-        {% if NIGHT_MODE %}
-            theme: 'dark',
-        {% else %}
-            theme: 'default',
-        {% endif %}
         mask: true,
         format: 'Y-m-d H:i',
         minDate: 0
diff --git a/allianceauth/srp/templates/srp/data.html b/allianceauth/srp/templates/srp/data.html
index 34aeb5c1..1de91772 100644
--- a/allianceauth/srp/templates/srp/data.html
+++ b/allianceauth/srp/templates/srp/data.html
@@ -1,140 +1,148 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
-
 {% load humanize %}
-{% block page_title %}{% translate "Srp Fleet Data" %}{% endblock page_title %}
-{% block content %}
-    <div class="col-lg-12">
-        <div class="row">
-            <h1 class="page-header text-center">{% translate "SRP Fleet Data" %}
-                <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 %}
-                    {% endif %}
-                </div>
-            </h1>
 
-            {% if srpfleetrequests %}
-                <form method="POST">
-                    {% csrf_token %}
-                    <div class="alert alert-info" role="alert">
-                        <div class="text-end">
-                            <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                            <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
-                            {% if perms.auth.srp_management %}
-                                <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
-                                    <span class="glyphicon glyphicon-ok"></span>
-                                </button>
-                                <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
-                                    <span class="glyphicon glyphicon-remove"></span>
-                                </button>
-                                <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
-                                    <span class="glyphicon glyphicon-trash"></span>
-                                </button>
-                            {% endif %}
-                        </div>
+{% block page_title %}
+    {% translate "SRP Fleet Data" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Ship Replacement Program" %}
+{% endblock header_nav_brand %}
+
+{% block content %}
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "SRP Fleet Data" %}
+
+            <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 %}
+                {% endif %}
+            </div>
+        </h1>
+
+        {% if srpfleetrequests %}
+            <form method="POST">
+                {% csrf_token %}
+                <div class="alert alert-info" role="alert">
+                    <div class="text-end">
+                        <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                        <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                        {% if perms.auth.srp_management %}
+                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
+                                <span class="glyphicon glyphicon-ok"></span>
+                            </button>
+                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </button>
+                            <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
+                        {% endif %}
                     </div>
-                    <div class="table-responsive">
-                        <table class="table srplist">
-                            <thead>
-                                <th class="text-center">{% translate "Pilot Name" %}</th>
-                                <th class="text-center">{% translate "Killboard Link" %}</th>
-                                <th class="text-center">{% translate "Additional Info" %}</th>
-                                <th class="text-center">{% translate "Ship Type" %}</th>
-                                <th class="text-center">{% translate "Killboard Loss Amt" %}</th>
-                                <th class="text-center">{% translate "SRP ISK Cost" %}
-                                <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="{% blocktranslate trimmed %}Click value to edit
+                </div>
+                <div class="table-responsive">
+                    <table class="table srplist">
+                        <thead>
+                            <th class="text-center">{% translate "Pilot Name" %}</th>
+                            <th class="text-center">{% translate "Killboard Link" %}</th>
+                            <th class="text-center">{% translate "Additional Info" %}</th>
+                            <th class="text-center">{% translate "Ship Type" %}</th>
+                            <th class="text-center">{% translate "Killboard Loss Amt" %}</th>
+                            <th class="text-center">{% translate "SRP ISK Cost" %}
+                            <i class="glyphicon glyphicon-question-sign" rel="tooltip" title="{% blocktranslate trimmed %}Click value to edit
 Enter to save & next
 ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
-                                <th class="text-center">{% translate "Post Time" %}</th>
-                                <th class="text-center">{% translate "Status" %}</th>
-                                {% if perms.auth.srp_management %}
-                                    <th class="text-center">{% translate "Actions" %}</th>
-                                {% endif %}
-                            </thead>
-
-                            <tbody>
-                            {% for srpfleetrequest in srpfleetrequests %}
-                                <tr>
-                                    <td class="text-center">
-                                        {% if srpfleetrequest.character.alliance.alliance_ticker %}
-                                            {{ srpfleetrequest.character.alliance.alliance_ticker }}
-                                        {% endif %}
-                                        [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
-                                        {{ srpfleetrequest.character.character_name }}&nbsp;<i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
-                                    </td>
-                                    <td class="text-center">
-                                        <a href="{{ srpfleetrequest.killboard_link }}"
-                                        target="_blank" class="badge bg-warning">{% translate "Link" %}</a>
-                                    </td>
-                                    <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
-                                    <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
-                                    <td class="text-center" data-sort="{{ srpfleetrequest.kb_total_loss }}">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
-                                    <td class="srp text-center" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" data-sort="{{ srpfleetrequest.srp_total_amount }}">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
-                                    <td class="text-center" data-sort="{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}">{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }}</td>
-                                    <td class="text-center">
-                                        {% if srpfleetrequest.srp_status == "Approved" %}
-                                            <div class="badge bg-success">
-                                                {% translate "Approved" %}
-                                            </div>
-                                        {% elif srpfleetrequest.srp_status == "Rejected" %}
-                                            <div class="badge bg-danger">
-                                                {% translate "Rejected" %}
-                                            </div>
-                                        {% else %}
-                                            <div class="badge bg-warning">
-                                                {% translate "Pending" %}
-                                            </div>
-                                        {% endif %}
-                                    </td>
-                                    {% if perms.auth.srp_management %}
-                                        <td class="text-center">
-                                            <div class="checkbox">
-                                                <label style="font-size: 1.5em">
-                                                    <input type="checkbox" name="{{srpfleetrequest.id}}">
-                                                    <span class="cr"><i class="cr-icon fas fa-check"></i></span>
-                                                </label>
-                                            </div>
-                                        </td>
-                                    {% endif %}
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-
-                        </table>
-                    </div>
-                    <div class="alert alert-info" role="alert">
-                        <div class="text-end">
-                            <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
-                            <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                            <th class="text-center">{% translate "Post Time" %}</th>
+                            <th class="text-center">{% translate "Status" %}</th>
                             {% if perms.auth.srp_management %}
-                                <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
-                                    <span class="glyphicon glyphicon-ok"></span>
-                                </button>
-                                <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
-                                    <span class="glyphicon glyphicon-remove"></span>
-                                </button>
-                                <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
-                                    <span class="glyphicon glyphicon-trash"></span>
-                                </button>
+                                <th class="text-center">{% translate "Actions" %}</th>
                             {% endif %}
-                        </div>
-                    </div>
-                </form>
-            {% else %}
-                <div class="alert alert-warning text-center">
-                    {% translate "No SRP requests for this fleet." %}
+                        </thead>
+
+                        <tbody>
+                        {% for srpfleetrequest in srpfleetrequests %}
+                            <tr>
+                                <td class="text-center">
+                                    {% if srpfleetrequest.character.alliance.alliance_ticker %}
+                                        {{ srpfleetrequest.character.alliance.alliance_ticker }}
+                                    {% endif %}
+                                    [{{ srpfleetrequest.character.corporation.corporation_ticker }}]
+                                    {{ srpfleetrequest.character.character_name }}&nbsp;<i class="copy-text-fa-icon far fa-copy" data-clipboard-text="{{ srpfleetrequest.character.character_name }}"></i>
+                                </td>
+                                <td class="text-center">
+                                    <a href="{{ srpfleetrequest.killboard_link }}"
+                                    target="_blank" class="badge bg-warning">{% translate "Link" %}</a>
+                                </td>
+                                <td class="text-center">{{ srpfleetrequest.additional_info }}</td>
+                                <td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
+                                <td class="text-center" data-sort="{{ srpfleetrequest.kb_total_loss }}">{{ srpfleetrequest.kb_total_loss | intcomma }} ISK</td>
+                                <td class="srp text-center" data-name="srp_total_amount" data-type="number" data-pk="{{srpfleetrequest.id}}" data-url="{% url 'srp:request_update_amount' srpfleetrequest.id %}" data-params="{csrfmiddlewaretoken:'{{csrf_token}}'}" data-sort="{{ srpfleetrequest.srp_total_amount }}">{{ srpfleetrequest.srp_total_amount | intcomma }} ISK</td>
+                                <td class="text-center" data-sort="{{ srpfleetrequest.post_time | date:"Y-m-d H:i" }}">{{ srpfleetrequest.post_time | date:"Y-M-d H:i" }}</td>
+                                <td class="text-center">
+                                    {% if srpfleetrequest.srp_status == "Approved" %}
+                                        <div class="badge bg-success">
+                                            {% translate "Approved" %}
+                                        </div>
+                                    {% elif srpfleetrequest.srp_status == "Rejected" %}
+                                        <div class="badge bg-danger">
+                                            {% translate "Rejected" %}
+                                        </div>
+                                    {% else %}
+                                        <div class="badge bg-warning">
+                                            {% translate "Pending" %}
+                                        </div>
+                                    {% endif %}
+                                </td>
+                                {% if perms.auth.srp_management %}
+                                    <td class="text-center">
+                                        <div class="checkbox">
+                                            <label style="font-size: 1.5em">
+                                                <input type="checkbox" name="{{srpfleetrequest.id}}">
+                                                <span class="cr"><i class="cr-icon fas fa-check"></i></span>
+                                            </label>
+                                        </div>
+                                    </td>
+                                {% endif %}
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+
+                    </table>
                 </div>
-            {% endif %}
-        </div>
+                <div class="alert alert-info" role="alert">
+                    <div class="text-end">
+                        <b><span style="padding-right:2.5em">{% translate "Total Losses:" %} {{ srpfleetrequests.count }}</span></b>
+                        <b><span style="padding-right:2.5em">{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</span></b>
+                        {% if perms.auth.srp_management %}
+                            <button type="submit" title="Approve" class="btn btn-success" formaction="{% url 'srp:request_approve' %}">
+                                <span class="glyphicon glyphicon-ok"></span>
+                            </button>
+                            <button type="submit" title="Reject" class="btn btn-warning" formaction="{% url 'srp:request_reject' %}">
+                                <span class="glyphicon glyphicon-remove"></span>
+                            </button>
+                            <button type="submit" title="Remove" onclick="return confirm('{% translate "Are you sure you want to delete SRP requests?" %}')" class="btn btn-danger" formaction="{% url 'srp:request_remove' %}">
+                                <span class="glyphicon glyphicon-trash"></span>
+                            </button>
+                        {% endif %}
+                    </div>
+                </div>
+            </form>
+        {% else %}
+            <div class="alert alert-warning text-center">
+                {% translate "No SRP requests for this fleet." %}
+            </div>
+        {% endif %}
     </div>
 {% endblock content %}
 
@@ -147,16 +155,16 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
     <script>
         const clipboard = new ClipboardJS('.copy-text-fa-icon');
         clipboard.on('success', function (e) {
-        console.info('Action:', e.action);
-        console.info('Text:', e.text);
-        console.info('Trigger:', e.trigger);
+            console.info('Action:', e.action);
+            console.info('Text:', e.text);
+            console.info('Trigger:', e.trigger);
 
-        e.clearSelection();
+            e.clearSelection();
         });
 
         clipboard.on('error', function (e) {
-        console.error('Action:', e.action);
-        console.error('Trigger:', e.trigger);
+            console.error('Action:', e.action);
+            console.error('Trigger:', e.trigger);
         });
     </script>
 {% endblock extra_javascript %}
@@ -237,6 +245,7 @@ ESC to cancel{% endblocktranslate %}" id="blah"></i></th>
     {% include "bundles/datatables-css-bs5.html" %}
     {% include "bundles/x-editable.css.html" %}
     {% include "bundles/checkbox-css.html" %}
+
     <style>
         .copy-text-fa-icon:hover {
             cursor: pointer;
diff --git a/allianceauth/srp/templates/srp/management.html b/allianceauth/srp/templates/srp/management.html
index ff660562..7defdb8a 100644
--- a/allianceauth/srp/templates/srp/management.html
+++ b/allianceauth/srp/templates/srp/management.html
@@ -1,128 +1,132 @@
 {% extends "allianceauth/base-bs5.html" %}
-{% load i18n %}
 
+{% load i18n %}
 {% load humanize %}
 
-{% block page_title %}{% translate "Srp Management" %}{% endblock page_title %}
-{% block extra_css %}{% endblock extra_css %}
+{% block page_title %}
+    {% translate "SRP Management" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Ship Replacement Program" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-    <div class="col-lg-12">
-        <div class="row">
-            <h1 class="page-header text-center">{% translate "SRP Management" %}
-                <div class="text-end">
-                    {% if perms.auth.srp_management %}
-                        <a href="{% url 'srp:all' %}" class="btn btn-primary">
-                            {% translate "View All" %}
-                        </a>
-                    {% endif %}
-                    {% if perms.srp.add_srpfleetmain or perms.auth.srp_management %}
-                        <a href="{% url 'srp:add' %}" class="btn btn-success">
-                            {% translate "Add SRP Fleet" %}
-                        </a>
-                    {% endif %}
-                </div>
-            </h1>
-            <div class="alert alert-info" role="alert">
-                <div class="text-end">
-                    <b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
-                </div>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "SRP Management" %}
+
+            <div class="text-end">
+                {% if perms.auth.srp_management %}
+                    <a href="{% url 'srp:all' %}" class="btn btn-primary">
+                        {% translate "View All" %}
+                    </a>
+                {% endif %}
+                {% if perms.srp.add_srpfleetmain or perms.auth.srp_management %}
+                    <a href="{% url 'srp:add' %}" class="btn btn-success">
+                        {% translate "Add SRP Fleet" %}
+                    </a>
+                {% endif %}
             </div>
-            {% if srpfleets %}
-                <div class="table-responsive">
-                    <table class="table">
+        </h1>
+        <div class="alert alert-info" role="alert">
+            <div class="text-end">
+                <b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
+            </div>
+        </div>
+        {% if srpfleets %}
+            <div class="table-responsive">
+                <table class="table">
+                    <tr>
+                        <th class="text-center">{% translate "Fleet Name" %}</th>
+                        <th class="text-center">{% translate "Fleet Time" %}</th>
+                        <th class="text-center">{% translate "Fleet Doctrine" %}</th>
+                        <th class="text-center">{% translate "Fleet Commander" %}</th>
+                        <th class="text-center">{% translate "Fleet AAR" %}</th>
+                        <th class="text-center">{% translate "Fleet SRP Code" %}</th>
+                        <th class="text-center">{% translate "Fleet ISK Cost" %}</th>
+                        <th class="text-center">{% translate "SRP Status" %}</th>
+                        <th class="text-center">{% translate "Pending Requests" %}</th>
+                        <th class="text-center" style="width: 100px;">{% translate "Actions" %}</th>
+                    </tr>
+                    {% for srpfleet in srpfleets %}
                         <tr>
-                            <th class="text-center">{% translate "Fleet Name" %}</th>
-                            <th class="text-center">{% translate "Fleet Time" %}</th>
-                            <th class="text-center">{% translate "Fleet Doctrine" %}</th>
-                            <th class="text-center">{% translate "Fleet Commander" %}</th>
-                            <th class="text-center">{% translate "Fleet AAR" %}</th>
-                            <th class="text-center">{% translate "Fleet SRP Code" %}</th>
-                            <th class="text-center">{% translate "Fleet ISK Cost" %}</th>
-                            <th class="text-center">{% translate "SRP Status" %}</th>
-                            <th class="text-center">{% translate "Pending Requests" %}</th>
-                            <th class="text-center" style="width: 100px;">{% translate "Actions" %}</th>
-                        </tr>
-                        {% for srpfleet in srpfleets %}
-                            <tr>
-                                <td class="text-center">
-                                    <div class="badge bg-info">
-                                        {{ srpfleet.fleet_name }}
+                            <td class="text-center">
+                                <div class="badge bg-info">
+                                    {{ srpfleet.fleet_name }}
+                                </div>
+                            </td>
+                            <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
+                            <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
+                            <td class="text-center">
+                                <div class="badge bg-success">
+                                    {{ srpfleet.fleet_commander.character_name }}
+                                </div>
+                            </td>
+                            <td class="text-center">
+                                {% if srpfleet.fleet_srp_aar_link %}
+                                    <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge bg-primary">{% translate "Link" %}</a>
+                                {% endif %}
+                            </td>
+                            <td class="text-center">
+                                {% if srpfleet.fleet_srp_code %}
+                                    <a class="badge bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
+                                {% else %}
+                                    <div class="badge bg-danger">
+                                        {% translate "Disabled" %}
                                     </div>
-                                </td>
-                                <td class="text-center">{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
-                                <td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
-                                <td class="text-center">
+                                {% endif %}
+                            </td>
+                            <td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
+
+                            <td class="text-center">
+                                {% if srpfleet.fleet_srp_status == "" %}
+                                    <div class="badge bg-warning">
+                                        {% translate "Pending" %}
+                                    </div>
+                                {% else %}
                                     <div class="badge bg-success">
-                                        {{ srpfleet.fleet_commander.character_name }}
+                                        {% translate "Completed" %}
                                     </div>
-                                </td>
-                                <td class="text-center">
-                                    {% if srpfleet.fleet_srp_aar_link %}
-                                        <a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="badge bg-primary">{% translate "Link" %}</a>
-                                    {% endif %}
-                                </td>
-                                <td class="text-center">
-                                    {% if srpfleet.fleet_srp_code %}
-                                        <a class="badge bg-warning" href="{% url 'srp:request' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
-                                    {% else %}
-                                        <div class="badge bg-danger">
-                                            {% translate "Disabled" %}
-                                        </div>
-                                    {% endif %}
-                                </td>
-                                <td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
+                                {% endif %}
+                            </td>
+                            <td class="text-center">
+                                <div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
+                            </td>
+                            <td class="text-center">
 
-                                <td class="text-center">
-                                    {% if srpfleet.fleet_srp_status == "" %}
-                                        <div class="badge bg-warning">
-                                            {% translate "Pending" %}
-                                        </div>
-                                    {% else %}
-                                        <div class="badge bg-success">
-                                            {% translate "Completed" %}
-                                        </div>
-                                    {% endif %}
-                                </td>
-                                <td class="text-center">
-                                    <div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
-                                </td>
-                                <td class="text-center">
+                                <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
+                                    <span class="glyphicon glyphicon-eye-open"></span>
+                                </a>
 
-                                    <a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary" title="View">
-                                        <span class="glyphicon glyphicon-eye-open"></span>
+                                {% if perms.auth.srp_management %}
+                                    <a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
+                                        <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
 
-                                    {% if perms.auth.srp_management %}
-                                        <a href="{% url 'srp:edit' srpfleet.id %}" class="btn btn-info" title="Edit">
-                                            <span class="glyphicon glyphicon-pencil"></span>
+                                    <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% translate "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
+                                        <span class="glyphicon glyphicon-trash"></span>
+                                    </a>
+                                    {% if srpfleet.fleet_srp_code %}
+                                        <a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
+                                            <span class="glyphicon glyphicon-remove-sign"></span>
                                         </a>
-
-                                        <a href="{% url 'srp:remove' srpfleet.id %}" onclick="return confirm('{% translate "Are you sure you want to delete this SRP code and its contents?" %}')" class="btn btn-danger" title="Remove">
-                                            <span class="glyphicon glyphicon-trash"></span>
+                                    {% else %}
+                                        <a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
+                                            <span class="glyphicon glyphicon-ok-sign"></span>
                                         </a>
-                                        {% if srpfleet.fleet_srp_code %}
-                                            <a href="{% url 'srp:disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
-                                                <span class="glyphicon glyphicon-remove-sign"></span>
-                                            </a>
-                                        {% else %}
-                                            <a href="{% url 'srp:enable' srpfleet.id %}" class="btn btn-success" title="Enable">
-                                                <span class="glyphicon glyphicon-ok-sign"></span>
-                                            </a>
-                                        {% endif %}
-
                                     {% endif %}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </div>
-            {% else %}
-                <div class="alert alert-warning text-center">
-                    {% translate "No SRP fleets created." %}
-                </div>
-            {% endif %}
-        </div>
-    </div>
 
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        {% else %}
+            <div class="alert alert-warning text-center">
+                {% translate "No SRP fleets created." %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock content %}
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index 9cfd6117..80c8a086 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -1,13 +1,21 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "SRP Request" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "SRP Request" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Ship Replacement Program" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Create SRP Request" %}</h1>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "Create SRP Request" %}
+        </h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -22,7 +30,5 @@
                 </div>
             </div>
         </div>
-
     </div>
-
 {% endblock content %}
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index dfb2af7b..a4a0bff0 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -1,13 +1,21 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load bootstrap %}
 {% load i18n %}
 
-{% block page_title %}{% translate "Update AAR Link" %}{% endblock page_title %}
+{% block page_title %}
+    {% translate "Update AAR Link" %}
+{% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Ship Replacement Program" %}
+{% endblock header_nav_brand %}
 
 {% block content %}
-
-    <div class="col-lg-12">
-        <h1 class="page-header text-center">{% translate "Update AAR Link" %}</h1>
+    <div>
+        <h1 class="page-header text-center mb-3">
+            {% translate "Update AAR Link" %}
+        </h1>
 
         <div class="container-fluid">
             <div class="col-md-4 col-md-offset-4">
@@ -27,5 +35,4 @@
             </div>
         </div>
     </div>
-
 {% endblock content %}