diff --git a/physics/templates/physics/partials/exam_take_fragment.html b/physics/templates/physics/partials/exam_take_fragment.html
index 7999b40e..dc8626b3 100644
--- a/physics/templates/physics/partials/exam_take_fragment.html
+++ b/physics/templates/physics/partials/exam_take_fragment.html
@@ -1,6 +1,5 @@
 <div class="exam-question-fragment">
     <!-- Flag button lives inside the fragment so it updates together with other question controls -->
-    {% include 'physics/partials/exam_flag_button.html' %}
     <form method="POST" class="post-form"
           hx-post="{% if cid %}{% url 'physics:exam_take' pk=exam.pk sk=pos cid=cid passcode=passcode %}{% else %}{% url 'physics:exam_take_user' pk=exam.pk sk=pos %}{% endif %}"
           hx-target="#question-fragment" hx-swap="innerHTML">
@@ -57,28 +56,36 @@
         </div>
 
         <div class="mt-2">
-            {% if previous > -1 %}
-                <button type="submit" name="previous" class="save btn btn-secondary" title="Click to save your answer(s) and go to the previous question" onclick="try{ window.currentQuestionPos = {{ previous }}; if(typeof updateQuestionMenu==='function') updateQuestionMenu(); }catch(e){}">Previous</button>
-            {% endif %}
+            <div class="d-flex align-items-center justify-content-between">
+                <div class="btn-row">
+                    {% if previous > -1 %}
+                        <button type="submit" name="previous" class="save btn btn-secondary" title="Click to save your answer(s) and go to the previous question" onclick="try{ window.currentQuestionPos = {{ previous }}; if(typeof updateQuestionMenu==='function') updateQuestionMenu(); }catch(e){}">Previous</button>
+                    {% endif %}
 
-            {% if next %}
-                <button type="submit" name="next" class="save btn btn-secondary" title="Click to save your answer(s) and go to the next question" onclick="try{ window.currentQuestionPos = {{ pos|add:1 }}; if(typeof updateQuestionMenu==='function') updateQuestionMenu(); }catch(e){}">Next</button>
-                    <!-- Skip: load the next question fragment without submitting the form -->
-                <button type="button" id="skip-button" class="btn btn-outline-secondary ms-2" title="Skip to next question without saving"
-                        hx-get="{% if cid %}{% url 'physics:exam_take_fragment' pk=exam.pk sk=pos|add:1 cid=cid passcode=passcode %}{% else %}{% url 'physics:exam_take_fragment_user' pk=exam.pk sk=pos|add:1 %}{% endif %}"
-                        hx-target="#question-fragment" hx-swap="innerHTML">Skip</button>
+                    {% if next %}
+                        <button type="submit" name="next" class="save btn btn-secondary" title="Click to save your answer(s) and go to the next question" onclick="try{ window.currentQuestionPos = {{ pos|add:1 }}; if(typeof updateQuestionMenu==='function') updateQuestionMenu(); }catch(e){}">Next</button>
+                            <!-- Skip: load the next question fragment without submitting the form -->
+                        <button type="button" id="skip-button" class="btn btn-outline-secondary ms-2" title="Skip to next question without saving"
+                                hx-get="{% if cid %}{% url 'physics:exam_take_fragment' pk=exam.pk sk=pos|add:1 cid=cid passcode=passcode %}{% else %}{% url 'physics:exam_take_fragment_user' pk=exam.pk sk=pos|add:1 %}{% endif %}"
+                                hx-target="#question-fragment" hx-swap="innerHTML">Skip</button>
 
-                    <!-- Fallback link for non-HTMX clients: simple navigation without saving -->
-                <a class="d-none" href="{% if cid %}{% url 'physics:exam_take' pk=exam.pk sk=pos|add:1 cid=cid passcode=passcode %}{% else %}{% url 'physics:exam_take_user' pk=exam.pk sk=pos|add:1 %}{% endif %}"></a>
-            {% else %}
-                {% if not exam.publish_results %}
-                    <button type="submit" name="save" class="save btn btn-default" title="Click to save your current answer(s)">Save</button>
-                {% endif %}
-            {% endif %}
+                            <!-- Fallback link for non-HTMX clients: simple navigation without saving -->
+                        <a class="d-none" href="{% if cid %}{% url 'physics:exam_take' pk=exam.pk sk=pos|add:1 cid=cid passcode=passcode %}{% else %}{% url 'physics:exam_take_user' pk=exam.pk sk=pos|add:1 %}{% endif %}"></a>
+                    {% else %}
+                        {% if not exam.publish_results %}
+                            <button type="submit" name="save" class="save btn btn-default" title="Click to save your current answer(s)">Save</button>
+                        {% endif %}
+                    {% endif %}
 
-            <br />
-            <button type="submit" id="overview-button" name="finish" class="save btn btn-default" title="Click to go to the overview page (your answers will be saved).">Overview</button>
-            <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
+                    <br />
+                    <button type="submit" id="overview-button" name="finish" class="save btn btn-default" title="Click to go to the overview page (your answers will be saved).">Overview</button>
+                    <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
+                </div>
+
+                <div class="flag-container ms-3">
+                    {% include 'physics/partials/exam_flag_button.html' %}
+                </div>
+            </div>
         </div>
     </form>