diff --git a/.DS_Store b/.DS_Store
index a511c81699..6e5576ca7e 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/index.html b/index.html
index 3cbb0bf84d..f71f9430d5 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,9 @@
 <%inherit file="marketing.html" />
 
+<%block name="title">MITx 6.002x: Circuits & Electronics</%block>
+<%block name="description">6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT's first undergraduate analog design course: 6.002.</%block>
+<%block name="keywords">MITx, circuits, electronics, EECS, electrical engineering, analog circuits, digital circuits, online learning, MIT, online laboratory, education, learners, undergraduate, certificate</%block>
+
 <%block name="header_text">
     <section class="course">
       <section>
@@ -58,17 +62,17 @@
 
     <ul>
       <li>
-        <img src="/static/staff/agarwal-mit-news-small.jpg">
+        <img src="/static/staff/agarwal-mit-news-small.jpg" alt="Anant Agarwal">
         <h2>Anant Agarwal</h2>
         <p>Director of MIT&rsquo;s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including  Tilera, a company that produces scalable multicore  processors.  Prof. Agarwal won MIT&rsquo;s  Smullin and Jamieson prizes for teaching and co-authored  the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
 
       <li>
-        <img src="/static/staff/gjs-small.jpg">
+        <img src="/static/staff/gjs-small.jpg" alt="Gerald Sussman">
         <h2>Gerald Sussman</h2>
         <p>Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.</p></li>
 
       <li>
-        <img src="/static/staff/pmitros-small.jpg">
+        <img src="/static/staff/pmitros-small.jpg" alt="Piotr Mitros">
         <h2>Piotr Mitros</h2>
         <p>Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.</p></li>
     </ul>
diff --git a/marketing.html b/marketing.html
index 9f59ef88f0..b4eb29c3ea 100644
--- a/marketing.html
+++ b/marketing.html
@@ -1,10 +1,15 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%block name="title"><title>MITx 6.002</title></%block>
+  <title><%block name="title">MITx: MIT's new online learning initiative</%block></title>
+
+  <meta name="description" content="<%block name="description">MITx will offer a portfolio of MIT courses for free to a virtual community of learners around the world</%block>" />
+
+  <meta name="keywords" content="<%block name="keywords">MITx, online learning, MIT, online laboratory, education, learners, undergraduate, certificate</%block>" />
 
   <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
   <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
+
   <!--[if lt IE 8]>
   <link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
   <![endif]-->
diff --git a/mitx_global.html b/mitx_global.html
index 3cc3b302e7..4a1a6be900 100644
--- a/mitx_global.html
+++ b/mitx_global.html
@@ -12,7 +12,7 @@
       </section>
 
     <section class="intro-video">
-      <a id="video-overlay-link" rel="leanModal" href="#video-overlay"><img src="/static/images/video-image.png" id="video-img" alt="" /><span> Watch intro video</span></a>
+      <a id="video-overlay-link" rel="leanModal" href="#video-overlay"><img src="/static/images/video-image.png" id="video-img" alt="Link to MITx introduction video" /><span> Watch intro video</span></a>
     </section>
 
     </section>
diff --git a/navigation.html b/navigation.html
index 3b4b50d314..bba364d18b 100644
--- a/navigation.html
+++ b/navigation.html
@@ -7,7 +7,6 @@
     </hgroup>
 
     <nav class="${active_page}">
-
       <ul class="coursenav">
         <li class="courseware"><a href="/courseware">Courseware</a></li>
         <li class="info"><a href="/info">Course Info</a></li>
