diff --git a/_includes/nav.html b/_includes/nav.html
index f30ff5f4..42d8d834 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
   <div class="container">
-    <a class="navbar-brand" href="/"><img src="/assets/img/layout/privacy-guides-logo.png" alt="{{ site.title }}" width="243" height="32" /> <span class="badge badge-secondary ml-2">Beta</span></a>
+    <h1><a class="navbar-brand" href="/"><img src="/assets/img/layout/privacy-guides-logo.png" alt="{{ site.title }}" width="243" height="32" /></a></h1>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
@@ -20,5 +20,6 @@
           <a class="nav-link" href="/privacy/">Privacy</a>
         </li>
       </ul>
+    </div>
   </div>
 </nav>
diff --git a/index.html b/index.html
index 56e13239..c5d976dc 100644
--- a/index.html
+++ b/index.html
@@ -6,11 +6,11 @@ layout: default
   <div class="container">
     <div class="row">
       <div class="col-lg-8 col-12 mt-4">
-        <h2 class="display-4 pt-1 mt-5">The guide to restoring your online privacy.</h2>
+        <h1 class="display-4 pt-1 mt-5">The guide to restoring your online privacy.</h1>
         <h5 class="mt-5">Massive organizations are monitoring your online activities. Privacy Guides is your central privacy and security resource to protect yourself online.</h5>
       </div>
       <div class="col-4 p-3 d-none d-lg-block">
-        <img src="/assets/img/layout/surveillance-eye-colorbg.svg" width="100%">
+        <img src="/assets/img/layout/surveillance-eye-colorbg.svg" alt="Crossed out eye surveillance icon" class="w-100">
       </div>
     </div>
   </div>
@@ -27,13 +27,13 @@ layout: default
       <a href="/privacy/" class="btn btn-primary mt-2">Learn More About Privacy</a>
     </div>
     <div class="col-2 d-none d-lg-block">
-      <img src="/assets/img/layout/phone-like-icon.svg" width="100%">
+      <img src="/assets/img/layout/phone-like-icon.svg" alt="Phone icon with like heart" class="w-100">
     </div>
   </div>
 
   <div class="row mt-5">
     <div class="col-2 d-none d-lg-block">
-      <img src="/assets/img/layout/plan-icon.svg" width="100%">
+      <img src="/assets/img/layout/plan-icon.svg" alt="Informational planning icon" class="w-100">
     </div>
     <div class="col-lg-10 col-12">
       <h2 class="mt-4">What should I do?</h2>
@@ -59,7 +59,7 @@ layout: default
       <a href="/devices/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-phone-laptop"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-phone-laptop mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">Devices</p>
           </div>
         </div>
@@ -69,7 +69,7 @@ layout: default
       <a href="/browsers/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-compass"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-compass mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">Browsers</p>
           </div>
         </div>
@@ -79,7 +79,7 @@ layout: default
       <a href="/software/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-file-code"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-file-code mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">Software</p>
           </div>
         </div>
@@ -89,7 +89,7 @@ layout: default
       <a href="/os/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-desktop"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-desktop mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">OS</p>
           </div>
         </div>
@@ -99,7 +99,7 @@ layout: default
       <a href="/providers/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-cloud"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-cloud mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">Providers</p>
           </div>
         </div>
@@ -109,7 +109,7 @@ layout: default
       <a href="/services/" class="text-secondary">
         <div class="card text-center mx-auto" style="width: 160px;">
           <div class="card-body">
-            <h5 class="card-title display-4"><i class="fal fa-server"></i></h5>
+            <span class="card-title display-4"><i class="fal fa-server mb-3" aria-hidden="true"></i></span>
             <p class="card-subtitle">Services</p>
           </div>
         </div>
@@ -122,7 +122,7 @@ layout: default
 <div class="container">
   <div class="row mt-5">
     <div class="col-2 d-none d-lg-block">
-      <img src="/assets/img/layout/plan-icon.svg" width="100%">
+      <img src="/assets/img/layout/plan-icon.svg" alt="Informational planning icon" class="w-100">
     </div>
     <div class="col-lg-10 col-12">
       <h2 class="mt-4">What should I do?</h2>