diff --git a/pydotorg/settings/pipeline.py b/pydotorg/settings/pipeline.py
index 187613447..0c0e45c86 100644
--- a/pydotorg/settings/pipeline.py
+++ b/pydotorg/settings/pipeline.py
@@ -19,7 +19,7 @@
         ),
         'output_filename': 'stylesheets/mq.css',
         'extra_context': {
-            'media': 'not print, braille, embossed, speech, tty',
+            'media': 'not print, speech',
         },
     },
     'no-mq': {
diff --git a/static/sass/style.css b/static/sass/style.css
index a58863817..6f8ce9ba5 100644
--- a/static/sass/style.css
+++ b/static/sass/style.css
@@ -190,7 +190,7 @@
   color: #4d4d4d !important;
   font-weight: normal;
   margin-bottom: 0.4375em;
-  padding: .4em .75em .35em;
+  padding: 0.4em 0.75em 0.35em;
   text-align: left;
   white-space: nowrap;
   text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.3);
@@ -350,6 +350,8 @@ button[type=submit], .search-button, #dive-into-python .flex-control-paging a, .
   display: block;
   color: #999;
   padding: .5em .75em .4em;
+  color: #999999;
+  padding: 0.5em 0.75em 0.4em;
   border: 1px solid #caccce;
   background-color: transparent; }
 
@@ -405,7 +407,7 @@ form, .header-banner, .success-stories-widget .quote-from {
 .slides,
 .flex-control-nav,
 .flex-direction-nav {margin: 0; padding: 0; list-style: none;} */
-/* FlexSlider Necessary Styles 
+/* FlexSlider Necessary Styles
 .flexslider {margin: 0; padding: 0;}
 .flexslider .slides > li {display: none; -webkit-backface-visibility: hidden;} /* Hide the slides before the JS is loaded. Avoids image jumping 
 .flexslider .slides img {width: 100%; display: block;}
@@ -497,8 +499,8 @@ ins {
 
 mark {
   display: inline-block;
-  padding: 0 .25em;
-  margin: 0 -.125em;
+  padding: 0 0.25em;
+  margin: 0 -0.125em;
   background-color: #ffb;
   /* light yellow */ }
 
@@ -597,7 +599,7 @@ sub {
   bottom: -0.25em; }
 
 pre, code, kbd, samp, var {
-  font-family: Consolas, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, sans-serif; }
+  font-family: Consolas, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace, sans-serif; }
 
 pre {
   /* Get spaces to display for PRE tags but dont let long lines break out of containers */
@@ -1033,7 +1035,7 @@ h2.not-column {
     color: #999;
     background: transparent;
     text-align: center;
-    padding: .5em .75em .4em;
+    padding: 0.5em 0.75em 0.4em;
     font-size: 1em;
     line-height: 1.75em;
     /* no fallback for .no-generatedcontent. This is a progressive enhancement */ }
@@ -1082,10 +1084,10 @@ h2.not-column {
 /* Used in both the main-header and the header-banner */
 .main-header {
   border-top: 1px solid #191919;
-  border-bottom: 1px solid #444; }
+  border-bottom: 1px solid #444444; }
   .main-header .container {
     text-align: center;
-    padding: .75em 1em; }
+    padding: 0.75em 1em; }
 
 /*h1*/
 .site-headline {
@@ -1181,15 +1183,15 @@ input#s,
 .menu-icon {
   display: inline-block;
   font-size: 1.25em;
-  margin: -.125em -.125em 0 0; }
+  margin: -0.125em -0.125em 0 0; }
 
 /*form*/
 .search-the-site {
   text-align: left;
-  padding: .35em .2em .3em; }
+  padding: 0.35em 0.2em 0.3em; }
   .search-the-site .icon-search:before {
     font-size: 1.75em;
-    margin: 0 .125em 0 .25em; }
+    margin: 0 0.125em 0 0.25em; }
   .search-the-site .no-touch {
     border-left: 0; }
 
