diff --git a/layouts/authors/taxonomy.html b/layouts/authors/taxonomy.html
index 79ddbc6..93c9c11 100644
--- a/layouts/authors/taxonomy.html
+++ b/layouts/authors/taxonomy.html
@@ -1,24 +1,30 @@
 {{ define "main" }}
-    <h1>
-        {{ partial "icon.html" "user-circle" }}
-        {{ .Title | markdownify }}
-    </h1>
+    <section>
+        {{ if .Content }}<article>{{ end }}
 
-    {{ with .Content }}
-        {{ . }}
-    {{ end }}
+        <h1>
+            {{ partial "icon.html" "user-circle" }}
+            {{ .Title | markdownify }}
+        </h1>
 
-    <div class="page-list">
-        {{ with .Paginator.Pages }}
-            {{ range . }}
-                <article class="page">
-                    {{ .Render "summary" }}
-                </article>
-            {{ end }}
-        {{ else }}
-            <div>
-                {{ i18n "no_posts" }}
-            </div>
+        {{ with .Content }}
+            {{ . }}
         {{ end }}
-    </div>
+
+        {{ if .Content }}</article>{{ end }}
+
+        <section class="page-list">
+            {{ with .Paginator.Pages }}
+                {{ range . }}
+                    <article class="page">
+                        {{ .Render "summary" }}
+                    </article>
+                {{ end }}
+            {{ else }}
+                <div>
+                    {{ i18n "no_posts" }}
+                </div>
+            {{ end }}
+        </section>
+    </section>
 {{ end }}
diff --git a/layouts/home.html b/layouts/home.html
index aa7e0bc..22be103 100644
--- a/layouts/home.html
+++ b/layouts/home.html
@@ -7,7 +7,7 @@
 
     {{ if .Site.Params.homepageLatestPosts }}
         <hr>
-        <div class="homepage-latest-posts">
+        <section class="homepage-latest-posts">
             <h1>
                 {{ i18n "latest_posts" }}
                 {{ partial "rss-link.html" . }}
@@ -16,6 +16,6 @@
             {{ partial "page-list.html" (.Paginate .Site.RegularPages).Pages }}
 
             {{ partial "pagination.html" . }}
-        </div>
+        </section>
     {{ end }}
 {{ end }}
diff --git a/layouts/section.html b/layouts/section.html
index 01ea9c8..e731da0 100644
--- a/layouts/section.html
+++ b/layouts/section.html
@@ -1,25 +1,27 @@
 {{ define "main" }}
-    <h1>
-        {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
-        {{ .Title | markdownify }}
-        {{ partial "rss-link.html" . }}
-    </h1>
+    <section>
+        <h1>
+            {{ with .Params.icon }}{{ partial "icon.html" . }}{{ end }}
+            {{ .Title | markdownify }}
+            {{ partial "rss-link.html" . }}
+        </h1>
 
-    {{ with .Content }}
-        {{ . }}
-    {{ end }}
-
-    <div class="list-page-container">
-        {{ with .Sections }}
-            <div class="sections">
-                {{ range . }}
-                    {{ .Render "summary" }}
-                {{ end }}
-            </div>
+        {{ with .Content }}
+            {{ . }}
         {{ end }}
 
-        {{ partial "page-list.html" .Paginator.Pages }}
-    </div>
+        <div class="list-page-container">
+            {{ with .Sections }}
+                <div class="sections">
+                    {{ range . }}
+                        {{ .Render "summary" }}
+                    {{ end }}
+                </div>
+            {{ end }}
 
-    {{ partial "pagination.html" . }}
+            {{ partial "page-list.html" .Paginator.Pages }}
+        </div>
+
+        {{ partial "pagination.html" . }}
+    </section>
 {{ end }}