diff --git a/html/index.html b/html/index.html
index 73acb0a..81fc2cd 100644
--- a/html/index.html
+++ b/html/index.html
@@ -1,12 +1,14 @@
 {{ template "head" . }}
 {{ template "nav" . }}
-<div class="lieu-container">
-    <h2>
-        <strong>Lieu</strong> the search for the new—endless
-    </h2>
-    <form class="search-container">
-        <input type="search" required minlength="1" name="q" placeholder="tracking" value="{{ .Data.Query }}" class="search-box">
-        <button type="submit" class="search-button"></button>
-    </form>
-</div>
+<main>
+    <div class="lieu-container">
+        <h2>
+            <strong>Lieu</strong> the search for the new—endless
+        </h2>
+        <form class="search-container">
+            <input type="search" required minlength="1" name="q" placeholder="tracking" value="{{ .Data.Query }}" class="search-box">
+            <button type="submit" class="search-button"></button>
+        </form>
+    </div>
+</main>
 {{ template "footer" . }}
diff --git a/html/nav.html b/html/nav.html
index 5df1a07..52db4d0 100644
--- a/html/nav.html
+++ b/html/nav.html
@@ -1,10 +1,13 @@
 {{ define "nav" }}
-<h1>
-    <a href="/">{{ .SiteName }}</a>
-</h1>
-<ul>
-    <li><a href="/">Search</a></li>
-    <li><a href="/webring">Webring</a></li>
-    <li><a href="/about">About</a></li>
-</ul>
+<header>
+    <h1>
+        <a href="/">{{ .SiteName }}</a>
+    </h1>
+    <ul>
+        <li><a href="/">Search</a></li>
+        <li><a href="/webring">Webring</a></li>
+        <li><a href="/about">About</a></li>
+    </ul>
+</header>
+<div class="clear"></div>
 {{ end }}
diff --git a/html/search.html b/html/search.html
index a1605a2..f209471 100644
--- a/html/search.html
+++ b/html/search.html
@@ -1,14 +1,14 @@
 {{ template "head" . }}
 {{ template "nav" . }}
+<main>
     <form method="GET" class="search-container">
         <input type="search" minlength="1" required name="q" value="{{ .Data.Query }}" class="search-box">
         <button type="submit" class="search-button"></button>
     </form>
-    <main>
     {{ range .Data.Pages }}
-        <div class="entry">
-            <a class="link" href="{{ .URL }}">{{ .Title }}</a>
-            <p>{{ .About }}</p>
-        </div>
+    <div class="entry">
+        <a class="link" href="{{ .URL }}">{{ .Title }}</a>
+        <p>{{ .About }}</p>
+    </div>
     {{ end }}
 {{ template "footer" . }}