diff --git a/src/pretalx/orga/templates/orga/cfp/access_code_view.html b/src/pretalx/orga/templates/orga/cfp/access_code_view.html
index 166574680..397d75cd1 100644
--- a/src/pretalx/orga/templates/orga/cfp/access_code_view.html
+++ b/src/pretalx/orga/templates/orga/cfp/access_code_view.html
@@ -9,6 +9,7 @@
 
 
 {% block cfp_content %}
+    <h1 class="mt-2 mb-2">Call for Speakers</h1>
     <h2>{% translate "Access codes" %}</h2>
     <div class="alert alert-info">
         {% blocktranslate trimmed %}
diff --git a/src/pretalx/orga/templates/orga/cfp/flow.html b/src/pretalx/orga/templates/orga/cfp/flow.html
index da201ad7e..ff094f299 100644
--- a/src/pretalx/orga/templates/orga/cfp/flow.html
+++ b/src/pretalx/orga/templates/orga/cfp/flow.html
@@ -18,7 +18,8 @@
 {% endblock %}
 
 {% block cfp_content %}
-    <h1>{% translate "CfP Editor" %}</h1>
+    <h1 class="mt-2 mb-2">Call for Speakers</h1>
+    <h3>{% translate "Editor" %}</h3>
     <p>
         {% blocktranslate trimmed %}
             This is the pretalx CfP editor. This page allows you to change the
diff --git a/src/pretalx/orga/templates/orga/cfp/question_view.html b/src/pretalx/orga/templates/orga/cfp/question_view.html
index 85d1a4d89..5c2c57f10 100644
--- a/src/pretalx/orga/templates/orga/cfp/question_view.html
+++ b/src/pretalx/orga/templates/orga/cfp/question_view.html
@@ -2,6 +2,8 @@
 {% load i18n %}
 
 {% block cfp_content %}
+<h1 class="mt-2 mb-2">Call for Speakers</h1>
+<h3>{% translate "Questions" %}</h3>
     <div class="alert alert-info">
         {% blocktranslate trimmed %}
             Questions can help you sort out additional details with speakers, such as
diff --git a/src/pretalx/orga/templates/orga/cfp/submission_type_view.html b/src/pretalx/orga/templates/orga/cfp/submission_type_view.html
index df3435f67..f87b397e5 100644
--- a/src/pretalx/orga/templates/orga/cfp/submission_type_view.html
+++ b/src/pretalx/orga/templates/orga/cfp/submission_type_view.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block cfp_content %}
+    <h1 class="mt-2 mb-2">Call for Speakers</h1>
     <h2>{% translate "Session Types" %}</h2>
     <div class="alert alert-info">
         {% blocktranslate trimmed %}
diff --git a/src/pretalx/orga/templates/orga/cfp/text.html b/src/pretalx/orga/templates/orga/cfp/text.html
index eb30bff95..c742a01e2 100644
--- a/src/pretalx/orga/templates/orga/cfp/text.html
+++ b/src/pretalx/orga/templates/orga/cfp/text.html
@@ -15,6 +15,8 @@
 {% endblock %}
 
 {% block cfp_content %}
+<h2 class="mt-2 mb-2">Call for Speakers</h2>
+<h3>Content</h3>
     <div class="alert alert-info">
         <span>
             {% translate "A good Call for Participation will engage potential speakers. Remember to include:" %}<br>
diff --git a/src/pretalx/orga/templates/orga/cfp/track_view.html b/src/pretalx/orga/templates/orga/cfp/track_view.html
index 1afcf3f43..086c0c119 100644
--- a/src/pretalx/orga/templates/orga/cfp/track_view.html
+++ b/src/pretalx/orga/templates/orga/cfp/track_view.html
@@ -2,7 +2,8 @@
 {% load i18n %}
 
 {% block cfp_content %}
-    <h2>{% translate "Tracks" %}</h2>
+    <h1 class="mt-2 mb-2">Call for Speakers</h1>
+    <h3>{% translate "Tracks" %}</h3>
     <div class="alert alert-info">
         {% blocktranslate trimmed %}
             Tracks are used to sort your sessions into categories. You can use the
