diff --git a/.DS_Store b/.DS_Store
index b9a4099392..a511c81699 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/6002x-faq.html b/6002x-faq.html
index c33cb5e966..3777d8f332 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -18,6 +18,53 @@ This set of questions and answers accompanies MIT’s February 13,
 6.002x: Circuits and Electronics.
 </p>
 
+<h2> I tried to register for the course, but it says the username
+is already taken.</h2>
+
+<p> The system only allows each username to be used once. Probably,
+someone else already signed up with that username. Try a different,
+more unique username. For example, try adding a random number to the
+end.</p>
+
+<h2> I am interested in a different subject. What other courses do
+you offer? </h2>
+
+<p> 6.002x is the pilot course for MITx. While we plan to offer a
+range of courses in the future, at present, 6.002x is the only course
+available.</p>
+
+<h2>How will I know that the course has started?</h2>
+
+<p> The course will start on March 5. Check the website
+mitx.mit.edu as the date approaches.  A login button will appear on
+the course website 6.002x.mitx.mit.edu on or slightly before March 5
+so you can login, begin to get familiar with the site and start the
+course.</p>
+
+<h2> Why is there no log-in button?</h2>
+
+<p> You will not be able to log into the course until either the
+starting date, or shortly before.</p>
+
+<h2> Does the class have a schedule?</h2>
+
+<p> The lectures are on-line videos, and may be watched at your own
+pace and schedule. The course will have fixed deadlines for homework
+assignments and exams. </p>
+
+<h2> I just enrolled for the course. I have not received any form
+of acknowledgement that I have enrolled.</h2>
+
+<p> You should receive a single activation e-mail. If you did not,
+check your spam folder, or try to register again with your correct
+e-mail address and a new username (most errors are from typos in
+e-mail addresses).</p>
+
+<h2> How do I drop the course?</h2>
+
+<p> You do not have to do anything. You can simply stop working on the
+course at any time you choose to do so.</p>
+
 <h2>
 What is <i>MITx</i>?</h2>
 
diff --git a/accordion_init.js b/accordion_init.js
index 138ac15608..7c4ca2603c 100644
--- a/accordion_init.js
+++ b/accordion_init.js
@@ -1,10 +1,19 @@
 $("#accordion").accordion({
   active: ${ active_chapter },
-  autoHeight: false
+  header: 'h3',
+  autoHeight: false,
+});
+
+$("#open_close_accordion a").click(function(){
+  if ($(".course-wrapper").hasClass("closed")){
+    $(".course-wrapper").removeClass("closed");
+  } else {
+    $(".course-wrapper").addClass("closed");
+  }
 });
 
 $('.ui-accordion').bind('accordionchange', function(event, ui) {
    var event_data = {'newheader':ui.newHeader.text(),
-		     'oldheader':ui.oldHeader.text()};
+         'oldheader':ui.oldHeader.text()};
    log_event('accordion', event_data);
 });
diff --git a/activation_email.txt b/activation_email.txt
index 0bd636428c..21a09335c7 100644
--- a/activation_email.txt
+++ b/activation_email.txt
@@ -6,4 +6,5 @@ into your web browser's address bar:
 http://${ site }/activate/${ key }
 
 If you didn't request this, you don't need to do anything; you won't
-receive any more email from us. 
+receive any more email from us. Please do not reply to this e-mail; if
+you require assistance, check the help section of the MITx web site.
diff --git a/courseware.html b/courseware.html
index 4b3a1291e3..b77806f3e1 100644
--- a/courseware.html
+++ b/courseware.html
@@ -27,9 +27,16 @@
 
 <section class="main-content">
   <div class="course-wrapper">
-    <div id="accordion">
-      ${accordion}
-    </div>
+    <section class="course-index">
+      <div id="open_close_accordion">
+        <h2>Courseware Index</h2>
+        <a href="#">close</a>
+      </div>
+
+      <div id="accordion">
+        ${accordion}
+      </div>
+    </section>
 
     <section class="course-content">
       ${content}
