diff --git a/static/404.html b/static/404.html
index 02be3028..1300f4c1 100644
--- a/static/404.html
+++ b/static/404.html
@@ -38,10 +38,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="page-not-found">
-                <a href="#page-not-found">Page not found</a>
-            </h1>
+        <main id="page-not-found">
+            <h1><a href="#page-not-found">Page not found</a></h1>
             <p>Page not found on the web server. If you think this is a mistake, please
             <a href="https://github.com/GrapheneOS/grapheneos.org/issues">report an issue</a>.</p>
         </main>
diff --git a/static/build.html b/static/build.html
index 04e28cd2..96c7d3f6 100644
--- a/static/build.html
+++ b/static/build.html
@@ -41,10 +41,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="build">
-                <a href="#build">Build</a>
-            </h1>
+        <main id="build">
+            <h1><a href="#build">Build</a></h1>
 
             <p>This is a guide on building, modifying and contributing to GrapheneOS as a
             developer.</p>
diff --git a/static/contact.html b/static/contact.html
index bd06bec3..4886e751 100644
--- a/static/contact.html
+++ b/static/contact.html
@@ -40,10 +40,8 @@
                 <li aria-current="page"><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="contact">
-                <a href="#contact">Contact</a>
-            </h1>
+        <main id="contact">
+            <h1><a href="#contact">Contact</a></h1>
 
             <section id="community">
                 <h2>
diff --git a/static/donate.html b/static/donate.html
index 08d0fe3f..500ec4d5 100644
--- a/static/donate.html
+++ b/static/donate.html
@@ -40,10 +40,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="donate">
-                <a href="#donate">Donate</a>
-            </h1>
+        <main id="donate">
+            <h1><a href="#donate">Donate</a></h1>
 
             <section id="bitcoin">
                 <h2>
diff --git a/static/faq.html b/static/faq.html
index 46af9b01..193af2c7 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -41,10 +41,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="faq">
-                <a href="#faq">Frequently Asked Questions</a>
-            </h1>
+        <main id="faq">
+            <h1><a href="#faq">Frequently Asked Questions</a></h1>
 
             <p>This page contains answers to frequently asked questions about GrapheneOS. It's not
             an overview of the project or a list of interesting topics about GrapheneOS. Many of
diff --git a/static/features.html b/static/features.html
index 4b13973a..ff02ab60 100644
--- a/static/features.html
+++ b/static/features.html
@@ -40,10 +40,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="features">
-                <a href="#features">GrapheneOS feature overview</a>
-            </h1>
+        <main id="features">
+            <h1><a href="#features">GrapheneOS feature overview</a></h1>
 
             <p><strong>This is a newly created page (started 2020-12-05) and is in the process of
             being written. More details and links to more detailed documentation and relevant
diff --git a/static/index.html b/static/index.html
index ac25205a..17d5f0bb 100644
--- a/static/index.html
+++ b/static/index.html
@@ -41,10 +41,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="grapheneos">
-                <a href="#grapheneos">GrapheneOS</a>
-            </h1>
+        <main id="grapheneos">
+            <h1><a href="#grapheneos">GrapheneOS</a></h1>
 
             <p>GrapheneOS is an <a href="/source">open source</a> privacy and security focused
             mobile OS with Android app compatibility. It's focused on the research and development
diff --git a/static/install.html b/static/install.html
index df6cdf75..c8b544ff 100644
--- a/static/install.html
+++ b/static/install.html
@@ -40,10 +40,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="install">
-                <a href="#install">Install</a>
-            </h1>
+        <main id="install">
+            <h1><a href="#install">Install</a></h1>
 
             <p>This is a guide on installing GrapheneOS for the officially supported devices. It
             can be followed for both the official releases and custom builds.</p>
diff --git a/static/pdfviewer-privacy-policy.html b/static/pdfviewer-privacy-policy.html
index e2f20288..398f62b2 100644
--- a/static/pdfviewer-privacy-policy.html
+++ b/static/pdfviewer-privacy-policy.html
@@ -40,10 +40,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="pdfviewer-privacy-policy">
-                <a href="#pdfviewer-privacy-policy">PDF Viewer privacy policy</a>
-            </h1>
+        <main id="pdfviewer-privacy-policy">
+            <h1><a href="#pdfviewer-privacy-policy">PDF Viewer privacy policy</a></h1>
             <p>This app does not use any sensitive permissions, makes no internet connections and
             does not store any data other than preferences.</p>
             <p>See the <a href="https://github.com/GrapheneOS/PdfViewer">project's page on GitHub</a> for more information.</p>
diff --git a/static/releases.html b/static/releases.html
index a94a5926..3bd72879 100644
--- a/static/releases.html
+++ b/static/releases.html
@@ -43,10 +43,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="releases">
-                <a href="#releases">Releases</a>
-            </h1>
+        <main id="releases">
+            <h1><a href="#releases">Releases</a></h1>
 
             <nav id="table-of-contents">
                 <h2><a href="#table-of-contents">Table of contents</a></h2>
diff --git a/static/source.html b/static/source.html
index 3b76dbf1..7833f29b 100644
--- a/static/source.html
+++ b/static/source.html
@@ -40,10 +40,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="source">
-                <a href="#source">Source</a>
-            </h1>
+        <main id="source">
+            <h1><a href="#source">Source</a></h1>
             <p>The GrapheneOS sources are hosted in the
             <a href="https://github.com/GrapheneOS">GrapheneOS organization on GitHub</a>. Since
             there are many repositories, this page aims to provide a guide for it. See the
diff --git a/static/usage.html b/static/usage.html
index 273b6396..89f8c788 100644
--- a/static/usage.html
+++ b/static/usage.html
@@ -41,10 +41,8 @@
                 <li><a href="/contact">Contact</a></li>
             </ul>
         </nav>
-        <main>
-            <h1 id="usage">
-                <a href="#usage">Usage</a>
-            </h1>
+        <main id="usage">
+            <h1><a href="#usage">Usage</a></h1>
             <p>This is a guide covering some aspects of using GrapheneOS. It's not intended to be
             an overview of the privacy and security features implemented by GrapheneOS. It will
             only cover the user-facing impact of features, and most of the privacy and security