diff --git a/src/pretalx/orga/templates/orga/mails/compose_choice.html b/src/pretalx/orga/templates/orga/mails/compose_choice.html
index f48745ed0..a5033c467 100644
--- a/src/pretalx/orga/templates/orga/mails/compose_choice.html
+++ b/src/pretalx/orga/templates/orga/mails/compose_choice.html
@@ -1,7 +1,10 @@
 {% extends "orga/base.html" %}
 {% load i18n %}
 {% block content %}
-  <h1>{% translate "Send emails" %}</h1>
+  <h1 class="mt-2 mb-0">Mails</h1>
+  <h2 class="mb-4">
+      {% translate "Compose E-mails" %}
+  </h2>
   <ul class="list-group">
     <a class="list-group-item list-group-item-action" href="{{ request.event.orga_urls.compose_mails_sessions }}">
       <h4>
diff --git a/src/pretalx/orga/templates/orga/mails/outbox_form.html b/src/pretalx/orga/templates/orga/mails/outbox_form.html
index f908a871f..d1fbfea70 100644
--- a/src/pretalx/orga/templates/orga/mails/outbox_form.html
+++ b/src/pretalx/orga/templates/orga/mails/outbox_form.html
@@ -4,6 +4,7 @@
 {% load rich_text %}
 
 {% block mail_content %}
+    <h2>{% translate "Mail Editor" %}</h2>
     {% if form.instance.sent %}
         <div class="alert alert-info">
             {% blocktranslate trimmed with timestamp=form.instance.sent %}
@@ -13,7 +14,6 @@
     {% endif %}
     <form method="post">
         {% csrf_token %}
-        <h2>{% translate "Mail Editor" %}</h2>
         {% bootstrap_form_errors form %}
 
         {% if not form.read_only %}
diff --git a/src/pretalx/orga/templates/orga/mails/outbox_list.html b/src/pretalx/orga/templates/orga/mails/outbox_list.html
index c85958954..c805bb886 100644
--- a/src/pretalx/orga/templates/orga/mails/outbox_list.html
+++ b/src/pretalx/orga/templates/orga/mails/outbox_list.html
@@ -3,7 +3,11 @@
 {% load url_replace %}
 
 {% block mail_content %}
-    <h2>
+    <h1 class="mt-2 mb-0">Mails</h1>
+    <h2 class="mb-4">
+        {% translate "Outbox" %}
+    </h2>
+    <h3>
         <span>
             {{ page_obj.paginator.count }}
             {% blocktranslate trimmed count count=page_obj.paginator.count %}
@@ -12,7 +16,7 @@ <h2>
                 pending mails
             {% endblocktranslate %}
         </span>
-    </h2>
+    </h3>
     <div class="submit-group">
         <span>
             {% include "common/search_form.html" %}
diff --git a/src/pretalx/orga/templates/orga/mails/sent_list.html b/src/pretalx/orga/templates/orga/mails/sent_list.html
index 2b26f1618..535b313ae 100644
--- a/src/pretalx/orga/templates/orga/mails/sent_list.html
+++ b/src/pretalx/orga/templates/orga/mails/sent_list.html
@@ -4,6 +4,10 @@
 {% load url_replace %}
 
 {% block mail_content %}
+    <h1 class="mt-2 mb-0">Mails</h1>
+    <h2 class="mb-4">
+        {% translate "Sent E-mails" %}
+    </h2>
     <h2>
         {{ page_obj.paginator.count }}
         {% translate "Sent Mails" %}
diff --git a/src/pretalx/orga/templates/orga/mails/template_list.html b/src/pretalx/orga/templates/orga/mails/template_list.html
index aceeeb8c4..07332bcf3 100644
--- a/src/pretalx/orga/templates/orga/mails/template_list.html
+++ b/src/pretalx/orga/templates/orga/mails/template_list.html
@@ -3,6 +3,10 @@
 {% load i18n %}
 
 {% block mail_content %}
+    <h1 class="mt-2 mb-0">Mails</h1>
+    <h2 class="mb-4">
+        {% translate "Templates" %}
+    </h2>
     <div class="alert alert-info">
         <div>
             <p>
diff --git a/src/pretalx/orga/templates/orga/organiser/detail.html b/src/pretalx/orga/templates/orga/organiser/detail.html
index 2fe0f2607..12aa45953 100644
--- a/src/pretalx/orga/templates/orga/organiser/detail.html
+++ b/src/pretalx/orga/templates/orga/organiser/detail.html
@@ -6,8 +6,9 @@
 {% block title %}{% if request.event %}{{ request.event.name }}{% else %}{{ request.organiser.name }}{% endif %}{% endblock %}
 
 {% block content %}
