diff --git a/allianceauth/templates/allianceauth/base.html b/allianceauth/templates/allianceauth/base.html
index 2becf3c2..f1142c08 100644
--- a/allianceauth/templates/allianceauth/base.html
+++ b/allianceauth/templates/allianceauth/base.html
@@ -21,33 +21,39 @@
     </head>
 
     <body class="{% if NIGHT_MODE %}template-dark-mode{% else %}template-light-mode{% endif %}">
-        {% if user.is_authenticated %}
-            <div id="wrapper" class="container">
-                <!-- Navigation -->
-                {% include 'allianceauth/top-menu.html' %}
-                <div class="row" id="site-body-wrapper">
+        <div id="wrapper" class="container">
+            <!-- Navigation -->
+            {% include 'allianceauth/top-menu.html' %}
+
+            <div class="clearfix{% if user.is_authenticated %} row{% endif %}" id="site-body-wrapper">
+                {% if user.is_authenticated %}
                     {% include 'allianceauth/side-menu.html' %}
-                    <div class="col-sm-10">
+                {% endif %}
+
+                <div class="{% if user.is_authenticated %}col-sm-10{% else %}col-sm-12{% endif %}">
+                    {% if user.is_authenticated %}
                         {% include 'allianceauth/messages.html' %}
-                        {% block content %}
-                        {% endblock content %}
-                    </div>
-                    <div class="clearfix"></div>
+                    {% endif %}
+
+                    {% block content %}
+                    {% endblock content %}
                 </div>
             </div>
-        {% endif %}
+        </div>
 
         {% include 'bundles/bootstrap-js.html' %}
         {% include 'bundles/jquery-visibility-js.html' %}
 
-        <script>
-            let notificationUPdateSettings = {
-                notificationsListViewUrl: "{% url 'notifications:list' %}",
-                notificationsRefreshTime: "{% notifications_refresh_time %}",
-                userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}"
-            };
-        </script>
-        {% include 'bundles/refresh-notifications-js.html' %}
+        {% if user.is_authenticated %}
+            <script>
+                let notificationUPdateSettings = {
+                    notificationsListViewUrl: "{% url 'notifications:list' %}",
+                    notificationsRefreshTime: "{% notifications_refresh_time %}",
+                    userNotificationsCountViewUrl: "{% url 'notifications:user_notifications_count' request.user.pk %}"
+                };
+            </script>
+            {% include 'bundles/refresh-notifications-js.html' %}
+        {% endif %}
         {% include 'bundles/evetime-js.html' %}
 
         {% block extra_javascript %}
