diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html
index 43f3170a..1656ad26 100644
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@@ -1,34 +1,69 @@
 {% extends "allianceauth/base-bs5.html" %}
+
 {% load i18n %}
+
 {% block page_title %}
     {% translate "Corporation Member Data" %}
 {% endblock page_title %}
+
+{% block header_nav_brand %}
+    {% translate "Corporation Member Data" %}
+{% endblock header_nav_brand %}
+
 {% block content %}
     <div>
-        <h1 class="page-header text-center">{% translate "Corporation Member Data" %}</h1>
-        <nav class="navbar navbar-default">
+        <nav class="navbar navbar-default navbar-expand-lg mb-4">
             <div class="container-fluid">
-                <ul class="nav navbar-nav">
-                    <li class="dropdown">
-                        <a href="#" id="dLabel" class="dropdown-toggle" role="button" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">{% translate "Corporations" %}<span class="caret"></span></a>
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                <button
+                    class="navbar-toggler collapsed"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#fleetfinder-header-navbar"
+                    aria-controls="fleetfinder-header-navbar"
+                    aria-expanded="false"
+                    aria-label="{% translate 'Toggle navigation' %}"
+                >
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <ul class="navbar-nav">
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
+                            {% translate "Corporations" %}
+                        </a>
+
+                        <ul class="dropdown-menu">
                             {% for corpstat in available %}
                                 <li>
-                                    <a href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">{{ corpstat.corp.corporation_name }}</a>
+                                    <a class="dropdown-item" href="{% url 'corputils:view_corp' corpstat.corp.corporation_id %}">
+                                        {{ corpstat.corp.corporation_name }}
+                                    </a>
                                 </li>
                             {% endfor %}
+
+                            {% if perms.corputils.add_corpstats %}
+                                {% if available.count >= 1 %}
+                                    <li>&nbsp;</li>
+                                {% endif %}
+
+                                <li>
+                                    <a class="dropdown-item" href="{% url 'corputils:add' %}">
+                                        {% translate "Add corporation" %}
+                                    </a>
+                                </li>
+                            {% endif %}
                         </ul>
                     </li>
-                    {% if perms.corputils.add_corpstats %}
-                        <li>
-                            <a href="{% url 'corputils:add' %}">{% translate "Add" %}</a>
-                        </li>
-                    {% endif %}
                 </ul>
 
                 <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
                     <div class="form-group">
-                        <input type="text" class="form-control" name="search_string" placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}">
+                        <input
+                            type="text"
+                            class="form-control"
+                            name="search_string"
+                            placeholder="{% if search_string %}{{ search_string }}{% else %}{% translate 'Search all corporations...' %}{% endif %}"
+                        >
                     </div>
                 </form>
             </div>