+    <h2 class="mt-2 mb-4">Settings</h2>
     <form method="post"><fieldset>
-        <legend>{% translate "Settings" %}</legend>
+        <legend>{% translate "Teams" %}</legend>
         {% csrf_token %}
         {% bootstrap_form form layout='event' %}
         <div class="submit-group panel">
diff --git a/src/pretalx/orga/templates/orga/plugins.html b/src/pretalx/orga/templates/orga/plugins.html
index 4708325bc..c50c05d66 100644
--- a/src/pretalx/orga/templates/orga/plugins.html
+++ b/src/pretalx/orga/templates/orga/plugins.html
@@ -3,7 +3,7 @@
 
 {% block title %}{% translate "Plugins" %}{% endblock %}
 {% block content %}
-    <h2>{% translate "Plugins" %}</h2>
+    <h2 class="mt-2 mb-2">{% translate "Plugins Settings" %}</h2>
 
     {% if grouped_plugins %}
         <form method="post" class="form-horizontal">
diff --git a/src/pretalx/orga/templates/orga/review/assignment.html b/src/pretalx/orga/templates/orga/review/assignment.html
index 8f9ebd554..609a887d3 100644
--- a/src/pretalx/orga/templates/orga/review/assignment.html
+++ b/src/pretalx/orga/templates/orga/review/assignment.html
@@ -11,6 +11,7 @@
         <script defer src="{% static "cfp/js/animateFormset.js" %}"></script>
         <script defer src="{% static "orga/js/reviewAssignment.js" %}"></script>
     {% endcompress %}
+    <h1 class="mt-2 mb-2">Review</h1>
     <h2>{% translate "Assign reviewers" %}</h2>
 
     <ul class="nav nav-tabs" id="myTab" role="tablist">
diff --git a/src/pretalx/orga/templates/orga/review/dashboard.html b/src/pretalx/orga/templates/orga/review/dashboard.html
index 5d3a58e09..4de01f5b1 100644
--- a/src/pretalx/orga/templates/orga/review/dashboard.html
+++ b/src/pretalx/orga/templates/orga/review/dashboard.html
@@ -19,6 +19,10 @@
 {% block content %}
     {% has_perm 'orga.perform_reviews' request.user request.event as can_review %}
     {% has_perm 'orga.view_speakers' request.user request.event as can_view_speakers %}
+    <h1 class="mt-2 mb-2">Review</h1>
+    <h2 class="d-flex w-100 justify-content-between align-items-start">
+        {% translate "Review" %}
+    </h2>
     <div class="alert alert-info">
         <div>
             {% if can_review and next_submission %}
diff --git a/src/pretalx/orga/templates/orga/review/export.html b/src/pretalx/orga/templates/orga/review/export.html
index 359441fb4..f0ca3de14 100644
--- a/src/pretalx/orga/templates/orga/review/export.html
+++ b/src/pretalx/orga/templates/orga/review/export.html
@@ -4,6 +4,7 @@
 {% load static %}
 
 {% block content %}
+    <h1 class="mt-2 mb-2">Review</h1>
     <h2>
         {% translate "Export review data" %}
     </h2>
diff --git a/src/pretalx/orga/templates/orga/schedule/export.html b/src/pretalx/orga/templates/orga/schedule/export.html
index 19f58b3e4..85dd28572 100644
--- a/src/pretalx/orga/templates/orga/schedule/export.html
+++ b/src/pretalx/orga/templates/orga/schedule/export.html
@@ -4,7 +4,8 @@
 {% load static %}
 
 {% block schedule_content %}
-    <h2>
+    <h1 class="mt-2 mb-0">Schedule</h1>
+    <h2 class="mb-4">
         {% translate "Export schedule data" %}
     </h2>
     <ul class="nav nav-tabs" id="myTab" role="tablist">
diff --git a/src/pretalx/orga/templates/orga/schedule/index.html b/src/pretalx/orga/templates/orga/schedule/index.html
index b4ea6549f..b4fe9c774 100644
--- a/src/pretalx/orga/templates/orga/schedule/index.html
+++ b/src/pretalx/orga/templates/orga/schedule/index.html
@@ -20,6 +20,8 @@
 {% endblock %}
 
 {% block schedule_content %}
