diff --git a/atlas/templates/atlas/collection_take_overview.html b/atlas/templates/atlas/collection_take_overview.html
index 53cdca65..7530418a 100644
--- a/atlas/templates/atlas/collection_take_overview.html
+++ b/atlas/templates/atlas/collection_take_overview.html
@@ -83,26 +83,17 @@
                            href="{% if cid is not None %}{% url 'atlas:collection_case_view_take' pk=collection.id case_number=forloop.counter0 cid=cid passcode=passcode %}{% else %}{% url 'atlas:collection_case_view_take_user' pk=collection.id case_number=forloop.counter0 %}{% endif %}">
                             Open Case
                         </a>
-                        {% if cid is None %}
-                            <a class="btn btn-sm btn-outline-secondary"
-                               href="{% url 'atlas:collection_case_view_take_user_answers' pk=collection.id case_number=forloop.counter0 %}">
-                                View Answer / Report
-                            </a>
-                        {% else %}
-                            <a class="btn btn-sm btn-outline-secondary"
-                               href="{% url 'atlas:collection_case_view_take' pk=collection.id case_number=forloop.counter0 cid=cid passcode=passcode %}">
-                                View Answer / Report
-                            </a>
-                        {% endif %}
-                        <a class="btn btn-sm btn-outline-info"
-                           href="{% url 'atlas:add_self_review' cid_user_exam.id question.case.id %}">
-                            {% if self_review %}Add New Self Review{% else %}Add Self Review{% endif %}
-                        </a>
-                        {% if review_stats.has_messages %}
-                            <a class="btn btn-sm {% if review_stats.has_outstanding_feedback %}btn-danger{% else %}btn-outline-dark{% endif %}"
-                               href="{% if cid is not None %}{% url 'atlas:collection_feedback_overview' pk=collection.id cid=cid passcode=passcode %}{% else %}{% url 'atlas:collection_feedback_overview_user' pk=collection.id %}{% endif %}#case-feedback-{{ question.case.id }}">
-                                View Conversation
+                        {% if collection.in_review_mode or cid_user_exam.completed %}
+                            <a class="btn btn-sm btn-outline-info"
+                            href="{% url 'atlas:add_self_review' cid_user_exam.id question.case.id %}">
+                                {% if self_review %}Add New Self Review{% else %}Add Self Review{% endif %}
                             </a>
+                            {% if review_stats.has_messages %}
+                                <a class="btn btn-sm {% if review_stats.has_outstanding_feedback %}btn-danger{% else %}btn-outline-dark{% endif %}"
+                                href="{% if cid is not None %}{% url 'atlas:collection_feedback_overview' pk=collection.id cid=cid passcode=passcode %}{% else %}{% url 'atlas:collection_feedback_overview_user' pk=collection.id %}{% endif %}#case-feedback-{{ question.case.id }}">
+                                    View Conversation
+                                </a>
+                            {% endif %}
                         {% endif %}
                     </div>
                 </div>
diff --git a/atlas/templates/atlas/partials/_collection_case_jump.html b/atlas/templates/atlas/partials/_collection_case_jump.html
index dd0e5cdd..266e4697 100644
--- a/atlas/templates/atlas/partials/_collection_case_jump.html
+++ b/atlas/templates/atlas/partials/_collection_case_jump.html
@@ -6,11 +6,6 @@
                 Case {{ item.idx|add:1 }}: {{ item.cd.case.title|default:item.cd.case.pk|truncatechars:45 }}
             </a>
             <div class="d-flex gap-1">
-                {% if item.has_answer %}
-                    <span class="badge bg-success-subtle text-success-emphasis">Answered</span>
-                {% else %}
-                    <span class="badge bg-danger-subtle text-danger-emphasis">Not answered</span>
-                {% endif %}
                 {% if item.has_self_review %}
                     <span class="badge bg-info-subtle text-info-emphasis">Self review</span>
                 {% endif %}