diff --git a/evap/grades/templates/grades_semester_view.html b/evap/grades/templates/grades_semester_view.html
index bc0d8d7153..73ed72cd0c 100644
--- a/evap/grades/templates/grades_semester_view.html
+++ b/evap/grades/templates/grades_semester_view.html
@@ -7,7 +7,7 @@
     {{ block.super }}
     {% show_infotext "grades_pages" %}
 
-    <div class="row mb-3 align-items-center">
+    <div class="row mb-3 align-items-end">
         <h3 class="col-8 mb-0">
             {{ semester.name }}
         </h3>
diff --git a/evap/results/templates/results_evaluation_detail.html b/evap/results/templates/results_evaluation_detail.html
index 3061028785..b371a82ab6 100644
--- a/evap/results/templates/results_evaluation_detail.html
+++ b/evap/results/templates/results_evaluation_detail.html
@@ -26,43 +26,73 @@
                 <span class="fas fa-lock"></span> {% trans 'This evaluation is private. Only contributors and participants can see the results.' %}
             </div>
         {% endif %}
-        <div class="d-flex">
-            <h3 class="me-auto">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
+        <div class="row align-items-end mb-3">
+            <div class="col">
+                <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
+            </div>
+
+            <div class="col-auto">
+                <div class="btn-switch btn-switch-light my-auto d-print-none">
+                    <div class="btn-switch-label">{% trans 'View' %}</div>
+                    <div class="btn-switch btn-group">
+                        {% if user.is_staff and view == 'export' or is_contributor %}
+                            <a
+                                href="{% if is_contributor %}{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=export{% endif %}"
+                                role="button"
+                                class="btn btn-sm btn-light{% if view == 'export' %} active{% endif %}"
+                                data-bs-toggle="tooltip"
+                                data-bs-placement="bottom"
+                                title="{% blocktrans %}Shows filtered view meant for personal export. Other contributors' results and private answers are hidden.{% endblocktrans %}"
+                            >
+                                {% trans 'Export' context 'view mode' %}
+                            </a>
 
-            <div class="btn-switch btn-switch-light my-auto d-print-none">
-                <div class="btn-switch-label">{% trans 'View' %}</div>
-                <div class="btn-switch btn-group">
-                    {% if user.is_staff and view == 'export' or is_contributor %}
-                        <a href="{% if is_contributor %}{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=export{% endif %}" role="button" class="btn btn-sm btn-light{% if view == 'export' %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom"
-                        title="{% blocktrans %}Shows filtered view meant for personal export. Other contributors' results and private answers are hidden.{% endblocktrans %}">
-                        {% trans 'Export' context 'view mode' %}
+                        {% endif %}
+                        <a
+                            href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=full"
+                            role="button"
+                            class="btn btn-sm btn-light{% if view == 'full' %} active{% endif %}"
+                            data-bs-toggle="tooltip"
+                            data-bs-placement="bottom"
+                            title="{% trans 'Shows all results available for you.' %}"
+                        >
+                            {% trans 'Full' %}
                         </a>