+    <h1 class="mt-2 mb-2">Schedule</h1>
+    <h2 class="mt-2 mb-2">Editor</h2>
 
     <div class="schedule-header d-flex m-3 no-print">
         <div id="schedule-action-wrapper" class="d-flex align-items-center ml-auto">
diff --git a/src/pretalx/orga/templates/orga/schedule/room_list.html b/src/pretalx/orga/templates/orga/schedule/room_list.html
index 4d597e759..6bfc22c54 100644
--- a/src/pretalx/orga/templates/orga/schedule/room_list.html
+++ b/src/pretalx/orga/templates/orga/schedule/room_list.html
@@ -2,15 +2,17 @@
 {% load i18n %}
 
 {% block content %}
+<h1 class="mt-2 mb-0">Schedule</h1>
+<h2 class="mt-0 mb-4">Rooms</h2>
     <div>
-        <h2>
+        <h3>
             {{ request.event.rooms.count }}
             {% blocktranslate trimmed count count=request.event.rooms.count context "Number of rooms" %}
                 Room
             {% plural %}
                 Rooms
             {% endblocktranslate %}
-        </h2>
+        </h3>
 
         <div class="table-responsive">
             <table class="table table-sm table-hover table-flip">
diff --git a/src/pretalx/orga/templates/orga/settings/form.html b/src/pretalx/orga/templates/orga/settings/form.html
index 1f69736be..4ec4af282 100644
--- a/src/pretalx/orga/templates/orga/settings/form.html
+++ b/src/pretalx/orga/templates/orga/settings/form.html
@@ -21,7 +21,7 @@
 {% endblock %}
 
 {% block settings_content %}
-    <h2>{% translate "Settings" %}</h2>
+    <h2 class="mt-2 mb-4">{% translate "Settings" %}</h2>
     <div class="flex-container"><div class="flex-content">
         <form method="post" enctype="multipart/form-data">
             {% csrf_token %}
diff --git a/src/pretalx/orga/templates/orga/settings/mail.html b/src/pretalx/orga/templates/orga/settings/mail.html
index 47bec2808..6b136584f 100644
--- a/src/pretalx/orga/templates/orga/settings/mail.html
+++ b/src/pretalx/orga/templates/orga/settings/mail.html
@@ -13,7 +13,7 @@
 {% block settings_content %}
     <form method="post">
         {% csrf_token %}
-        <h2>{% translate "E-mail settings" %}</h2>
+        <h2 class="mt-2 mb-2">{% translate "E-mail settings" %}</h2>
         <div class="alert alert-info offset-md-3">
             {% blocktranslate trimmed %}
                 If you don't configure custom email settings, the global configuration
diff --git a/src/pretalx/orga/templates/orga/settings/review.html b/src/pretalx/orga/templates/orga/settings/review.html
index edf92e490..52dcae664 100644
--- a/src/pretalx/orga/templates/orga/settings/review.html
+++ b/src/pretalx/orga/templates/orga/settings/review.html
@@ -17,8 +17,7 @@
     {% endcompress %}
     <form method="post" class="d-flex flex-column">
         {% csrf_token %}
-
-        <h2>{% translate "Review settings" %}</h2>
+        <h2 class="mt-2 mb-2">{% translate "Review settings" %}</h2>
         <div class="alert alert-info col-md-9 flip ml-auto">
             {% blocktranslate trimmed %}
                 If you require neither a review score nor a review text, reviewers will
diff --git a/src/pretalx/orga/templates/orga/settings/widget.html b/src/pretalx/orga/templates/orga/settings/widget.html
index 076c1d4b0..a72f10d71 100644
--- a/src/pretalx/orga/templates/orga/settings/widget.html
+++ b/src/pretalx/orga/templates/orga/settings/widget.html
@@ -11,7 +11,7 @@
     <form method="post" class="d-flex flex-column">
         {% csrf_token %}
 
-        <h2>{% translate "Widget settings" %}</h2>
+        <h2 class="mt-2 mb-2">{% translate "Widget settings" %}</h2>
         <div class="alert alert-info col-md-9 flip ml-auto">
             {% blocktranslate trimmed %}
                 You can configure a pretalx schedule widget to show your event schedule
