diff --git a/client/public/index.lisp b/client/public/index.lisp
index 708a4fd..88d60fb 100644
--- a/client/public/index.lisp
+++ b/client/public/index.lisp
@@ -17,19 +17,19 @@
           :href  "/css/general.css"
           :media 'all))
   (body
-    (div :id "app"
+    (main
       (nav
         (a :href "/" "Home") "|"
         (a :href "/posts" "Posts") "|"
         (a :href "/qa" "QA"))
-      (h1 "Home")
-      (div
-        (p "Hi there, good to see you on my website.
-            My name is Raymon Zutekouw; Self-taught programmer by heart.")
-        (p "Building software and exploring the wide variety of tools (or making them) is my passion.
-            To see it in action, checkout the stuff I make on "
-          (a :href "https://github.com/Raymonzut" "GitHub."))
+      (header
+        (h1 "Home"))
+      (p "Hi there, good to see you on my website.
+          My name is Raymon Zutekouw; Self-taught programmer by heart.")
+      (p "Building software and exploring the wide variety of tools (or making them) is my passion.
+          To see it in action, checkout the stuff I make on "
+        (a :href "https://github.com/Raymonzut" "GitHub."))
 
-        (p "The projects that may be useful to others are open source; for inspiring others and improving each others work.
-            That is why I am a huge fan of "
-          (a :href "https://www.gnu.org/philosophy/free-sw.en.html" "free software"))))))
+      (p "The projects that may be useful to others are open source; for inspiring others and improving each others work.
+          That is why I am a huge fan of "
+        (a :href "https://www.gnu.org/philosophy/free-sw.en.html" "free software")))))
diff --git a/client/public/qa.lisp b/client/public/qa.lisp
index 7a33e03..4fd1e9c 100644
--- a/client/public/qa.lisp
+++ b/client/public/qa.lisp
@@ -17,13 +17,14 @@
           :href  "/css/general.css"
           :media 'all))
   (body
-    (div :id "app"
+    (main
       (nav
         (a :href "/" "Home") "|"
         (a :href "/posts" "Posts") "|"
         (a :href "/qa" "QA"))
-      (h1 "Questions and answers")
-      (div
+      (article
+        (header
+         (h1 "Questions and answers"))
         (p :class "question" "What is this site about?")
         (p                   "This site is about me and the stuff I make")