-                    {% endif %}
-                    <a href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=full" role="button" class="btn btn-sm btn-light{% if view == 'full' %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom"
-                    title="{% trans 'Shows all results available for you.' %}">
-                    {% trans 'Full' %}
-                    </a>
-                    {% if not evaluation.can_publish_rating_results %}
-                        <button type="button" disabled class="btn btn-sm btn-light" data-bs-toggle="tooltip" data-bs-placement="bottom"
-                            title="{% blocktrans %}The results of this evaluation have not been published because it didn't get enough votes.{% endblocktrans %}">
-                            {% if evaluation.course.is_private %}
-                                {% trans 'Participant' %}
-                            {% else %}
-                                {% trans 'Public' %}
-                            {% endif %}
-                        </button>
-                    {% else %}
-                        <a href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=public" role="button" class="btn btn-sm btn-light{% if view == 'public' %} active{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom"
-                           title="
-                        {% if evaluation.course.is_private %}
-                            {% trans 'Shows results available for the participants.' %}">
-                                {% trans 'Participant' %}
+                        {% if not evaluation.can_publish_rating_results %}
+                            <button
+                                type="button"
+                                disabled
+                                class="btn btn-sm btn-light"
+                                data-bs-toggle="tooltip"
+                                data-bs-placement="bottom"
+                                title="{% blocktrans %}The results of this evaluation have not been published because it didn't get enough votes.{% endblocktrans %}"
+                            >
+                                {% if evaluation.course.is_private %}
+                                    {% trans 'Participant' %}
+                                {% else %}
+                                    {% trans 'Public' %}
+                                {% endif %}
+                            </button>
                         {% else %}
-                            {% trans 'Shows results available for everyone logged in.' %}">
-                                {% trans 'Public' %}
+                            <a
+                                href="{% url 'results:evaluation_detail' evaluation.course.semester.id evaluation.id %}?view=public"
+                                role="button"
+                                class="btn btn-sm btn-light{% if view == 'public' %} active{% endif %}"
+                                data-bs-toggle="tooltip"
+                                data-bs-placement="bottom"
+                                title="
+                                    {% if evaluation.course.is_private %}
+                                        {% trans 'Shows results available for the participants.' %}"
+                                        >
+                                        {% trans 'Participant' %}
+                                    {% else %}
+                                        {% trans 'Shows results available for everyone logged in.' %}"
+                                        >
+                                        {% trans 'Public' %}
+                                    {% endif %}
+                            </a>
                         {% endif %}
-                        </a>
-                    {% endif %}
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/evap/results/tests/test_views.py b/evap/results/tests/test_views.py
index a1111975a4..b4a6be3c9e 100644
--- a/evap/results/tests/test_views.py
+++ b/evap/results/tests/test_views.py
@@ -471,20 +471,20 @@ def test_heading_question_filtering(self):
     def test_default_view_is_public(self):
         cache_results(self.evaluation)
 
-        # the view=public button should have class "active". The rest in-between is just noise.
-        expected_button = (
-            f'<a href="/results/semester/{self.evaluation.course.semester.pk}/evaluation/{self.evaluation.pk}'
-            + '?view=public" role="button" class="btn btn-sm btn-light active"'
-        )
-
         page_without_get_parameter = self.app.get(self.url, user=self.manager)
-        self.assertContains(page_without_get_parameter, expected_button)
+        self.assertEqual(page_without_get_parameter.context["view"], "public")
 
         page_with_get_parameter = self.app.get(self.url + "?view=public", user=self.manager)
-        self.assertContains(page_with_get_parameter, expected_button)
+        self.assertEqual(page_with_get_parameter.context["view"], "public")
 
         page_with_random_get_parameter = self.app.get(self.url + "?view=asdf", user=self.manager)
-        self.assertContains(page_with_random_get_parameter, expected_button)
+        self.assertEqual(page_with_random_get_parameter.context["view"], "public")
+
+        page_with_full_get_parameter = self.app.get(f"{self.url}?view=full", user=self.manager)
+        self.assertEqual(page_with_full_get_parameter.context["view"], "full")
+
+        page_with_export_get_parameter = self.app.get(f"{self.url}?view=export", user=self.manager)
+        self.assertEqual(page_with_export_get_parameter.context["view"], "export")
 
     def test_wrong_state(self):
         helper_exit_staff_mode(self)
diff --git a/evap/staff/templates/staff_evaluation_textanswers.html b/evap/staff/templates/staff_evaluation_textanswers.html
index 986f429446..f2b21dbd72 100644
--- a/evap/staff/templates/staff_evaluation_textanswers.html
+++ b/evap/staff/templates/staff_evaluation_textanswers.html
@@ -10,23 +10,43 @@
 {% block content %}
     {{ block.super }}
 
-    <div class="d-flex">
-        <h3 class="me-auto">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
-        <div class="btn-switch btn-switch-light my-auto d-print-none">
-            <div class="btn-switch-label">{% trans 'View' %}</div>
-            <div class="btn-switch btn-group">
-                <a href="{% url 'staff:evaluation_textanswers' evaluation.id %}" role="button" class="btn btn-sm btn-light{% if view == 'quick' %} active{% endif %}">
-                    {% trans 'Quick' %}
-                </a>
-                <a href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=full" role="button" class="btn btn-sm btn-light{% if view == 'full' %} active{% endif %}">
-                    {% trans 'Full' %}
-                </a>
-                <a href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=undecided" role="button" class="btn btn-sm btn-light{% if view == 'undecided' %} active{% endif %}">
-                    {% trans 'Undecided' %}
-                </a>
-                <a href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=flagged" role="button" class="btn btn-sm btn-light{% if view == 'flagged' %} active{% endif %}">
-                    {% trans 'Flagged' %}
-                </a>
+    <div class="row mb-3 align-items-end">
+        <div class="col">
+            <h3 class="mb-0">{{ evaluation.full_name }} ({{ evaluation.course.semester.name }})</h3>
+        </div>
+        <div class="col-auto">
+            <div class="btn-switch btn-switch-light my-auto d-print-none">
+                <div class="btn-switch-label">{% trans 'View' %}</div>
+                <div class="btn-switch btn-group">
+                    <a
+                        href="{% url 'staff:evaluation_textanswers' evaluation.id %}"
+                        role="button"
+                        class="btn btn-sm btn-light{% if view == 'quick' %} active{% endif %}"
+                    >
+                        {% trans 'Quick' %}
+                    </a>
+                    <a
+                        href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=full"
+                        role="button"
+                        class="btn btn-sm btn-light{% if view == 'full' %} active{% endif %}"
+                    >
+                        {% trans 'Full' %}
+                    </a>
+                    <a
+                        href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=undecided"
+                        role="button"
+                        class="btn btn-sm btn-light{% if view == 'undecided' %} active{% endif %}"
+                    >
+                        {% trans 'Undecided' %}
+                    </a>
+                    <a
+                        href="{% url 'staff:evaluation_textanswers' evaluation.id %}?view=flagged"
+                        role="button"
+                        class="btn btn-sm btn-light{% if view == 'flagged' %} active{% endif %}"
+                    >
+                        {% trans 'Flagged' %}
+                    </a>
+                </div>
             </div>
         </div>
     </div>