diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 8a512223d7..4a28e89a70 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -929,7 +929,7 @@ section.wiki {
     }
   }
 
-  section.delete {
+  div.delete {
     padding: 40px;
   }
 
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index 4fc2035874..fe25581a35 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -19,6 +19,8 @@ ${page_title_breadcrumbs(course_name())}
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
 
+<%block name="nav_skip">#course-content</%block>
+
 <%include file="../discussion/_js_head_dependencies.html" />
 
   % if show_chat:
@@ -202,7 +204,7 @@ ${fragment.foot_html()}
     </div>
 % endif
 
-    <section class="course-content">
+    <section class="course-content" id="course-content">
       ${fragment.body_html()}
     </section>
   </div>
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index cd5cf0987f..f5b445eb65 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -5,6 +5,8 @@
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="pagetitle">${_("Instructor Dashboard")}</%block>
+<%block name="nav_skip">#instructor-dashboard-content</%block>
+
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
@@ -124,7 +126,7 @@ function goto( mode)
   %endif
 
 
-  <section class="instructor-dashboard-content">
+  <section class="instructor-dashboard-content" id="instructor-dashboard-content">
     <h1>${_("Instructor Dashboard")}</h1>
 
     <h2 class="navbar">[ <a href="#" onclick="goto('Grades');" class="${modeflag.get('Grades')}">Grades</a> |
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 2339e63c8d..1e3fe575ba 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -10,6 +10,7 @@
 <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
 
 <%block name="pagetitle">${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</%block>
+<%block name="nav_skip">#course-info-progress</%block>
 
 <%!
     from django.core.urlresolvers import reverse
@@ -32,7 +33,7 @@ ${progress_graph.body(grade_summary, course.grade_cutoffs, "grade-detail-graph",
 <div class="container">
   <div class="profile-wrapper">
 
-    <div class="course-info">
+    <div class="course-info" id="course-info-progress" aria-label="${_('Course Progress')}">
       <header>
       <h1>${_("Course Progress for Student '{username}' ({email})").format(username=student.username, email=student.email)}</h1>
       </header>
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index a2104b5d7a..47e2abd810 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -10,6 +10,7 @@
 
 <%block name="pagetitle">${_("Dashboard")}</%block>
 <%block name="bodyclass">view-dashboard is-authenticated</%block>
+<%block name="nav_skip">#my-courses</%block>
 
 <%block name="js_extra">
   <script type="text/javascript">
@@ -211,7 +212,7 @@
 
   </section>
 
-  <section class="my-courses">
+  <section class="my-courses" id="my-courses">
     <header>
       <h2>${_("Current Courses")}</h2>
     </header>
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index 4d4c350fe0..87c24fe2f1 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -7,6 +7,7 @@
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">discussion</%block>
 <%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
+<%block name="nav_skip">#discussion-container</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index d9dcdde13b..4ea8353090 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -18,6 +18,7 @@
 ## 6. And tests go in lms/djangoapps/instructor/tests/
 
 <%block name="pagetitle">${_("Instructor Dashboard")}</%block>
+<%block name="nav_skip">#instructor-dashboard-content</%block>
 
 <%block name="headextra">
   <%static:css group='style-course-vendor'/>
@@ -58,7 +59,7 @@
   ## not checking access because if user can see this, they are at least course staff (with studio edit access)
   <div class="studio-edit-link"><a href="${studio_url}" target="_blank">${_('Edit Course In Studio')}</a></div>
 %endif
-<section class="instructor-dashboard-content-2">
+<section class="instructor-dashboard-content-2" id="instructor-dashboard-content">
 
   <h1>${_("Instructor Dashboard")}</h1>
   <hr />
diff --git a/lms/templates/main.html b/lms/templates/main.html
index e9595ad4fc..e013a5530a 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -102,7 +102,7 @@
 </head>
 
 <body class="<%block name='bodyclass'/> lang_${LANGUAGE_CODE}">
-  <a class="nav-skip" href="#content">${_("Skip to this view's content")}</a>
+  <a class="nav-skip" href="<%block name="nav_skip">#content</%block>">${_("Skip to this view's content")}</a>
 
   <%include file="mathjax_accessible.html" />
 
diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html
index 9c33b9048e..71fb623660 100644
--- a/lms/templates/main_django.html
+++ b/lms/templates/main_django.html
@@ -28,7 +28,7 @@
 </head>
 
 <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
-  <a class="nav-skip" href="#content">{% trans "Skip to this view's content" %}</a>
+  <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to this view's content" %}</a>
   {% include "navigation.html" %}
   <div class="content-wrapper" id="content">
     {% block body %}{% endblock %}
diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html
index ba5458f039..bb1e53b27e 100644
--- a/lms/templates/wiki/article.html
+++ b/lms/templates/wiki/article.html
@@ -7,12 +7,13 @@
 {% block wiki_breadcrumbs %}
 {% include "wiki/includes/breadcrumbs.html" %}
 {% endblock %}
+{% block nav_skip %}#main-article{% endblock %}
 
 {% block wiki_contents %}
 
   <div class="article-wrapper">
 
-    <article class="main-article">
+    <article class="main-article" id="main-article">
         {% if selected_tab != "edit" %}
           <h1>{{ article.current_revision.title }}</h1>
 
diff --git a/lms/templates/wiki/base.html b/lms/templates/wiki/base.html
index a76b9f875c..0b23d0173f 100644
--- a/lms/templates/wiki/base.html
+++ b/lms/templates/wiki/base.html
@@ -46,13 +46,14 @@
 
 {% endblock %}
 
+{% block nav_skip %}#wiki-content{% endblock %}
 
 {% block body %}
   {% if course %}
     {% include "courseware/course_navigation.html" with active_page_context="wiki" %}
   {% endif %}
 
-  <section class="container wiki {{ selected_tab }}">
+  <section class="container wiki {{ selected_tab }}" id="wiki-content">
     <div class="wiki-wrapper">
       {% block wiki_body %}