@@ -1200,8 +1202,8 @@ input#s,
   color: #bbb;
   background-color: transparent;
   border: none;
-  margin: .125em 0;
-  padding: .4em 0 .3em;
+  margin: 0.125em 0;
+  padding: 0.4em 0 0.3em;
   -moz-border-radius: 0px;
   -webkit-border-radius: 0px;
   border-radius: 0px; }
@@ -1214,7 +1216,7 @@ input#s,
   .search-field:focus {
     background-color: #fff;
     color: #444;
-    padding: .4em .5em .3em;
+    padding: 0.4em 0.5em 0.3em;
     /* removed this line because it was making the height fluctuate on focus:
     @include pe-border( $color-top: darken( $darkerblue, 12% ), $color-bottom: lighten( $darkerblue, 8% ) ); */ }
   .search-field:blur {
@@ -1277,7 +1279,7 @@ input#s,
     .account-signin .tier-1 > a,
     .account-signin .tier-2 > a {
       display: block;
-      padding: .5em 1.5em .4em 1em;
+      padding: 0.5em 1.5em 0.4em 1em;
       position: relative; }
   .adjust-font-size .tier-1,
   .winkwink-nudgenudge .tier-1,
@@ -1595,7 +1597,7 @@ input#s,
 .adjust-font-size .tier-1 > a,
 .winkwink-nudgenudge .tier-1 > a,
 .account-signin .tier-1 > a {
-  padding: 1em 1em .875em; }
+  padding: 1em 1em 0.875em; }
 
 /* ! ===== Main navigation – In _layout.scss and _mixins.scss, as we don't display it here ===== */
 .main-navigation {
@@ -1862,7 +1864,7 @@ input#s,
     .sidebar-widget form button,
     .sidebar-widget form input[type=submit] {
       font-size: 1.125em;
-      padding: .4em 1em .35em; }
+      padding: 0.4em 1em 0.35em; }
   .text a:not(.button),
   .sidebar-widget a:not(.button) {
     display: inline;
@@ -1962,13 +1964,13 @@ input#s,
   .sidebar-widget samp {
     border-bottom: 1px solid #caccce;
     background-color: #e6e8ea;
-    padding: .125em .375em 0;
-    margin: 0 .25em; }
+    padding: 0.125em 0.375em 0;
+    margin: 0 0.25em; }
   .text code, .text kbd,
   .sidebar-widget code,
   .sidebar-widget kbd {
-    padding: .125em .375em 0;
-    margin: 0 -.0625em;
+    padding: 0.125em 0.375em 0;
+    margin: 0 -0.0625em;
     background: #e6e8ea;
     background: rgba(230, 232, 234, 0.5);
     -moz-box-shadow: 0 0 0.5em rgba(0, 0, 0, 0.1) inset;
@@ -2018,7 +2020,7 @@ table tr {
 table tr:nth-of-type(even), table tr.even {
   background-color: #f0f0f0; }
 table th, table td {
-  padding: .25em .5em .2em;
+  padding: 0.25em 0.5em 0.2em;
   border-left: 2px solid #fff; }
   table th:first-child, table td:first-child {
     border-left: none; }
@@ -2186,7 +2188,7 @@ table tfoot {
     .success-stories-widget blockquote a:hover, .success-stories-widget blockquote a:focus, .success-stories-widget blockquote a:active {
       color: #3776ab; }
 .success-stories-widget .quote-from td {
-  padding: .5em;
+  padding: 0.5em;
   vertical-align: middle; }
 .success-stories-widget .quote-from img {
   max-height: 5em; }
@@ -2225,7 +2227,7 @@ table tfoot {
   .applications-widget ul {
     border-top: 1px solid #caccce; }
   .applications-widget li {
-    padding: .5em 0 .4em;
+    padding: 0.5em 0 0.4em;
     border-bottom: 1px solid #caccce; }
 
 .shrubbery {
@@ -2279,7 +2281,7 @@ table tfoot {
       color: #3776ab;
       background-color: #f2f4f6;
       border-bottom: 1px solid #e6eaee;
-      padding: .6em .75em .5em; }
+      padding: 0.6em 0.75em 0.5em; }
       .pep-list li a:hover, .pep-list li a:focus, .pep-list li a:active {
         color: #222;
         background-color: #fefefe; }
@@ -2324,7 +2326,7 @@ table tfoot {
       color: #222; }
 
 .pep-type, .pep-num, .pep-title, .pep-owner {
-  padding: .5em .5em .4em;
+  padding: 0.5em 0.5em 0.4em;
   border-bottom: 1px solid #e3e7ec; }
 
 .footnote .label {
@@ -2334,7 +2336,7 @@ table tfoot {
 .info-key dt, .info-key dd {
   display: block;
   float: left;
-  padding: .5em .5em .4em; }
+  padding: 0.5em 0.5em 0.4em; }
 .info-key dt {
   width: 25%; }
 .info-key dd {
@@ -2352,14 +2354,14 @@ table tfoot {
         </li>
     </ul> */
 .pep-owner-header {
-  margin: 0 -.5em;
+  margin: 0 -0.5em;
   overflow: hidden;
   *zoom: 1; }
   .pep-owner-header .label {
     font-family: SourceSansProBold, Arial, sans-serif;
     float: left;
     width: 50%;
-    padding: .25em .5em .2em; }
+    padding: 0.25em 0.5em 0.2em; }
 
 .pep-owner-list li {
   background-color: #f2f4f6;
@@ -2371,7 +2373,7 @@ table tfoot {
 .pep-owner-list .owner-name, .pep-owner-list .owner-email {
   float: left;
   width: 50%;
-  padding: .5em .5em .4em; }
+  padding: 0.5em 0.5em 0.4em; }
 
 /* ! ===== Success Stories landing page ===== */
 .featured-success-story {
@@ -2498,7 +2500,7 @@ p.quote-by-organization {
   /* resets as this is an H3 element and it behaves differently */
   margin-top: .75em;
   margin-bottom: 1.25em;
-  padding: .5em .75em; }
+  padding: 0.5em 0.75em; }
 
 .event-description {
   padding: 1.3125em 0; }
@@ -2519,7 +2521,7 @@ p.quote-by-organization {
   -moz-border-radius: 0 0 8px 8px;
   -webkit-border-radius: 0;
   border-radius: 0 0 8px 8px;
-  padding: .75em 1em; }
+  padding: 0.75em 1em; }
 
 /*ul*/
 .twitter-stream li {
@@ -2550,7 +2552,7 @@ p.quote-by-organization {
     color: #666;
     font-size: 0.875em;
     vertical-align: baseline;
-    padding: .2em .4em .1em;
+    padding: 0.2em 0.4em 0.1em;
     background-color: #e6e8ea;
     border-top: 1px solid #f2f4f6;
     border-bottom: 1px solid #caccce; }
@@ -2573,13 +2575,13 @@ p.quote-by-organization {
 /* ! ===== Stylized lists of items, used on Downloads and others ===== */
 .list-row-headings {
   font-family: SourceSansProBold, Arial, sans-serif;
-  padding: .5em .5em .4em .75em;
+  padding: 0.5em 0.5em 0.4em 0.75em;
   margin-right: 1.25em; }
 
 .list-row-container {
   border: 1px solid #caccce; }
   .list-row-container li {
-    padding: .5em .5em .4em .75em;
+    padding: 0.5em 0.5em 0.4em 0.75em;
     margin-right: 0; }
     .list-row-container li:nth-child(odd) {
       background-color: #f2f4f6; }
@@ -2644,7 +2646,7 @@ p.quote-by-organization {
   .previous-next .prev-button,
   .previous-next .next-button {
     display: block;
-    padding: .5em .75em .4em;
+    padding: 0.5em 0.75em 0.4em;
     margin-bottom: 0.875em; }
     .previous-next .prev-button:not(.disabled):hover, .previous-next .prev-button:not(.disabled):focus,
     .previous-next .next-button:not(.disabled):hover,
@@ -2728,7 +2730,7 @@ p.quote-by-organization {
         <p role="alert">Can’t find what you’re looking for? <a href="#">Try our comprehensive Help section</a></p>
     </div>*/
 .user-feedback {
-  padding: .75em 1em .65em;
+  padding: 0.75em 1em 0.65em;
   margin-bottom: 1.3125em;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
@@ -2789,7 +2791,7 @@ p.quote-by-organization {
   font-size: 0.58333em;
   text-transform: uppercase;
   letter-spacing: .0625em;
-  padding: .45em .5em 0;
+  padding: 0.45em 0.5em 0;
   margin-right: .25em; }
 .listing-company .listing-removed {
   display: inline-block;
@@ -2832,7 +2834,7 @@ p.quote-by-organization {
 
 /* ! ===== Inner pages ===== */
 .breadcrumbs {
-  padding: .5em 0;
+  padding: 0.5em 0;
   border-bottom: 1px solid #caccce; }
   .breadcrumbs li {
     display: -moz-inline-stack;
@@ -2856,7 +2858,7 @@ p.quote-by-organization {
 
 .section-nav a {
   display: block;
-  padding: .3em 0 .2em; }
+  padding: 0.3em 0 0.2em; }
 
 .psf-sidebar-widget {
   color: #f2f4f6;
@@ -2930,7 +2932,7 @@ p.quote-by-organization {
 
 .psf-codeofconduct {
   font-size: 0.875em;
-  padding: .5em 1em;
+  padding: 0.5em 1em;
   margin-bottom: 1em;
   background-color: #fff;
   -moz-box-shadow: 0.25em 0.25em 0.75em rgba(0, 0, 0, 0.15);
@@ -2957,7 +2959,7 @@ p.quote-by-organization {
 .main-footer .jump-link, .sitemap a, .footer-links a {
   display: block;
   text-align: center;
-  padding: .5em .75em .4em; }
+  padding: 0.5em 0.75em 0.4em; }
 
 .main-footer {
   clear: both;
@@ -2965,7 +2967,7 @@ p.quote-by-organization {
   background-color: #e6e8ea;
   border-top: 1px solid #d8dbde; }
   .main-footer .container {
-    padding: 0 .75em .75em; }
+    padding: 0 0.75em 0.75em; }
   .main-footer a {
     color: #666; }
     .main-footer a:hover, .main-footer a:focus {
@@ -2973,7 +2975,7 @@ p.quote-by-organization {
   .main-footer .jump-link {
     background-color: #e0e3e5; }
   .main-footer a.jump-link {
-    margin: .75em 0;
+    margin: 0.75em 0;
     border-top: 1px solid #e6e8ea;
     border-bottom: 1px solid #dbdee1; }
     .main-footer a.jump-link:hover, .main-footer a.jump-link:focus {
@@ -2987,7 +2989,7 @@ p.quote-by-organization {
     margin-bottom: 1.3125em; }
     .sitemap .tier-1 > a {
       color: #3776ab;
-      padding: .4em .5em .3em;
+      padding: 0.4em 0.5em 0.3em;
       font-family: Flux-Bold, SourceSansProBold, Arial, sans-serif;
       font-size: 1.25em;
       margin-top: 0.875em;
@@ -3184,7 +3186,7 @@ span.highlighted {
     background-color: #fff; }
   .touch .flex-control-nav a {
     /* Larger touch target */
-    padding: .5em .75em; }
+    padding: 0.5em 0.75em; }
 
 /*<ul class="flex-direction-nav">
     <li>
@@ -3236,7 +3238,7 @@ span.highlighted {
     display: none; } }
 /* ! ==== No JS warning message... more of a suggestion, really ==== */
 #nojs, #oldie-warning {
-  padding: .75em .75em .65em;
+  padding: 0.75em 0.75em 0.65em;
   text-align: center;
   background-color: #c33; }
   #nojs p, #oldie-warning p {
diff --git a/static/sass/style.scss b/static/sass/style.scss
index 4fd9a3efd..02fc46146 100644
--- a/static/sass/style.scss
+++ b/static/sass/style.scss
@@ -1160,6 +1160,10 @@ $colors: $blue, $psf, $yellow, $green, $purple, $red;
         img { max-height: 5em; }
 
         p { font-size: px2em( 14px ); }
+        border-width: 0;
+        width: 0;
+        border-spacing: 0;
+
     }
 }
 
diff --git a/templates/base.html b/templates/base.html
index 578dc1204..0fc6f7259 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -32,7 +32,6 @@
     <meta name="HandheldFriendly" content="True">
     <meta name="format-detection" content="telephone=no">
     <meta http-equiv="cleartype" content="on">
-    <meta http-equiv="imagetoolbar" content="false">{# Kills IE6's images toolbar. Still useful. #}
 
     <script async
             src="https://media.ethicalads.io/media/client/v1.4.0/ethicalads.min.js"
@@ -47,7 +46,7 @@
     {% comment %}
     {# equivalent to: #}
     <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/style.css" title="default">
-    <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/mq.css" media="not print, braille, embossed, speech, tty">
+    <link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/mq.css" media="not print, speech">
     {% endcomment %}
 
     <!--[if (lte IE 8)&(!IEMobile)]>
@@ -172,7 +171,7 @@
         <!-- Sister Site Links -->
         <div id="top" class="top-bar do-not-print">
 
-            <nav class="meta-navigation container" role="navigation">
+            <nav class="meta-navigation container">
 
                 {# Allow Screen readers (hidden for all others) to skip the navigation and get to the main content #}
                 <div class="skip-link screen-reader-text">
@@ -195,7 +194,7 @@
         </div>
 
         <!-- Header elements -->
-        <header class="main-header" role="banner">
+        <header class="main-header">
             <div class="container">
 
                 <h1 class="site-headline">
@@ -212,7 +211,7 @@ <h1 class="site-headline">
                                 <span aria-hidden="true" class="icon-search"></span>
 
                                 <label class="screen-reader-text" for="id-search-field">Search This Site</label>
-                                <input id="id-search-field" name="q" type="search" role="textbox" class="search-field" placeholder="Search" value="{{ request.GET.q }}" tabindex="1">
+                                <input id="id-search-field" name="q" type="search" class="search-field" placeholder="Search" value="{{ request.GET.q }}" tabindex="1">
 
                                 <button type="submit" name="submit" id="submit" class="search-button" title="Submit this Search" tabindex="3">
                                     GO
@@ -227,9 +226,9 @@ <h1 class="site-headline">
                                 <li class="tier-1 last" aria-haspopup="true">
                                     <a href="#" class="action-trigger"><strong><small>A</small> A</strong></a>
                                     <ul class="subnav menu">
-                                        <li class="tier-2 element-1" role="treeitem"><a class="text-shrink" title="Make Text Smaller" href="javascript:;">Smaller</a></li>
-                                        <li class="tier-2 element-2" role="treeitem"><a class="text-grow" title="Make Text Larger" href="javascript:;">Larger</a></li>
-                                        <li class="tier-2 element-3" role="treeitem"><a class="text-reset" title="Reset any font size changes I have made" href="javascript:;">Reset</a></li>
+                                        <li class="tier-2 element-1" role="menuitem"><a class="text-shrink" title="Make Text Smaller" href="javascript:;">Smaller</a></li>
+                                        <li class="tier-2 element-2" role="menuitem"><a class="text-grow" title="Make Text Larger" href="javascript:;">Larger</a></li>
+                                        <li class="tier-2 element-3" role="menuitem"><a class="text-reset" title="Reset any font size changes I have made" href="javascript:;">Reset</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -238,10 +237,10 @@ <h1 class="site-headline">
                                 <li class="tier-1 last" aria-haspopup="true">
                                     <a href="#" class="action-trigger">Socialize</a>
                                     <ul class="subnav menu">
-                                        <li class="tier-2 element-1" role="treeitem"><a href="https://www.linkedin.com/company/python-software-foundation/"><i aria-hidden="true" class="fa fa-linkedin-square"></i>LinkedIn</a></li>
-                                        <li class="tier-2 element-2" role="treeitem"><a href="https://fosstodon.org/@ThePSF"><span aria-hidden="true" class="icon-mastodon"></span>Mastodon</a></li>
-                                        <li class="tier-2 element-3" role="treeitem"><a href="/community/irc/"><span aria-hidden="true" class="icon-freenode"></span>Chat on IRC</a></li>
-                                        <li class="tier-2 element-4" role="treeitem"><a href="https://twitter.com/ThePSF"><span aria-hidden="true" class="icon-twitter"></span>Twitter</a></li>
+                                        <li class="tier-2 element-1" role="menuitem"><a href="https://www.linkedin.com/company/python-software-foundation/"><i aria-hidden="true" class="fa fa-linkedin-square"></i>LinkedIn</a></li>
+                                        <li class="tier-2 element-2" role="menuitem"><a href="https://fosstodon.org/@ThePSF"><span aria-hidden="true" class="icon-mastodon"></span>Mastodon</a></li>
+                                        <li class="tier-2 element-3" role="menuitem"><a href="/community/irc/"><span aria-hidden="true" class="icon-freenode"></span>Chat on IRC</a></li>
+                                        <li class="tier-2 element-4" role="menuitem"><a href="https://twitter.com/ThePSF"><span aria-hidden="true" class="icon-twitter"></span>Twitter</a></li>
                                     </ul>
                                 </li>
                             </ul>
@@ -250,7 +249,7 @@ <h1 class="site-headline">
                     </div><!-- end options-bar -->
                 </div>
 
-                <nav id="mainnav" class="{% block main-nav_attributes %}python-navigation{% endblock %} main-navigation do-not-print" role="navigation">
+                <nav id="mainnav" class="{% block main-nav_attributes %}python-navigation{% endblock %} main-navigation do-not-print">
                     {% block main_navigation %}
                         {% sitetree_menu from "main" include "python-meta" template "sitetree/submenu.html" %}
                     {% endblock main_navigation %}
@@ -301,7 +300,7 @@ <h1 class="site-headline">
 
         <!-- Footer and social media list -->
         {% block footer %}
-        <footer id="site-map" class="main-footer" role="contentinfo">
+        <footer id="site-map" class="main-footer">
             <div class="main-footer-links">
                 <div class="container">
 
diff --git a/templates/components/success-story.html b/templates/components/success-story.html
index bf38281c2..7e929c333 100644
--- a/templates/components/success-story.html
+++ b/templates/components/success-story.html
@@ -15,7 +15,7 @@ <h2 class="widget-title"><span aria-hidden="true" class="icon-success-stories"><
                                 <a href="{{ story.get_absolute_url }}">{{ story.pull_quote }}</a>
                             </blockquote>
 
-                            <table cellpadding="0" cellspacing="0" border="0" width="100%" class="quote-from">
+                            <table class="quote-from">
                                 <tbody>
                                     <tr>
                                         {% comment %}
diff --git a/templates/jobs/base.html b/templates/jobs/base.html
index 770fb7040..07c387632 100644
--- a/templates/jobs/base.html
+++ b/templates/jobs/base.html
@@ -26,9 +26,9 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
         <a href="{% url 'jobs:job_types' %}">Types</a>
         <ul class="subnav menu" role="menu" aria-hidden="true">
             {% for t in active_types %}
-            <li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
+            <li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
             {% empty %}
-            <li class="tier-2" role="treeitem">No Active Types</li>
+            <li class="tier-2" role="menuitem">No Active Types</li>
             {% endfor %}
         </ul>
     </li>
@@ -36,18 +36,18 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
         <a href="{% url 'jobs:job_categories' %}">Categories</a>
         <ul class="subnav menu" role="menu" aria-hidden="true">
             {% for c in active_categories %}
-            <li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
+            <li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
             {% empty %}
-            <li class="tier-2" role="treeitem">No Active Categories</li>
+            <li class="tier-2" role="menuitem">No Active Categories</li>
             {% endfor %}
         </ul>
     </li>
     <li class="tier-1 element-4 {% if view.job_location_view %}current_item selected{% endif %}">
         <a href="{% url 'jobs:job_locations' %}">Locations</a>
         <ul class="subnav menu" role="menu" aria-hidden="true">
-            <li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
+            <li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
             {% for l in active_locations %}
-            <li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
+            <li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
                 {% if l.region and l.region != l.city %}
                     {{ l.city }}, {{ l.region }} &ndash; {{ l.country }}
                 {% else %}
@@ -55,7 +55,7 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
                 {% endif %}
             </a></li>
             {% empty %}
-            <li class="tier-2" role="treeitem">No Active Locations</li>
+            <li class="tier-2" role="menuitem">No Active Locations</li>
             {% endfor %}
         </ul>
     </li>
diff --git a/templates/minutes/minutes_detail.html b/templates/minutes/minutes_detail.html
index f225b8d84..6aaf54232 100644
--- a/templates/minutes/minutes_detail.html
+++ b/templates/minutes/minutes_detail.html
@@ -46,7 +46,7 @@ <h1>PSF Meeting Minutes for {{ minutes.date|date }}</h1>
         <h2>{{ minutes.date.year }}</h2>
         <ul class="section-nav menu" role="menu" aria-hidden="false">
             {% for item in same_year_minutes %}
-            <li class="tier-1 element-1" role="treeitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
+            <li class="tier-1 element-1" role="menuitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
             {% endfor %}
         </ul>
 
diff --git a/templates/sitetree/footer_children.html b/templates/sitetree/footer_children.html
index 61dc17c8a..afd21ffb5 100644
--- a/templates/sitetree/footer_children.html
+++ b/templates/sitetree/footer_children.html
@@ -1,6 +1,6 @@
 {% load sitetree %}
 
-<ul class="subnav menu">
+<ul class="subnav menu" role="tree">
     {% for item in sitetree_items %}
         <li class="tier-2 element-{{ forloop.counter }}" role="treeitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
     {% endfor %}
diff --git a/templates/sitetree/sidebar_menu.html b/templates/sitetree/sidebar_menu.html
index 3e6982b52..96ebf8e03 100644
--- a/templates/sitetree/sidebar_menu.html
+++ b/templates/sitetree/sidebar_menu.html
@@ -2,7 +2,7 @@
 
 <ul class="section-nav menu" role="menu" aria-hidden="false">
     {% for item in sitetree_items %}
-    <li class="{{ item.alias }} {% if item.is_current or item.in_current_branch %}{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:'current_branch selected' }}{% endif %}" role="treeitem">
+    <li class="{{ item.alias }} {% if item.is_current or item.in_current_branch %}{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:'current_branch selected' }}{% endif %}" role="menuitem">
         <a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}" class="{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:' current_branch' }}">{{ item.title_resolved }}</a>
 
     {% if item.has_children %}
diff --git a/templates/sitetree/submenu_children.html b/templates/sitetree/submenu_children.html
index 7b83245c0..7dcc683e9 100644
--- a/templates/sitetree/submenu_children.html
+++ b/templates/sitetree/submenu_children.html
@@ -2,6 +2,6 @@
 
 <ul class="subnav menu" role="menu" aria-hidden="true">
     {% for item in sitetree_items %}
-        <li class="tier-2 element-{{ forloop.counter }}" role="treeitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
+        <li class="tier-2 element-{{ forloop.counter }}" role="menuitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
     {% endfor %}
 </ul>