diff --git a/src/pretalx/orga/templates/orga/speaker/information_list.html b/src/pretalx/orga/templates/orga/speaker/information_list.html
index 58822813f..f70bb9257 100644
--- a/src/pretalx/orga/templates/orga/speaker/information_list.html
+++ b/src/pretalx/orga/templates/orga/speaker/information_list.html
@@ -2,14 +2,16 @@
 {% load i18n %}
 
 {% block content %}
-    <h2>
+    <h1 class="mt-2 mb-2">Speakers</h1>
+    <h2 class="mt-2 mb-2">Speaker Information</h2>
+    <h3>
         {{ information.count }}
         {% blocktranslate trimmed count count=information.count %}
             Speaker Information Note
         {% plural %}
             Speaker Information Notes
         {% endblocktranslate %}
-    </h2>
+    </h3>
     <div class="alert alert-info">
         {% blocktranslate trimmed %}
             Add important messages (e.g. "Please bring an HDMI adapter if required.") or files (e.g. a conference styleguide).<br>
diff --git a/src/pretalx/orga/templates/orga/speaker/list.html b/src/pretalx/orga/templates/orga/speaker/list.html
index 0099920bb..193330132 100644
--- a/src/pretalx/orga/templates/orga/speaker/list.html
+++ b/src/pretalx/orga/templates/orga/speaker/list.html
@@ -5,6 +5,7 @@
 {% load url_replace %}
 
 {% block content %}
+<h1 class="mt-2 mb-2">Speakers</h1>
     <h2>
         {{ page_obj.paginator.count }}
         {% blocktranslate trimmed count count=page_obj.paginator.count %}
diff --git a/src/pretalx/orga/templates/orga/submission/feedbacks_list.html b/src/pretalx/orga/templates/orga/submission/feedbacks_list.html
index 143d7238a..d2ab1f53c 100644
--- a/src/pretalx/orga/templates/orga/submission/feedbacks_list.html
+++ b/src/pretalx/orga/templates/orga/submission/feedbacks_list.html
@@ -4,6 +4,7 @@
 {% load rules %}
 
 {% block content %}
+    <h1 class="mt-2 mb-2">Sessions</h1>
     <h2 class="d-flex w-100 justify-content-between align-items-start">
         {% translate "Attendee feedback" %}
     </h2>
diff --git a/src/pretalx/orga/templates/orga/submission/list.html b/src/pretalx/orga/templates/orga/submission/list.html
index 84d8a3786..ef6bf87f0 100644
--- a/src/pretalx/orga/templates/orga/submission/list.html
+++ b/src/pretalx/orga/templates/orga/submission/list.html
@@ -23,6 +23,8 @@
     {% has_perm 'orga.change_submission_state' request.user request.event as can_change_submission %}
     {% has_perm 'orga.view_speakers' request.user request.event as can_view_speakers %}
     {% has_perm 'orga.send_mails' request.user request.event as can_send_mails %}
+    <h1 class="mt-2 mb-2">Sessions</h1>
+    <h2>{% translate "Sessions" %}</h2>
     <h2 class="d-flex align-items-center">
         <span>
             {{ page_obj.paginator.count }}
diff --git a/src/pretalx/orga/templates/orga/submission/stats.html b/src/pretalx/orga/templates/orga/submission/stats.html
index 69aa67cdf..41be18ee8 100644
--- a/src/pretalx/orga/templates/orga/submission/stats.html
+++ b/src/pretalx/orga/templates/orga/submission/stats.html
@@ -15,6 +15,7 @@
 {% endblock %}
 
 {% block content %}
+    <h1 class="mt-2 mb-2">Sessions</h1>
     <div id="stats">
         <h2 class="d-flex w-100 justify-content-between align-items-start">
             {% translate "Proposal Statistics" %}
diff --git a/src/pretalx/orga/templates/orga/submission/tag_list.html b/src/pretalx/orga/templates/orga/submission/tag_list.html
index cbec4ff69..77e9c50de 100644
--- a/src/pretalx/orga/templates/orga/submission/tag_list.html
+++ b/src/pretalx/orga/templates/orga/submission/tag_list.html
@@ -3,6 +3,7 @@
 {% load rules %}
 
 {% block cfp_content %}
+    <h1 class="mt-2 mb-2">Sessions</h1>
     <h2>{% translate "Tags" %}</h2>
     {% has_perm 'orga.add_tags' request.user request.event as can_edit_tags %}
     {% if can_edit_tags %}