diff --git a/mitx_help.html b/mitx_help.html
index ab0c28a23e..a9ec20eb44 100644
--- a/mitx_help.html
+++ b/mitx_help.html
@@ -5,7 +5,10 @@
     <section class="help-email">
       <h2>Help &amp; Feedback</h2>
       <p> If run into problems signing up for the web site which you
-      cannot resolve on your own, you can reach us at:</p>
+      cannot resolve on your own, please check
+      the <a href="http://mitx.mit.edu/6002x-faq.html">Frequently
+      Asked Questions</a>. If you find a bug or other issues, you can
+      reach us at:</p>
       <dl>
         <dt>System-related questions</dt>
         <dd><a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a></dd>
diff --git a/profile.html b/profile.html
index 422d21f2b8..1c327e6f25 100644
--- a/profile.html
+++ b/profile.html
@@ -91,49 +91,45 @@ $(function() {
 
       <div id="grade-detail-graph" style="width:650px;height:200px;"></div>
             
-      <ol>
-        <%
-        lastChapter = None
-        %>
-        % for hw in homeworks:
+      <ol class="chapters">
+        %for chapter in chapters:
+        %if not chapter['chapter'] == "hidden":
         <li>
-          %if hw['chapter'] != lastChapter:
-          <h2><a href="${reverse('courseware_chapter', args=format_url_params([hw['course'], hw['chapter']])) }">
-          ${ hw['chapter'] }</a></h2>
-          <% lastChapter = hw['chapter'] %>
-          %else:
-          <h2>-</h2>
-          %endif
-
-          <div class="scores">
-            <h3><a href="${reverse('courseware_section', args=format_url_params([hw['course'], hw['chapter'], hw['section']])) }">
-            <%
-            earned = hw['section_total'][0]
-            total = hw['section_total'][1]
-            percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else ""
-            %>
-            ${ hw['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
-            ${hw['subtitle']}
-            % if 'due' in hw and hw['due']!="":
-              due ${hw['due']}
-            % endif
-            
-            <ul>
-              %if len(hw['scores']) > 0:
-                %if hw['graded']:
-                  Problem Scores:
-                %else:
-                  Practice Scores:
-                %endif
-                % for score in hw['scores']:
-                  <li>${ score[0] }/${ score[1] }</li>
-                % endfor
+          <h2><a href="${reverse('courseware_chapter', args=format_url_params([chapter['course'], chapter['chapter']])) }">
+          ${ chapter['chapter'] }</a></h2>
+        
+          <ol class="sections">
+            %for section in chapter['sections']:
+            <li>
+              <%
+              earned = section['section_total'][0]
+              total = section['section_total'][1]
+              percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else ""
+              %>
+              
+              <h3><a href="${reverse('courseware_section', args=format_url_params([chapter['course'], chapter['chapter'], section['section']])) }">
+              ${ section['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
+              ${section['subtitle']}
+              %if 'due' in section and section['due']!="":
+                due ${section['due']}
               %endif
-            </ul>
-          </div>
-        </li>
-        % endfor
-      </ol>
+              
+              %if len(section['scores']) > 0:
+                <ol class="scores">
+                  ${ "Problem Scores: " if section['graded'] else "Practice Scores: "}
+                  %for score in section['scores']:
+                    <li class="score">${ score[0] }/${ score[1] }</li>
+                  %endfor
+                </ol>
+              %endif
+              
+            </li> <!--End section-->
+            %endfor
+          </ol> <!--End sections-->
+        </li> <!--End chapter-->
+        %endif
+        %endfor
+      </ol> <!--End chapters-->
     </section>
 
     <section class="user-info">
diff --git a/sass/reademe.md b/sass/README
similarity index 71%
rename from sass/reademe.md
rename to sass/README
index 4550d0c9c5..96cb2425d1 100644
--- a/sass/reademe.md
+++ b/sass/README
@@ -5,7 +5,12 @@ $ gem install sass
 
 We are also using Bourbon with sass. They are a generic set of mixins, and functions that allow for more rapid development of CSS3. Find out more about bourbon here: https://github.com/thoughtbot/bourbon
 
-Then to generate Sass files cd to templates directory and watch the sass files with: 
+Then to generate Sass files cd to templates directory and watch the sass files for developement: 
+
 $ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb
 
-This will automatically generate the CSS files on save.
+To generate a compressed css file for production:
+
+$ sass --watch sass:../static/css/ -r ./sass/bourbon/lib/bourbon.rb --style :compressed
+
+These will automatically generate the CSS files on save.
diff --git a/sass/_profile.scss b/sass/_profile.scss
index 68a93cf73f..8a08759294 100644
--- a/sass/_profile.scss
+++ b/sass/_profile.scss
@@ -57,31 +57,50 @@ div.profile-wrapper {
       @extend .top-header;
     }
 
-    ol {
+    > ol {
       list-style: none;
+      border-top: 1px solid #e3e3e3;
+      margin-top: lh();
 
       > li {
         border-bottom: 1px solid #e3e3e3;
         padding: lh() 0;
+        width: 100%;
+        display: table;
         @extend .clearfix;
 
         h2 {
-          float: left;
+          display: table-cell;
           padding: 0;
           margin: 0;
           width: flex-grid(2, 9);
-          margin-right: flex-gutter(9);
+          padding-right: flex-gutter(9);
+          border-right: 1px dotted #ccc;
+          @include box-sizing(border-box);
         }
 
-        div.scores {
-          float: left;
+        ol.sections {
+          padding-left: flex-gutter(9);
+          display: table-cell;
+          list-style: none;
           width: flex-grid(7, 9);
 
+         > li {
+           padding:0 0 lh() 0;
+
+           &:first-child {
+             padding-top: 0;
+           }
+
+           &:last-child {
+             border-bottom: 0;
+           }
+
           h3 {
             color: #666;
           }
 
-          ul {
+          ol {
             list-style: none;
 
             li {
@@ -89,6 +108,7 @@ div.profile-wrapper {
               padding-right: 1em;
             }
           }
+          }
         }
       }
     }
diff --git a/sass/courseware/_courseware.scss b/sass/courseware/_courseware.scss
index 65c71fc183..9d7ab8123a 100644
--- a/sass/courseware/_courseware.scss
+++ b/sass/courseware/_courseware.scss
@@ -5,9 +5,17 @@ div.course-wrapper {
     list-style: none;
   }
 
+  .tran {
+    @include transition( all, .2s, $ease-in-out-quad);
+  }
+
   section.course-content {
     @extend .content;
 
+    h1 {
+      @extend .top-header;
+    }
+
     p {
       margin-bottom: lh();
 
@@ -17,6 +25,12 @@ div.course-wrapper {
       }
     }
 
+    ul {
+      li {
+        margin-bottom: lh(.5);
+      }
+    }
+
     .problem-set {
       position: relative;
       @extend .clearfix;
@@ -102,7 +116,6 @@ div.course-wrapper {
       }
     }
 
-
     section.problems-wrapper, div#seq_content {
       @extend .problem-set;
     }
@@ -117,8 +130,17 @@ div.course-wrapper {
       }
     }
 
+    div#seq_content {
+      h1 {
+        background: none;
+        margin-bottom: 0;
+        padding-bottom: 0;
+        border-bottom: none;
+      }
+    }
+
     ol.vert-mod {
-     > li {
+      > li {
         @extend .clearfix;
         @extend .problem-set;
         border-bottom: 1px solid #ddd;
@@ -133,4 +155,34 @@ div.course-wrapper {
       }
     }
   }
+
+  &.closed {
+    section.course-index {
+      width: flex-grid(.6);
+
+      div#open_close_accordion {
+        padding: 0;
+
+        a {
+          background-image: url('/static/images/slide-right-icon.png');
+        }
+
+        h2 {
+          visibility: hidden;
+          width: 10px;
+          padding: 0;
+        }
+      }
+
+      div#accordion {
+        visibility: hidden;
+        width: 10px;
+        padding: 0;
+      }
+    }
+
+    section.course-content {
+      width: flex-grid(11.5) + flex-gutter();
+    }
+  }
 }
diff --git a/sass/courseware/_sidebar.scss b/sass/courseware/_sidebar.scss
index 401a2f5c3c..3f937433f2 100644
--- a/sass/courseware/_sidebar.scss
+++ b/sass/courseware/_sidebar.scss
@@ -1,75 +1,96 @@
-div#accordion {
+section.course-index {
   @extend .sidebar;
+  @extend .tran;
 
   div#open_close_accordion {
-    position: absolute;
-    right: 0px;
-    width: 20px;
-    height: 20px;
-    background: #ccc;
-    border: 1px solid black;
-    right: -22px;
-    top: 5px;
-  }
+    @include box-shadow(0 1px 0 #eee);
+    border-bottom: 1px solid #d3d3d3;
+    padding: 0 lh();
+    position: relative;
 
-  h3 {
-    overflow: hidden;
-    margin: 0;
-
-    &:last-child {
-      @include box-shadow(none);
+    h2 {
+      padding-right: 20px;
     }
 
-    &.ui-accordion-header {
-      color: #000;
+    a {
+      width: 16px;
+      text-indent: -9999px;
+      height: 16px;
+      position: absolute;
+      padding: 8px;
+      top: -12px;
+      right: -1px;
+      border: 1px solid #D3D3D3;
+      background: #eee url('/static/images/slide-left-icon.png') center center no-repeat;
+      @include border-radius(3px 0 0 3px);
 
-      a {
-        font-size: $body-font-size;
-        color: lighten($text-color, 10%);
-      }
-
-      &.ui-state-hover {
-        border: none;
-        border-bottom: 1px solid #d3d3d3;
-      }
-
-      &.ui-state-active {
-        @extend .active;
+      &:hover {
+        background-color: white;
       }
     }
   }
 
-  ul.ui-accordion-content {
-    @include border-radius(0);
-    @include box-shadow( inset -1px 0 0 #e6e6e6);
-    background: #d6d6d6;
-    border: none;
-    border-bottom: 1px solid #c3c3c3;
-    font-size: 12px;
-    margin: 0;
-    overflow: hidden;
+  div#accordion {
 
-    li {
-      &.active {
-        font-weight: bold;
+    h3 {
+      overflow: hidden;
+      margin: 0;
+
+      &:last-child {
+        @include box-shadow(none);
       }
 
-      a {
-        text-decoration: none;
-        margin-bottom: lh(.5);
-        display: block;
+      &.ui-accordion-header {
         color: #000;
 
-        &:hover {
-          color: #666;
+        a {
+          font-size: $body-font-size;
+          color: lighten($text-color, 10%);
         }
 
-        p {
-          margin-bottom: 0;
+        &.ui-state-hover {
+          border: none;
+          border-bottom: 1px solid #d3d3d3;
+        }
 
-          &.subtitle {
+        &.ui-state-active {
+          @extend .active;
+        }
+      }
+    }
+
+    ul.ui-accordion-content {
+      @include border-radius(0);
+      @include box-shadow( inset -1px 0 0 #e6e6e6);
+      background: #d6d6d6;
+      border: none;
+      border-bottom: 1px solid #c3c3c3;
+      font-size: 12px;
+      margin: 0;
+      overflow: hidden;
+
+      li {
+        &.active {
+          font-weight: bold;
+        }
+
+        a {
+          text-decoration: none;
+          margin-bottom: lh(.5);
+          display: block;
+          color: #000;
+
+          &:hover {
             color: #666;
           }
+
+          p {
+            margin-bottom: 0;
+
+            &.subtitle {
+              color: #666;
+            }
+          }
         }
       }
     }
diff --git a/sass/courseware/_video.scss b/sass/courseware/_video.scss
index 45e7777399..264bcc953d 100644
--- a/sass/courseware/_video.scss
+++ b/sass/courseware/_video.scss
@@ -88,6 +88,7 @@ section.course-content {
 
         li {
           float: left;
+          margin-bottom: 0;
 
           a {
             @include box-shadow(1px 0 0 #555);