diff --git a/sass/layout/_header.scss b/sass/layout/_header.scss
index 144194e397..952187a50c 100644
--- a/sass/layout/_header.scss
+++ b/sass/layout/_header.scss
@@ -1,6 +1,5 @@
 div.header-wrapper {
-  // @include linear-gradient(lighten($mit-red, 5%), darken($mit-red, 5%));
-  @include box-shadow(inset 0 -1px 2px darken($mit-red, 10%));
+ @include box-shadow(inset 0 -4px 6px darken($mit-red, 5%));
   background: $mit-red;
   border-bottom: 1px solid #fff;
 
@@ -13,25 +12,38 @@ div.header-wrapper {
     hgroup {
       @extend .clearfix;
       float: left;
+      padding-top: 13px;
+      min-width: flex-grid(3);
 
       h1 {
-        border-right: 1px solid darken($mit-red, 5%);
-        color: darken($mit-red, 25%);
-        font-size: 20px;
-        font-weight: 800;
-        margin: 0 lh() 0 0;
-        padding: 17px lh() 14px 0;
-        text-shadow: 0 1px 0 lighten($mit-red, 10%);
-        line-height: lh();
         @include inline-block();
+        color: darken($mit-red, 25%);
+        font-size: 18px;
+        font-weight: 800;
+        line-height: lh();
+        margin: 0;
+        padding: 0 lh(.5) 0 0;
+        text-shadow: 0 1px 0 lighten($mit-red, 10%);
+
+        &:after {
+          color: darken($mit-red, 10%);
+          content: "•";
+          display: inline-block;
+          font-size: 10px;
+          letter-spacing: -2px;
+          padding-left: lh(.5);
+          text-shadow: 0;
+        }
       }
 
       h2 {
         @include inline-block();
-        margin: 0 lh() 0 0;
-        padding: 19px lh() 9px 0;
-        line-height: lh();
-        border-right: 1px solid darken($mit-red, 5%);
+        margin: 0;
+        font-size: 16px;
+        padding: 0 lh() 0px 0;
+        text-transform: none;
+        letter-spacing: 0;
+        text-shadow: 0 -1px 0 darken($mit-red, 10%);
         -webkit-font-smoothing: antialiased;
 
         a {
@@ -44,61 +56,123 @@ div.header-wrapper {
         }
       }
 
-      @media screen and (max-width: 920px) {
-        border-bottom: 1px solid darken($mit-red, 5%);
+
+      @media screen and (max-width: 900px) {
         display: block;
         float: none;
 
         h1 {
-          float: right;
+          float: left;
           border: 0;
-          margin-right: 0;
-          padding-right: 0;
         }
 
         h2 {
           float: left;
           border: 0;
           margin-right: 0;
-          padding-right: 0;
         }
       }
     }
 
     nav {
-      float: left;
+      -webkit-font-smoothing: antialiased;
+      @include border-radius(3px 3px 0 0);
+      @include box-shadow(inset 0 0 0 1px darken(#501016, 5%), inset 0 2px 0 lighten(#501016, 5%));
+      background: #501016;
+      border-bottom: 1px solid darken(#501016, 10%);
       display: block;
-      margin: 0;
+      float: left;
+      margin: 5px 0 0;
       padding: 0;
       text-shadow: 0 -1px 0 darken($mit-red, 10%);
-      max-height: 52px; //fix for firefox
-      -webkit-font-smoothing: antialiased;
-
 
       ul {
         @extend .clearfix;
-        display: inline-block;
-        padding: 19px 0 9px;
         margin: 0;
 
         li {
-          margin-right: lh();
-          display: inline-block;
-          margin-bottom: 0;
           line-height: lh();
+          margin-bottom: 0;
+          float: left;
 
           a {
             color: #fff;
             text-decoration: none;
+            padding: 10px lh() 8px;
+            display: block;
+            font-weight: bold;
+
+            @media screen and (max-width: 1020px) {
+              padding: 10px lh(.7) 8px;
+            }
 
             &:hover {
               color: rgba(#fff, .7);
               background-color: none;
-              text-decoration: none;
             }
           }
         }
       }
+
+      @media screen and (max-width: 900px) {
+        width: 100%;
+        float: none;
+
+        ul {
+          li {
+            padding: auto;
+            display: table-cell;
+            width: 16.6666666667%;
+            text-align: center;
+          }
+        }
+      }
+
+      .active {
+        background: #F4F4F4;
+        color: #333;
+        text-shadow: 0 1px 0 #fff;
+        border: 1px solid darken(#501016, 10%);
+        border-bottom: 0;
+        @include box-shadow(0 2px 0 #f4f4f4, inset 0 1px 0 #fff);
+        @include border-radius(3px 3px 0 0);
+      }
+
+      &.courseware {
+        li.courseware a {
+          @extend .active;
+        }
+      }
+
+      &.book {
+        li.book a {
+          @extend .active;
+        }
+      }
+
+      &.info {
+        li.info a {
+          @extend .active;
+        }
+      }
+
+      &.discussion {
+        li.discussion a {
+          @extend .active;
+        }
+      }
+
+      &.wiki {
+        li.wiki a {
+          @extend .active;
+        }
+      }
+
+      &.profile {
+        li.profile a {
+          @extend .active;
+        }
+      }
     }
   }
 }
diff --git a/sass/layout/_layout.scss b/sass/layout/_layout.scss
index c0f52ad268..584e1e1fa2 100644
--- a/sass/layout/_layout.scss
+++ b/sass/layout/_layout.scss
@@ -12,15 +12,15 @@ html {
       @extend .clearfix;
       @extend .wrapper;
       @include box-sizing(border-box);
-      @include border-radius(4px);
       overflow: hidden;
       background: #fff;
       border-bottom: 1px solid #bbb;
-
-      @media screen and (min-width: 1400px) {
-        // @include border-radius(3px);
+      margin-top: 3px;
         @include box-shadow(0 0 4px #dfdfdf);
         border: 1px solid #bbb;
+
+      @media screen and (min-width: 1400px) {
+        @include border-radius(4px);
         margin-top: lh(.5);
       }
     }
diff --git a/staff_problem_info.html b/staff_problem_info.html
new file mode 100644
index 0000000000..e617584a17
--- /dev/null
+++ b/staff_problem_info.html
@@ -0,0 +1,3 @@
+<div class="staff_info">
+${xml | h}
+</div>
