diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php
index c19bd71..1ae4c6b 100644
--- a/resources/views/includes/footer.blade.php
+++ b/resources/views/includes/footer.blade.php
@@ -1,5 +1,5 @@
 <hr>
-<div class="footer">
+<div class="footer" role="contentinfo">
     <a href="https://www.w3schools.com/html/">
         <img src="{{ URL::asset('images/buttons/html_learn_it_today.gif') }}"
              width="88" height="31" alt="Learn HTML today!">&nbsp;
diff --git a/resources/views/layouts/default-hljs.blade.php b/resources/views/layouts/default-hljs.blade.php
index dab8a11..d3199b3 100644
--- a/resources/views/layouts/default-hljs.blade.php
+++ b/resources/views/layouts/default-hljs.blade.php
@@ -11,7 +11,7 @@
 </div> <!-- header -->
 
 <div id="pagebody">
-    <div id="content">
+    <div id="content" role="main">
 @yield('content')
     </div> <!-- content -->
     <div id="footer" class="pagefooter">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index be3ae92..715481e 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -11,7 +11,7 @@
 </div> <!-- header -->
 
 <div id="pagebody">
-    <div id="content">
+    <div id="content" role="main">
 @yield('content')
     </div> <!-- content -->
     <div id="footer" class="pagefooter">
diff --git a/resources/views/pages/bookmarks.blade.php b/resources/views/pages/bookmarks.blade.php
index d7d8283..55cc801 100644
--- a/resources/views/pages/bookmarks.blade.php
+++ b/resources/views/pages/bookmarks.blade.php
@@ -22,10 +22,10 @@
     @endphp
 
     @foreach ($categories as $category)
-        <table class="info-table">
+        <table class="info-table" role="presentation">
 
             <caption>
-                <h1>{{ $category->name }}</h1>
+                <h2>{{ $category->name }}</h2>
                 <hr>
             </caption>
 
diff --git a/resources/views/pages/computers.blade.php b/resources/views/pages/computers.blade.php
index 63e703f..99a8012 100644
--- a/resources/views/pages/computers.blade.php
+++ b/resources/views/pages/computers.blade.php
@@ -2,9 +2,9 @@
 @section('title', 'Computers')
 @section('description', 'Computers I own or have owned.')
 @section('content')
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Custom Build</h1><hr></td>
+            <td colspan="2"><h2>Custom Build</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -41,9 +41,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>MacBook Pro (2018)</h1><hr></td>
+            <td colspan="2"><h2>MacBook Pro (2018)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -76,9 +76,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Lenovo ThinkPad T430 (2012)</h1><hr></td>
+            <td colspan="2"><h2>Lenovo ThinkPad T430 (2012)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -111,9 +111,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>IBM ThinkPad X41 (2005)</h1><hr></td>
+            <td colspan="2"><h2>IBM ThinkPad X41 (2005)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -142,9 +142,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Dell OptiPlex GX1 (400L+, 1999)</h1><hr></td>
+            <td colspan="2"><h2>Dell OptiPlex GX1 (400L+, 1999)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -173,9 +173,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>IBM ThinkPad T40 (2003)</h1><hr></td>
+            <td colspan="2"><h2>IBM ThinkPad T40 (2003)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -204,9 +204,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>HP Compaq Elite 8100 CMT</h1><hr></td>
+            <td colspan="2"><h2>HP Compaq Elite 8100 CMT</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -239,9 +239,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Mac mini (2014)</h1><hr></td>
+            <td colspan="2"><h2>Mac mini (2014)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -270,9 +270,9 @@
             </td>
         </tr>
     </table>
-    <table class="computer">
+    <table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Fujitsu Milan (1996)</h1><hr></td>
+            <td colspan="2"><h2>Fujitsu Milan (1996)</h2><hr></td>
         </tr>
         <tr>
             <td>
@@ -297,9 +297,9 @@
             </td>
         </tr>
     </table>
-    <!--<table class="computer">
+    <!--<table class="computer" role="presentation">
         <tr>
-            <td colspan="2"><h1>Compaq Armada M300</h1><hr></td>
+            <td colspan="2"><h2>Compaq Armada M300</h2><hr></td>
         </tr>
         <tr>
             <td>
