diff --git a/anatomy/templates/anatomy/exam_scores_user.html b/anatomy/templates/anatomy/exam_scores_user.html
index b15d6ec8..d216e6c1 100644
--- a/anatomy/templates/anatomy/exam_scores_user.html
+++ b/anatomy/templates/anatomy/exam_scores_user.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    <div class="question-display-block">
+    <div class="question-display-block mb-4">
         <div class="hide-show">HIDE/SHOW</div>
         <div class="inner-display-block">
             Question <span class="question-number">No question loaded</span><br />
@@ -12,24 +12,44 @@
             <div class="answers">Answers: </div>
         </div>
     </div>
-    <div class="anatomy">
+
+    <div class="container anatomy my-3">
         {% include 'user_score_header.html' %}
-        <ul class="score-answer-list">
-            {% for ans, score, correct_answer in answers_and_marks %}
-                <li class="user-answer-li" data-question-number="{{forloop.counter}}">Question {{forloop.counter}} - Correct answer: {% if exam.publish_results %}<span class="correct-answer">{{correct_answer}}</span>{% endif %}
-                    <br/>
-                    <span class="user-answer-score user-answer-score-{{score}}">
-                        <span class="submitted-user-answer">
-                            <pre>{{ans}}</pre>
-                        </span>
-                        {% if exam.publish_results or view_all_results%}
-                            Marks: <span class="answer-score">{{score}}</span>
-                        {% endif %}
-                    </span>
-                    <span class="view-question-link" data-qn={{forloop.counter0}}>View</span>
-                </li>
-            {% endfor %}
-        </ul>
+
+        <div class="card">
+            <div class="card-body p-0">
+                <ul class="list-group list-group-flush">
+                    {% for ans, score, correct_answer in answers_and_marks %}
+                        <li class="list-group-item d-flex justify-content-between align-items-start">
+                            <div class="d-flex align-items-start">
+                                <div class="me-3">
+                                    <span class="badge bg-secondary">{{ forloop.counter }}</span>
+                                </div>
+                                <div>
+                                    <div class="fw-semibold">Question {{ forloop.counter }}</div>
+                                    <div class="small text-muted">
+                                        Correct answer: {% if exam.publish_results %}<span class="correct-answer">{{ correct_answer }}</span>{% else %}—{% endif %}
+                                    </div>
+                                    <div class="mt-2">
+                                        <pre class="mb-0">{{ ans }}</pre>
+                                    </div>
+                                    {% if exam.publish_results or view_all_results %}
+                                        <div class="small mt-2 text-muted">Marks: <span class="answer-score">{{ score }}</span></div>
+                                    {% endif %}
+                                </div>
+                            </div>
+                            <div class="text-end ms-3">
+                                <button type="button" class="btn btn-sm btn-outline-primary view-question-link" data-qn={{forloop.counter0}}>View</button>
+                                {% if request.user.is_staff %}
+                                    <button type="button" class="btn btn-sm btn-outline-secondary ms-2 admin-edit-button" data-qn="{{ forloop.counter0 }}">Edit</button>
+                                {% endif %}
+                            </div>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
+
         {% include 'user_scores_footer.html' %}
     </div>
 {% endblock %}