diff --git a/anatomy/templates/anatomy/question_link_header.html b/anatomy/templates/anatomy/question_link_header.html
index aeb03c6e..4a66ef1e 100644
--- a/anatomy/templates/anatomy/question_link_header.html
+++ b/anatomy/templates/anatomy/question_link_header.html
@@ -1,28 +1,55 @@
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark mt-2 rounded">
+    <div class="container-fluid px-3">
+        <span class="navbar-text me-3 text-white">
+            <strong>Question:</strong>
+            {% if question.stem %}
+                {{ question.stem|striptags|truncatechars:80 }}
+            {% else %}
+                #{{ question.pk }}
+            {% endif %}
+        </span>
 
-    <div class="floating-header">
-        <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a>
-        <a href="{% url 'anatomy:question_clone' question.id %}" title="Clone the Question">Clone</a>
-        <a href="{% url 'anatomy:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
-        <a href="{% url 'anatomy:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
-        <a href="#"
-           onclick="return window.create_popup_window('{% url 'feedback_create' question_type='anatomy' pk=question.pk %}')">
-            Add Note</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#questionNav" aria-controls="questionNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
 
-        {% if request.user.is_superuser %}
-            <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}"
-               title="Edit the Question using the admin interface">Admin Edit</a>
-            <a href="{% url 'anatomy:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
-        {% endif %}
-        {% if exam %}
-            <div>
-
-                {% if previous > -1 %}
-                    <a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
+        <div class="collapse navbar-collapse" id="questionNav">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                {% if exam %}
+                    <li class="nav-item">
+                        {% if previous > -1 %}
+                            <a class="nav-link" href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous</a>
+                        {% endif %}
+                    </li>
+                    <li class="nav-item align-self-center">
+                        Viewing in exam: <a class="nav-link d-inline p-0" href="{% url 'anatomy:exam_overview' exam.id %}">{{ exam }}</a>
+                        <span class="navbar-text text-muted ms-2">[{{ pos }}/{{ exam_length }}]</span>
+                    </li>
+                    <li class="nav-item">
+                        {% if next %}
+                            <a class="nav-link" href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next</a>
+                        {% endif %}
+                    </li>
                 {% endif %}
-                Viewing question as part of exam: <a href="{% url 'anatomy:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
-                {% if next %}
-                    <a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
\ No newline at end of file
+            </ul>
+
+            <ul class="navbar-nav ms-auto">
+                <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" id="questionActions" role="button" data-bs-toggle="dropdown" aria-expanded="false">Actions</a>
+                    <ul class="dropdown-menu dropdown-menu-end dropdown-menu-dark" aria-labelledby="questionActions">
+                        <li><a class="dropdown-item" href="{% url 'anatomy:anatomy_question_update' question.id %}">Edit</a></li>
+                        <li><a class="dropdown-item" href="{% url 'anatomy:question_clone' question.id %}">Clone</a></li>
+                        <li><a class="dropdown-item" href="{% url 'anatomy:question_delete' pk=question.pk %}">Delete</a></li>
+                        <li><a class="dropdown-item" href="{% url 'anatomy:question_answer_update' pk=question.pk %}">Edit Answers</a></li>
+                        <li><a class="dropdown-item" href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='anatomy' pk=question.pk %}')">Add Note</a></li>
+                        {% if request.user.is_superuser %}
+                            <li><hr class="dropdown-divider"></li>
+                            <li><a class="dropdown-item" href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}">Admin Edit</a></li>
+                            <li><a class="dropdown-item" href="{% url 'anatomy:question_user_answers' question.id %}">User answers</a></li>
+                        {% endif %}
+                    </ul>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
\ No newline at end of file
diff --git a/atlas/templates/atlas/partials/_viewing_case_as_part_of_collection.html b/atlas/templates/atlas/partials/_viewing_case_as_part_of_collection.html
index 12c4d64e..e2c18e10 100644
--- a/atlas/templates/atlas/partials/_viewing_case_as_part_of_collection.html
+++ b/atlas/templates/atlas/partials/_viewing_case_as_part_of_collection.html
@@ -1,24 +1,24 @@
 
-    <div class="d-flex justify-content-between align-items-center mb-3">
+<div class="d-flex justify-content-between align-items-center mb-3">
+    <div>
+        {% if previous %}
+            <a class="btn btn-outline-secondary btn-sm" href="{% url nav_link_view collection.id case_number|add:-1 %}">&larr; Previous</a>
+        {% endif %}
+    </div>
+    <div class="text-center">
+        <div class="h6 mb-0">Viewing as part of a collection</div>
         <div>
-            {% if previous %}
-                <a class="btn btn-outline-secondary btn-sm" href="{% url nav_link_view collection.id case_number|add:-1 %}">&larr; Previous</a>
-            {% endif %}
-        </div>
-        <div class="text-center">
-            <div class="h6 mb-0">Viewing as part of a collection</div>
-            <div>
-                <a href="{% url 'atlas:collection_detail' collection.id %}" class="fw-bold">{{collection.name}}</a>
-                <small class="text-muted">[{{case_number|add:1}}/{{collection_length}}]</small>
-            </div>
-        </div>
-        <div>
-            {% if next %}
-                <a class="btn btn-outline-secondary btn-sm" href="{% url nav_link_view collection.id case_number|add:1 %}">Next &rarr;</a>
-            {% endif %}
+            <a href="{% url 'atlas:collection_detail' collection.id %}" class="fw-bold">{{collection.name}}</a>
+            <small class="text-muted">[{{case_number|add:1}}/{{collection_length}}]</small>
         </div>
+    </div>
+    <div>
+        {% if next %}
+            <a class="btn btn-outline-secondary btn-sm" href="{% url nav_link_view collection.id case_number|add:1 %}">Next &rarr;</a>
+        {% endif %}
+    </div>
 
-                <div class="mb-1">
-                    {% include "atlas/collection_detail.html#casedetails-management-links" %}
-                </div>
-    </div>
\ No newline at end of file
+    <div class="mb-1">
+        {% include "atlas/collection_detail.html#casedetails-management-links" %}
+    </div>
+</div>
\ No newline at end of file