diff --git a/templates/followers.html b/templates/followers.html
index c01f880..6d31da2 100644
--- a/templates/followers.html
+++ b/templates/followers.html
@@ -7,6 +7,7 @@
 <div id="container">
 {% include "header.html" %}
 
+<main>
 <div id="followers">
 	{% for meta in followers_data %}
     {% set follower = meta.actor %}
@@ -27,6 +28,7 @@
     {{ utils.display_pagination(older_than, newer_than) }}
 </div>
 
+</main>
 </div>
 {% endblock %}
 {% block links %}
diff --git a/templates/index.html b/templates/index.html
index 527918d..7055199 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -20,7 +20,7 @@
 
 {% include "header.html" %}
 
-<div id="notes">
+<main id="notes">
 	{% for item in pinned %}
     {% if item.meta.pinned %}
     <p style="margin-left:65px;padding-bottom:5px;">
@@ -62,7 +62,7 @@
 	{% endfor %}
 
     {{ utils.display_pagination(older_than, newer_than) }}
-    </div>
+    </main>
 
 </div>
 {% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
index 73b58ba..92e5958 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -46,9 +46,9 @@
 {% endif %}
 
 
-<main class="base-container">
+<div class="base-container">
 {% block content %}{% endblock %}
-</main>
+</div>
 <footer class="footer">
 <div>
 	Powered by <a href="https://microblog.pub">microblog.pub</a> <small class="microblogpub-version"><code>{{ microblogpub_version }}</code></small> (<a href="https://github.com/tsileo/microblog.pub">source code</a>) and the <a href="https://activitypub.rocks/">ActivityPub</a> protocol
diff --git a/templates/note.html b/templates/note.html
index 053b6c7..ce1ad29 100644
--- a/templates/note.html
+++ b/templates/note.html
@@ -16,7 +16,9 @@
 {% block content %}
 <div id="container">
 {% include "header.html" %}
+<main>
 {{ utils.display_thread(thread, likes=likes, shares=shares) }}
+</main>
 </div>
 {% endblock %}
 {% block links %}<link rel="alternate" href="{{ note.activity.object.id}}" type="application/activity+json">{% endblock %}
diff --git a/templates/remote_follow.html b/templates/remote_follow.html
index 7a4a454..065dff6 100644
--- a/templates/remote_follow.html
+++ b/templates/remote_follow.html
@@ -5,6 +5,7 @@
 {% block content %}
 <div id="container">
 {% include "header.html" %}
+<main>
 <h2 style="font-weight:normal">Remote follow @<span class="gold">{{ config.USERNAME }}</span>@<span class="gold">{{ config.DOMAIN }}</span></h2>
 
 <form method="POST" action="">
@@ -12,6 +13,6 @@
 	<input type="text" name="profile" placeholder="you@your-instance">
 	<input type="submit" value="Follow">
 </form>
-
+</main>
 </div>
 {% endblock %}
diff --git a/templates/tags.html b/templates/tags.html
index e0ed839..caf152a 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -20,13 +20,14 @@
 <data class="p-name" value="#{{tag}}">
 
 {% include "header.html" %}
+<main>
 <h2>#{{ tag }}</h2>
 <div id="notes">
 	{% for item in outbox_data %}
 	{{ utils.display_note(item.activity.object, meta=item.meta) }}
 	{% endfor %}
 </div>
-
+</main>
 </div>
 {% endblock %}
 {% block links %}