diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index ea6a3b60d..9d4be9d7e 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -122,33 +122,35 @@
                     <a href="https://www.rfc-editor.org/" class="p-3">RFC&nbsp;Editor</a>
                     <a href="https://www.iana.org/" class="p-3">IANA</a>
                     <a href="https://www.ietf.org/privacy-statement/" class="p-3">Privacy&nbsp;Statement</a>
-                    <div class="small text-muted p-3">
+                    <div class="small text-muted py-3">
                         {% if version_num %}
-                            <a href="/release/about">About</a>
-                            <a href="https://github.com/ietf-tools/datatracker/">IETF Datatracker</a>
-                            {% if server_mode and server_mode == "production" %}
-                                <a href="https://github.com/ietf-tools/datatracker/releases/tag/{{version_num}}">Version {{ version_num }}{% if patch %}{{patch}}{% endif %}</a>
-                            {% else %}
+                            <a class="mx-2" href="/release/about">About IETF Datatracker</a>
+                            <span class="mx-2">
+                                {% if server_mode and server_mode == "production" %}
+                                    <a href="https://github.com/ietf-tools/datatracker/releases/tag/{{version_num}}">
+                                {% endif %}
                                 Version {{ version_num }}{% if patch %}{{patch}}{% endif %}
-                            {% endif %}
-                            {% if branch %}({{ branch }} - {{ git_hash|slice:":7" }}){% endif %}
+                                {% if branch %}({{ branch }} - {{ git_hash|slice:":7" }}){% endif %}
+                                {% if server_mode and server_mode == "production" %}
+                                    </a>
+                                {% endif %}
+                            </span>
                         {% endif %}
-                        Report a bug:
-                        <a href="https://github.com/ietf-tools/datatracker/issues/new/choose">
-                            GitHub
+                        <span class="mx-2 text-danger">
                             <i class="bi bi-bug"></i>
-                        </a>
-                        {% if bugreport_email %}
-                            <a href="mailto:{{ bugreport_email }}">
-                                Email
-                                <i class="bi bi-envelope"></i>
-                            </a>
+                            Report a bug:
+                            <a class="text-reset" href="https://github.com/ietf-tools/datatracker/issues/new/choose">GitHub</a>
+                            {% if bugreport_email %}
+                                <a class="text-reset" href="mailto:{{ bugreport_email }}">Email</a>
+                            {% endif %}
+                        </span>
+                        {% if server_mode and server_mode != "production" %}
+                            <br>
+                            {% if python_version %}Python {{ python_version }}{% endif %}
+                            {% if django_version %}Django {{ django_version }}{% endif %}
+                            <br>
+                            {% include "debug.html" %}
                         {% endif %}
-                        <br>
-                        {% if python_version %}Python {{ python_version }}{% endif %}
-                        {% if django_version %}Django {{ django_version }}{% endif %}
-                        <br>
-                        {% include "debug.html" %}
                     </div>
                 </footer>
             {% endblock %}
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
index 347f5b87d..33a1cda0a 100644
--- a/ietf/templates/base/menu.html
+++ b/ietf/templates/base/menu.html
@@ -407,7 +407,7 @@
         </li>
     {% endif %}
     <li>
-        <a class="dropdown-item {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
+        <a class="dropdown-item text-danger {% if flavor != 'top' %}text-wrap link-primary{% endif %}"
            href="https://github.com/ietf-tools/datatracker/issues/new/choose">
             <i class="bi bi-bug">
             </i>