diff --git a/modules/admin/templates/federation.twig b/modules/admin/templates/federation.twig
index d44d885ff183e869e355d5dc2620f52530abe1f2..ccc3c752f6af9014b1a66ebbf3c1f588a81f7db2 100644
--- a/modules/admin/templates/federation.twig
+++ b/modules/admin/templates/federation.twig
@@ -128,7 +128,7 @@
<form action="{{ moduleURL('admin/federation/show') }}" method="get" class="pure-form">
<fieldset class="fancyfieldset">
<legend>{% trans %}Look up metadata for entity:{% endtrans %}</legend>
- <select name="set">
+ <select name="set" aria-labelledby="lookupbutton">
{%- if entries.remote %}
{%- for key, set in entries.remote %}
@@ -138,7 +138,7 @@
</select>
<input type="text" name="entityid" placeholder="{% trans %}EntityID{% endtrans %}">
- <button class="pure-button pure-button-red" type="submit">{% trans %}Search{% endtrans %}</button>
+ <button class="pure-button pure-button-red" type="submit" id="lookupbutton">{% trans %}Search{% endtrans %}</button>
</fieldset>
</form>
{% endblock %}
diff --git a/templates/_footer.twig b/templates/_footer.twig
index 7a6705b9cb2bcf70b57dde431137aad5d8da58d6..45b630fa3bafb8b5338cdf44139fe2adf2d24fd7 100644
--- a/templates/_footer.twig
+++ b/templates/_footer.twig
@@ -1,4 +1,4 @@
-<div id="footer">
+<footer id="footer">
<div class="wrap">
<div class="center copyrights">© 2007-{{ year }} <a href="https://simplesamlphp.org/">SimpleSAMLphp</a>
</div>
@@ -8,4 +8,4 @@
</div>
</div>
</div>
-</div>
+</footer>
diff --git a/templates/_header.twig b/templates/_header.twig
index 76c877b497f1850bb27f8a61efaed428edb2baca..fc3a473554abb47e3494e68988f68cbd061eba10 100644
--- a/templates/_header.twig
+++ b/templates/_header.twig
@@ -1,4 +1,4 @@
-<div id="header">
+<header id="header">
<div class="wrap">
<div class="left">
<div class="v-center logo-header">
@@ -75,5 +75,5 @@
</div>{# language bar #}
</div>{# show-for-large #}
</div>{# wrap #}
-</div>{# header #}
+</header>
diff --git a/templates/auth_status.twig b/templates/auth_status.twig
index 5ba1be20ada060cf0f058a942d794462a93405bc..731ef1f87cf07a9a0008a19c3bf8cf96766b6b37 100644
--- a/templates/auth_status.twig
+++ b/templates/auth_status.twig
@@ -71,7 +71,7 @@
<dl>
<dt>{% trans %}Debug information to be used by your support staff{% endtrans %}</dt>
- {%- embed "includes/expander.twig" %}
+ <dd>{%- embed "includes/expander.twig" %}
{%- block content %}
<dl>
@@ -101,6 +101,7 @@
{%- endblock content %}
{%- endembed %}
+ </dd>
</dl>
<br>
diff --git a/templates/base.twig b/templates/base.twig
index 5c115e9fe5e835875776b744dd01078fdf6c3dd7..31b96a99f0ce54f05a6017e8f10461b5d36453be 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -17,12 +17,14 @@
<body id="{{ templateId }}">
<div id="layout">
{% block header %}{% include "_header.twig" %}{% endblock %}
+ <main>
<div id="content">
<div class="wrap">
{% block contentwrapper %}{% block content %}{% endblock %}{% endblock contentwrapper %}
</div>
</div>{# content #}
<div id="push"></div>
+ </main>
</div>{# layout #}
<div id="foot">
{% block footer %}{% include "_footer.twig" %}{% endblock %}