diff --git a/_includes/header.html b/_includes/header.html
index 33e60908..cd4a38ac 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,23 +1,24 @@
 <header id="site-header">
   {% assign current = page.url | downcase | split: '/' %}
-  <div class="top-navigation">
+  <nav class="top-navigation">
     <div>
       <div class="navigation">
+        <a class="skip-link" href="#main-content">Skip to main content</a>
         <a {% if current[1] == 'contributing' %}class='active'{% endif %} href="{{ "/contributing" | relative_url  }}">Contributing</a>
         <a href="https://blog.adafruit.com/category/circuitpython">News</a>
         <a {% if current[1] == 'awesome' %}class='active'{% endif %} href="{{ "/awesome" | relative_url  }}">Awesome</a>
         <a href="https://www.adafruitdaily.com/category/circuitpython">Newsletter</a>
         <a href="https://forums.adafruit.com/viewforum.php?f=60">Help</a>
         <span>
-            <a href="https://adafru.it/discord"><i class="fab fa-discord"></i></a>
-            <a href="{{ '/feed.rss' | relative_url  }}" type="application/rss+xml"><i class="fas fa-rss-square"></i></a>
+            <a href="https://adafru.it/discord" aria-label="Discord"><i class="fab fa-discord"></i></a>
+            <a href="{{ '/feed.rss' | relative_url  }}" type="application/rss+xml" aria-label="RSS Feed"><i class="fas fa-rss-square"></i></a>
         </span>
       </div>
     </div>
-  </div>
+  </nav>
   <div class="wrapper">
     <div class="content">
-      <div class="site-brand">
+      <nav class="site-brand">
         <div class="site-logo">
           <a href="{{ "/" | relative_url  }}">
             <img src="{{ "/assets/images/logo.png" | relative_url }}"
@@ -29,14 +30,14 @@
           </a>
         </div>
         <div class="site-navigation">
-          <a {% if current[1] == 'downloads' %}class='active'{% endif %} href="{{ "/downloads" | relative_url  }}">Downloads</a>
-          <a {% if current[1] == 'libraries' %}class='active'{% endif %} href="{{ "/libraries" | relative_url  }}">Libraries</a>
-          <a {% if current[1] == 'blinka' %}class='active'{% endif %} href="{{ "/blinka" | relative_url  }}">Blinka</a>
+          <a {% if current[1] == 'downloads' %}class="active" aria-current="page"{% endif %} href="{{ "/downloads" | relative_url  }}">Downloads</a>
+          <a {% if current[1] == 'libraries' %}class="active" aria-current="page"{% endif %} href="{{ "/libraries" | relative_url  }}">Libraries</a>
+          <a {% if current[1] == 'blinka' %}class="active" aria-current="page"{% endif %} href="{{ "/blinka" | relative_url  }}">Blinka</a>
         </div>
         <div class="get-started">
           <a href="https://learn.adafruit.com/welcome-to-circuitpython">Get Started</a>
         </div>
-      </div>
+      </nav>
     </div>
   </div>
   <div class="bottom-bar"></div>
diff --git a/_includes/header_mobile.html b/_includes/header_mobile.html
index 59f728e0..9318064f 100644
--- a/_includes/header_mobile.html
+++ b/_includes/header_mobile.html
@@ -14,13 +14,13 @@
       <div class="menu-toggle">
         <a href="#" id="mobile-menu-button">
           <span class="sr-only">Open Mobile Menu</span>
-          <i class="fa fa-bars" aria-hidden='true'></i>
+          <i class="fa fa-bars" aria-hidden="true"></i>
         </a>
       </div>
     </div>
     <div class="clear"></div>
     <nav id="mobile-menu-contents" role="navigation" class="hidden"
-      aria-expanded='false' aria-label='Mobile Menu'>
+      aria-expanded="false" aria-label="Mobile Menu">
       <ul>
         <li><a {% if current[1] == 'downloads' %}class='active'{% endif %}
                                   href="{{ "/downloads" | relative_url  }}">Downloads</a></li>
diff --git a/_layouts/default.html b/_layouts/default.html
index 35551f0b..49fdb4de 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -6,7 +6,7 @@
   <body>
     {% include header.html %}
     {% include header_mobile.html %}
-    <div class="wrapper">
+    <div id="main-content" class="wrapper">
       {{ content }}
     </div>
 
diff --git a/assets/sass/layout/_header.scss b/assets/sass/layout/_header.scss
index d31d6d13..6fd51d43 100644
--- a/assets/sass/layout/_header.scss
+++ b/assets/sass/layout/_header.scss
@@ -34,7 +34,7 @@
 .top-navigation {
   background-color: #151515;
   padding-top: 10px;
-
+  
   .navigation {
     display: flex;
     align-items: flex-end;
@@ -42,12 +42,25 @@
 
     a {
       font-size: 16px;
-      color: #999999;
+      color: #aaa;
 
       &:hover {
         color: #fff;
       }
     }
+
+    a.skip-link {
+      margin-left: 0;
+      position: absolute;
+      left: 10px;
+      top: 10px;
+      transform: translateY(-200%);
+      transition: transform 0.6s;
+      &:focus {
+        transform: translateY(0%);
+      }
+    }
+
     &> a {
       margin-left: 40px;
     }
@@ -94,7 +107,7 @@
 
   a {
     margin-left: 40px;
-    color: #999999;
+    color: #aaa;
 
     &:hover {
       color: #fff;