diff --git a/resources/views/pages/guestbook.blade.php b/resources/views/pages/guestbook.blade.php
index 13415b4..ac4c80e 100644
--- a/resources/views/pages/guestbook.blade.php
+++ b/resources/views/pages/guestbook.blade.php
@@ -13,13 +13,13 @@
         @include('components.errors.db-error')
     @else
     <br>
-    <table class="gb-entry-form-container">
+    <table class="gb-entry-form-container" role="presentation">
         <tr>
             <td>
                 <form method="POST" action="/guestbook">
                     @csrf
                     <x-honeypot/>
-                    <table class="gb-entry-form">
+                    <table class="gb-entry-form" role="presentation">
                         <tr>
                             <td>
                                 <label for="name"><strong>Name:</strong></label>
@@ -71,9 +71,9 @@
             ORDER BY id DESC
         ');
     @endphp
-    <h1>Entries <small>({{ count($entries) }} total)</small></h1>
+    <h2>Entries <small>({{ count($entries) }} total)</small></h2>
     @foreach ($entries as $entry)
-        <table class="gb-entry">
+        <table class="gb-entry" role="presentation">
             <tr>
                 <td>
                     Submitted by <strong>{{ $entry->name }}</strong>
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index b5fd55a..3220e5c 100644
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -4,7 +4,7 @@
 @section('content')
     <p>Hi! This my personal homepage on the <strong>W</strong>orld <strong>W</strong>ide <strong>W</strong>eb.
 
-    <table class="info-table">
+    <table class="info-table" role="presentation">
         <caption>
             <h2>Fun Facts</h2>
             <hr>
@@ -27,7 +27,7 @@
     </table>
     <br>
 
-    <table class="info-table">
+    <table class="info-table" role="presentation">
         <caption>
             <h2>Interests</h2>
             <hr>
@@ -47,7 +47,7 @@
     </table>
     <br>
 
-    <table class="info-table">
+    <table class="info-table" role="presentation">
         <caption>
             <h2>Contact &amp; social</h2>
             <hr>
@@ -71,7 +71,7 @@
     </table>
     <br>
 
-    <table class="info-table">
+    <table class="info-table" role="presentation">
         <caption>
             <h2>niko</h2>
             <hr>
@@ -84,5 +84,4 @@
             </td>
         </tr>
     </table>
-
 @stop
diff --git a/resources/views/pages/music.blade.php b/resources/views/pages/music.blade.php
index 775157a..8d2bd3b 100644
--- a/resources/views/pages/music.blade.php
+++ b/resources/views/pages/music.blade.php
@@ -24,7 +24,7 @@
         $top_tracks = json_decode(file_get_contents($api_root . '/lastfm/top'));
         $count = 0;
     @endphp
-    <table class="info-table">
+    <table class="info-table" role="presentation">
         <tr>
             <td colspan="4">
                 <h2>Last/Current Track:</h2>
diff --git a/resources/views/pages/projects.blade.php b/resources/views/pages/projects.blade.php
index 26a9a0d..aad454b 100644
--- a/resources/views/pages/projects.blade.php
+++ b/resources/views/pages/projects.blade.php
@@ -4,7 +4,7 @@
 @section('description', 'My projects')
 @section('content')
     @foreach ($categories as $category)
-    <h1>{{ $category['name']}}</h1>
+    <h2>{{ $category['name']}}</h2>
     @foreach ($category['projects'] as $project)
     <div>
             <a href="{{ $project['url'] }}">{{ $project['name'] }}</a> - {{ $project['description'] }}<br>
diff --git a/resources/views/pages/weather.blade.php b/resources/views/pages/weather.blade.php
index 369927f..a759534 100644
--- a/resources/views/pages/weather.blade.php
+++ b/resources/views/pages/weather.blade.php
@@ -29,9 +29,9 @@ function degreesToCompassDirection($degrees) {
         $updated = gmdate('H:i Y-m-d', $data->updated);
         $data = $data->current;
     @endphp
-<table class="info-table">
+<table class="info-table" role="presentation">
     <caption>
-        <h1>Local Weather</h1>
+        <h2>Local Weather</h2>
         <hr>
     </caption>
     <tr>