diff --git a/lms/askbot/skins/mitx/templates/base.html b/lms/askbot/skins/mitx/templates/base.html
index ced2376a99..18ca213cb7 100644
--- a/lms/askbot/skins/mitx/templates/base.html
+++ b/lms/askbot/skins/mitx/templates/base.html
@@ -20,7 +20,7 @@
         {% include "widgets/header.html" %} {# Logo, user tool navigation and meta navitation #}
         {# include "widgets/secondary_header.html" #} {# Scope selector, search input and ask button #}
 
-        <section class="main-content">
+        <section class="container">
             {% block body %}
             {% endblock %}
         </section>
diff --git a/lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html b/lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html
index 99223edac4..3ec11b59fd 100644
--- a/lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html
+++ b/lms/askbot/skins/mitx/templates/meta/html_head_stylesheets.html
@@ -1,3 +1,4 @@
 {% load extra_filters_jinja %}
 <!--<link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />-->
 {{ 'application' | compressed_css }}
+{{ 'course' | compressed_css }}
diff --git a/lms/askbot/skins/mitx/templates/navigation.jinja.html b/lms/askbot/skins/mitx/templates/navigation.jinja.html
index d69afbebc6..59c7148184 100644
--- a/lms/askbot/skins/mitx/templates/navigation.jinja.html
+++ b/lms/askbot/skins/mitx/templates/navigation.jinja.html
@@ -1,46 +1,27 @@
-<header class="app" aria-label="Global Navigation">
+<header class="global" aria-label="Global Navigation">
   <nav>
-    <a href="{{ MITX_ROOT_URL }}" class="logo">
-      <img src="/static/images/logo.png" />
-    </a>
+    <h1 class="logo"><a href="${reverse('root')}"></a></h1>
+    <ol class="left">
+      <li class="primary">
+        <a href="${reverse('courses')}">Find Courses</a>
+      </li>
+    </ol>
 
-    {%if request.user.is_authenticated(): %}
-    <h1>Circuits and Electronics</h1>
     <ol class="user">
-      <li>
-        <a href="/dashboard" class="user-dashboard">
-          <span class="avatar"><img src="/static/images/profile.jpg" /></span>
-          {{ request.user.username }}
+      <li class="primary">
+        <a href="${reverse('dashboard')}" class="user-link">
+          <span class="avatar"></span>
+          ${user.username}
         </a>
       </li>
-      <li>
-        <a href="#" class="options">&#9662</a>
-        <ol class="user-options">
-          <li><a href="#">Account Settings</a></li>
-          <li><a href="/logout">Log Out</a></li>
-        </ol>
+      <li class="primary">
+        <a href="#" class="dropdown">&#9662</a>
+        <ul class="dropdown-menu">
+          ##          <li><a href="#">Account Settings</a></li>
+          <li><a href="${reverse('help_edx')}">Help</a></li>
+          <li><a href="${reverse('logout')}">Log Out</a></li>
+        </ul>
       </li>
     </ol>
-    {%else:%}
-    <ol>
-      <li><a href="/courses">Courses</a></li>
-      <li><a href="#">How It Works</a></li>
-    </ol>
-    <ol class="user">
-      <li><a href="/dashboard">Log In</a></li>
-      <li><a href="#">Sign Up</a></li>
-    </ol>
-    <ol class="secondary">
-      <li>
-        <a href="#">About</a>
-      </li>
-      <li>
-        <a href="#">Jobs</a>
-      </li>
-      <li>
-        <a href="#">faq</a>
-      </li>
-    </ol>
-    {%endif %}
   </nav>
 </header>
diff --git a/lms/askbot/skins/mitx/templates/widgets/footer.html b/lms/askbot/skins/mitx/templates/widgets/footer.html
index 4675a07047..d152e2a38e 100644
--- a/lms/askbot/skins/mitx/templates/widgets/footer.html
+++ b/lms/askbot/skins/mitx/templates/widgets/footer.html
@@ -1,26 +1,38 @@
 <!-- template footer.html -->
-  <footer>
-    <!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
-    <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
-</p>
-      <nav>
-      <ul class="social">
-        <li class="linkedin">
-          <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
-        </li>
-        <li class="twitter">
-          <a href="https://twitter.com/#!/MyMITx">Twitter</a>
-        </li>
-        <li class="facebook">
-          <a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a>
-        </li>
-      </ul>
-    <ul>
+<footer>
+  <nav>
+    <section class="top">
+      <section class="primary">
+        <a href="${reverse('root')}" class="logo"></a>
+        <a href="${reverse('courses')}">Find Courses</a>
+        <a href="${reverse('about_edx')}">About</a>
+        <a href="http://edxonline.tumblr.com/">Blog</a>
+        <a href="${reverse('jobs')}">Jobs</a>
+        <a href="${reverse('contact')}">Contact</a>
+      </section>
 
-      <li><a href="/s/help.html">Help</a></li>
-      <li><a href="/logout">Log out</a></li>
-    </ul>
-      </nav>
-  </footer>
+      <section class="social">
+        <a href="http://youtube.com/user/edxonline"><img src="${static.url('images/social/youtube-sharing.png')}" /></a>
+        <a href="https://plus.google.com/108235383044095082735"><img src="${static.url('images/social/google-plus-sharing.png')}" /></a>
+        <a href="http://www.facebook.com/EdxOnline"><img src="${static.url('images/social/facebook-sharing.png')}" /></a>
+        <a href="https://twitter.com/edXOnline"><img src="${static.url('images/social/twitter-sharing.png')}" /></a>
+      </section>
+    </section>
+
+    <section class="bottom">
+      <section class="copyright">
+        <p style="float:left;">&copy; 2012 edX, some rights reserved.</p>
+      </section>
+
+      <section class="secondary">
+        <a href="${reverse('tos')}">Terms of Service</a>
+        <a href="${reverse('privacy_edx')}">Privacy Policy</a>
+        <a href="${reverse('honor')}">Honor Code</a>
+        <a href="${reverse('help_edx')}">Help</a>
+      </section>
+    </section>
+
+  </nav>
+</footer>
 
 <!-- end template footer.html -->
diff --git a/lms/static/sass/course/_help.scss b/lms/static/sass/course/_help.scss
deleted file mode 100644
index cb505814e9..0000000000
--- a/lms/static/sass/course/_help.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-section.help.main-content {
-  padding: lh();
-
-  h1 {
-    border-bottom: 1px solid #ddd;
-    margin-bottom: lh();
-    margin-top: 0;
-    padding-bottom: lh();
-  }
-
-  p {
-    max-width: 700px;
-  }
-
-  h2 {
-    margin-top: 0;
-  }
-
-  section.self-help {
-    float: left;
-    margin-bottom: lh();
-    margin-right: flex-gutter();
-    width: flex-grid(6);
-
-    ul {
-      margin-left: flex-gutter(6);
-
-      li {
-        margin-bottom: lh(.5);
-      }
-    }
-  }
-
-  section.help-email {
-    float: left;
-    width: flex-grid(6);
-
-    dl {
-      display: block;
-      margin-bottom: lh();
-
-      dd {
-        margin-bottom: lh();
-      }
-
-      dt {
-        clear: left;
-        float: left;
-        font-weight: bold;
-        width: flex-grid(2, 6);
-      }
-    }
-  }
-}
diff --git a/lms/static/sass/course/discussion/_discussion.scss b/lms/static/sass/course/discussion/_discussion.scss
index b9022a43d8..7b0aa601d9 100644
--- a/lms/static/sass/course/discussion/_discussion.scss
+++ b/lms/static/sass/course/discussion/_discussion.scss
@@ -1,8 +1,6 @@
 // Generic layout styles for the discussion forums
-
 body.askbot {
-
-  section.main-content {
+  section.container {
     div.discussion-wrapper {
       @extend .table-wrapper;