diff --git a/allianceauth/corputils/templates/corputils/base.html b/allianceauth/corputils/templates/corputils/base.html
index 1656ad26..530d3057 100644
--- a/allianceauth/corputils/templates/corputils/base.html
+++ b/allianceauth/corputils/templates/corputils/base.html
@@ -10,65 +10,53 @@
     {% translate "Corporation Member Data" %}
 {% endblock header_nav_brand %}
 
+{% block header_nav_collapse_left %}
+    <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 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>
+{% endblock %}
+
+{% block header_nav_collapse_right %}
+    <li class="nav-item">
+        <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 %}"
+                >
+            </div>
+        </form>
+    </li>
+{% endblock %}
+
 {% block content %}
     <div>
-        <nav class="navbar navbar-default navbar-expand-lg mb-4">
-            <div class="container-fluid">
-                <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 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>
-                </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 %}"
-                        >
-                    </div>
-                </form>
-            </div>
-        </nav>
-
         {% block member_data %}
         {% endblock member_data %}
     </div>
diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html
index 393d58cc..4fb18861 100644
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -97,8 +97,8 @@
                                 <table class="table table-hover" id="table-mains">
                                     <thead>
                                         <tr>
-                                            <th style="min-height: 1rem;"><!-- Must have a text or height to prevent clipping --></th>
-                                            <th></th>
+                                            <th>{% translate "Main character" %}</th>
+                                            <th>{% translate "Registered characters" %}</th>
                                         </tr>
                                     </thead>
 
@@ -113,9 +113,10 @@
                                                         </div>
                                                     </div>
                                                 </td>
+
                                                 <td>
                                                     <table class="table table-hover">
-                                                        {% for alt in main.alts %}
+                                                        {% for alt in main.alts|dictsort:"character_name" %}
                                                             {% if forloop.first %}
                                                                 <tr>
                                                                     <th></th>
@@ -125,6 +126,7 @@
                                                                     <th></th>
                                                                 </tr>
                                                             {% endif %}
+
                                                             <tr>
                                                                 <td style="width: 5%;">
                                                                     <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
@@ -133,7 +135,7 @@
                                                                 </td>
                                                                 <td style="width: 30%;">{{ alt.character_name }}</td>
                                                                 <td style="width: 30%;">{{ alt.corporation_name }}</td>
-                                                                <td style="width: 30%;">{{ alt.alliance_name }}</td>
+                                                                <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
                                                                 <td style="width: 5%;">
                                                                     <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
                                                                         {% translate "Killboard" %}
@@ -176,11 +178,12 @@
                                                 </td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
                                                 <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
-                                                <td>{{ member.character_ownership.user.profile.main_character.alliance_name }}</td>
+                                                <td>{{ member.character_ownership.user.profile.main_character.alliance_name|default_if_none:""  }}</td>
                                             </tr>
                                         {% endfor %}
+
                                         {% for member in unregistered %}
-                                            <tr class="danger">
+                                            <tr class="table-danger">
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
@@ -211,7 +214,7 @@
 
                                     <tbody>
                                         {% for member in unregistered %}
-                                            <tr class="danger">
+                                            <tr class="table-danger">
                                                 <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
                                                 <td>{{ member.character_name }}</td>
                                                 <td>
diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
index e391b581..a4918416 100644
--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -55,27 +55,35 @@
                         </a>
                     {% endif %}
 
-                    <div class="navbar-brand">{% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}</div>
+                    <div class="navbar-brand">
+                        {% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}
+                    </div>
 
-                        <div class="collapse navbar-collapse" id="navbarexpand">
-                            <div class="m-2"></div>
+                    <div class="collapse navbar-collapse" id="navbarexpand">
+                        <div class="m-2"></div>
 
-                            <ul id="nav-left" class="navbar-nav nav me-auto">
-                                {% block header_nav_collapse_left %}
-                                {% endblock %}
-                            </ul>
+                        <ul id="nav-left" class="navbar-nav nav me-auto">
+                            {% block header_nav_collapse_left %}
+                            {% endblock %}
+                        </ul>
 
-                            <ul id="nav-right" class="navbar-nav">
-                                {% block header_nav_collapse_right %} <!-- Default to add char and swap main -->
-                                    {% include 'allianceauth/top-menu-rh-default.html' %}
-                                {% endblock %}
-                                {% include 'menu/menu-notification-block.html' %}
-                            </ul>
-                        </div>
+                        <ul id="nav-right" class="navbar-nav">
+                            {% block header_nav_collapse_right %}
+                            {% endblock %}
+                        </ul>
 
-                        <a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
-                            <i class="fa-solid fa-chevron-up"></i>
-                        </a>
+                        <ul id="nav-right-character-control" class="navbar-nav">
+                            {% block header_nav_user_character_control %} <!-- Default to add char and swap main -->
+                                {% include 'allianceauth/top-menu-rh-default.html' %}
+                            {% endblock %}
+
+                            {% include 'menu/menu-notification-block.html' %}
+                        </ul>
+                    </div>
+
+                    <a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
+                        <i class="fa-solid fa-chevron-up"></i>
+                    </a>
                 </div>
             </nav>
         {% endif %}