diff --git a/src/pretix/presale/templates/pretixpresale/base.html b/src/pretix/presale/templates/pretixpresale/base.html
index 985ac0d75..98ed1b064 100644
--- a/src/pretix/presale/templates/pretixpresale/base.html
+++ b/src/pretix/presale/templates/pretixpresale/base.html
@@ -46,8 +46,10 @@
 </head>
 <body class="nojs" data-locale="{{ request.LANGUAGE_CODE }}" data-now="{% now "U.u" %}" data-datetimeformat="{{ js_datetime_format }}" data-timeformat="{{ js_time_format }}" data-dateformat="{{ js_date_format }}" data-datetimelocale="{{ js_locale }}" data-currency="{{ request.event.currency }}">
 {{ html_page_header|safe }}
+<header>
 {% block above %}
 {% endblock %}
+</header>
 <div class="container main-box">
     {% block page %}
     {% endblock %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html
index bb575d18c..7dc248278 100644
--- a/src/pretix/presale/templates/pretixpresale/event/base.html
+++ b/src/pretix/presale/templates/pretixpresale/event/base.html
@@ -34,12 +34,12 @@
         {% if event.settings.locales|length > 1 %}
             {% if event.settings.theme_color_background|upper != "#FFFFFF" or event.settings.logo_image_large %}
                 <div class="pull-right header-part flip hidden-print">
-                    <div class="locales">
+                    <nav class="locales" aria-label="{% trans "select language" %}">
                         {% for l in languages %}
-                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow">
+                            <a href="{% url "presale:locale.set" %}?locale={{ l.code }}&next={{ request.path }}%3F{{ request.META.QUERY_STRING|urlencode }}" class="{% if l.code == request.LANGUAGE_CODE %}active{% endif %}" rel="nofollow" lang="{{ l.code }}" hreflang="{{ l.code }}">
                                 {{ l.name_local }}</a>
                         {% endfor %}
-                    </div>
+                    </nav>
                 </div>
             {% endif %}
         {% endif %}
diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index 5dbca0add..f54ec1b99 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -24,7 +24,7 @@
             {{ ev.event_microdata }}
         </script>
     {% endautoescape %}
-
+    <main aria-label="{% trans General information, tickets and products %}">
     {% if show_cart %}
         <details class="panel panel-primary cart" open>
             <summary class="panel-heading">
@@ -286,9 +286,10 @@
             </form>
         {% endif %}
     {% endif %}
+    </main>
     {% if show_vouchers %}
-        <section class="front-page">
-            <h3>{% trans "Redeem a voucher" %}</h3>
+        <aside class="front-page" aria-labelledby="redeem-a-voucher">
+            <h3 id="redeem-a-voucher">{% trans "Redeem a voucher" %}</h3>
             {% if event.settings.voucher_explanation_text %}
                 <div>
                     {{ event.settings.voucher_explanation_text|rich_text }}
@@ -312,12 +313,12 @@
                     <div class="clearfix"></div>
                 </div>
             </form>
-        </section>
+        </aside>
     {% endif %}
     {% if not cart_namespace %}
         {% eventsignal event "pretix.presale.signals.front_page_bottom" subevent=subevent request=request %}
-        <section class="front-page">
-            <h3>{% trans "If you already ordered a ticket" %}</h3>
+        <aside class="front-page" aria-labelledby="if-you-already-ordered-a-ticket">
+            <h3 id="if-you-already-ordered-a-ticket">{% trans "If you already ordered a ticket" %}</h3>
             <div>
                 <div class="col-md-8 col-xs-12">
                     <p>
@@ -335,7 +336,7 @@
                 </div>
                 <div class="clearfix"></div>
             </div>
-        </section>
+        </aside>
     {% else %}
         {% eventsignal event "pretix.presale.signals.front_page_bottom_widget" subevent=subevent request=request %}
     {% endif %}
