diff --git a/cms/static/sass/_header.scss b/cms/static/sass/_header.scss
index fc69690379..c0793bcb8a 100644
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -172,14 +172,6 @@ nav .nav-item {
       }
     }
 
-    // current state
-    &.is-current {
-
-      .title, .icon-expanded {
-        color: $blue;
-      }
-    }
-
     // specific nav items
     &.nav-course-courseware {
     }
@@ -480,14 +472,47 @@ nav .nav-item {
 // ====================
 
 // STATE: active/current nav states
+
+.nav-item.is-current,
 body.howitworks .nav-not-signedin-hiw,
 body.signin .nav-not-signedin-signin,
 body.signup .nav-not-signedin-signup,
-body.course.outline .nav-course-courseware
+
+// course content
+body.course.outline .nav-course-courseware .title,
+body.course.updates .nav-course-courseware .title,
+body.course.pages .nav-course-courseware .title,
+body.course.uploads .nav-course-courseware .title,
+
+body.course.outline .nav-course-courseware-outline,
+body.course.updates .nav-course-courseware-updates,
+body.course.pages .nav-course-courseware-pages,
+body.course.uploads .nav-course-courseware-uploads,
+
+// course settings
+body.course.schedule .nav-course-settings .title,
+body.course.grading .nav-course-settings .title,
+body.course.team .nav-course-settings .title,
+body.course.advanced .nav-course-settings .title,
+
+body.course.schedule .nav-course-settings-schedule,
+body.course.grading .nav-course-settings-grading,
+body.course.team .nav-course-settings-team,
+body.course.advanced .nav-course-settings-advanced,
+
+// course tools
+body.course.import .nav-course-tools .title,
+body.course.export .nav-course-tools .title,
+
+body.course.import .nav-course-tools-import,
+body.course.export .nav-course-tools-export,
+
 {
 
+  color: $blue !important;
+
   a {
-    color: $blue;
+    color: $blue !important;
   }
 }
 
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 01766e2dac..b4497f29dd 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -1,6 +1,6 @@
 <%inherit file="base.html" />
 <%! from django.core.urlresolvers import reverse %>
-<%block name="bodyclass">assets</%block>
+<%block name="bodyclass">is-signedin course uploads</%block>
 <%block name="title">Courseware Assets</%block>
 
 <%namespace name='static' file='static_content.html'/>
diff --git a/cms/templates/export.html b/cms/templates/export.html
index 37210934f6..bce5c968e0 100644
--- a/cms/templates/export.html
+++ b/cms/templates/export.html
@@ -3,7 +3,7 @@
 
 <%! from django.core.urlresolvers import reverse %>
 <%block name="title">Export</%block>
-<%block name="bodyclass">is-signedin course export</%block>
+<%block name="bodyclass">is-signedin course tools export</%block>
 
 <%block name="content">
 <div class="main-wrapper">
diff --git a/cms/templates/import.html b/cms/templates/import.html
index 17df308d3b..503eea37ee 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -3,7 +3,7 @@
 
 <%! from django.core.urlresolvers import reverse %>
 <%block name="title">Import</%block>
-<%block name="bodyclass">is-signedin course import</%block>
+<%block name="bodyclass">is-signedin course tools import</%block>
 
 <%block name="content">
 <div class="main-wrapper">
diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html
index 3af4a80623..49d4bf5ea1 100644
--- a/cms/templates/manage_users.html
+++ b/cms/templates/manage_users.html
@@ -1,6 +1,6 @@
 <%inherit file="base.html" />
 <%block name="title">Course Staff Manager</%block>
-<%block name="bodyclass">is-signedin course users team</%block>
+<%block name="bodyclass">is-signedin course users settings team</%block>
 
 
 <%block name="content">
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 86687b0df7..7427344729 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -26,10 +26,10 @@
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
-                  <li class="nav-item"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Outline</a></li>
-                  <li class="nav-item"><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Updates</a></li>
-                  <li class="nav-item"><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}">Static Pages</a></li>
-                  <li class="nav-item"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li>
+                  <li class="nav-item nav-course-courseware-outline"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Outline</a></li>
+                  <li class="nav-item nav-course-courseware-updates"><a href="${reverse('course_info', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Updates</a></li>
+                  <li class="nav-item nav-course-courseware-pages"><a href="${reverse('edit_tabs', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, coursename=ctx_loc.name))}">Static Pages</a></li>
+                  <li class="nav-item nav-course-courseware-uploads"><a href="${reverse('asset_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Files &amp; Uploads</a></li>
                 </ul>
               </div>
             </div>            
@@ -41,10 +41,10 @@
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
-                  <li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Schedule &amp; Details</a></li>
-                  <li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
-                  <li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
-                  <li class="nav-item"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li>
+                  <li class="nav-item nav-course-settings-schedule"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Schedule &amp; Details</a></li>
+                  <li class="nav-item nav-course-settings-grading"><a href="${reverse('contentstore.views.get_course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
+                  <li class="nav-item nav-course-settings-team"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
+                  <li class="nav-item nav-course-settings-advanced"><a href="${reverse('course_settings', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Advanced Settings</a></li>
                 </ul>
               </div>
             </div>            
@@ -56,8 +56,8 @@
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
-                  <li class="nav-item"><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Import</a></li>
-                  <li class="nav-item"><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Export</a></li>
+                  <li class="nav-item nav-course-tools-import"><a href="${reverse('import_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Import</a></li>
+                  <li class="nav-item nav-course-tools-export"><a href="${reverse('export_course', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Export</a></li>
                 </ul>
               </div>
             </div>