diff --git a/index.html b/index.html
index 5f74afa364..a903b5a4e8 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@
     </section>
   
     <section class="on-mitx">
-      <h1>6.002 on MITx</h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
+      <h1>6.002 on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
 
       <p>Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.</p>
 
diff --git a/mitx_global.html b/mitx_global.html
index 047e544298..2972370b6f 100644
--- a/mitx_global.html
+++ b/mitx_global.html
@@ -7,7 +7,7 @@
   </nav>
 
     <section>
-      <h1>MITx</h1>
+      <h1><em>MITx</em></h1>
       <h2>An MIT Education Anywhere. For free.</h2>
     </section>
   </div>
@@ -15,11 +15,11 @@
 
 <section class="index-content">
   <section class="about">
-    <h1>MITx is MIT&rsquo;s online learning initiative.</h1>
+    <h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
 
     <section class="intro">
       <p>This learning platform will enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences. It will also be host to a virtual community of learners around the world.</p>
-      <p>The first course offered by MITx in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.</p>
+      <p>The first course offered by <em>MITx</em> in an experimental prototype form is 6.002x Circuits and Electronics. Watch this space for the next set of courses that will become available in Fall 2012.</p>
     </section>
 
     <section class="features">
@@ -28,11 +28,11 @@
       <ul>
         <li>organizes and presents course material to enable students to learn at their own pace</li>
         <li>features interactivity, online laboratories and student-to-student communication</li>
-        <li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by MITx</li>
+        <li>allows for the individual assessment of any student&rsquo;s work and allow students who demonstrate their mastery of subjects to earn a certificate of completion awarded by <em>MITx</em></li>
         <li>operates on an open-source, scalable software infrastructure in order to make it continuously improving and readily available to other educational institutions.</li>
       </ul>
 
-      <p><strong>Press &amp; links:</strong> <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>,  <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank">MITx FAQ</a></p>
+      <p><strong>Press &amp; links:</strong> <a href="http://www.boston.com/news/local/massachusetts/articles/2011/12/19/mit_to_launch_online_only_graded_courses_free_to_all/?page=full" target="_blank">Boston Globe</a>, <a href="http://www.nytimes.com/2011/12/19/education/mit-expands-free-online-courses-offering-certificates.html?_r=3&hpw=" target="_blank">New York Times</a>,  <a href="http://web.mit.edu/newsoffice/2011/mitx-education-initiative-1219.html" target="_blank">MIT Press Release</a>, <a href="http://web.mit.edu/newsoffice/2011/mitx-faq-1219" target="_blank"><em>MITx</em> FAQ</a></p>
     </section>
   </section>
 
@@ -47,7 +47,7 @@
       <a href="/" class="more-info">More information <span>&amp;</span> Enroll</a>
     </p>
 
-    <p>Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from MITx.</p>
+    <p>Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002 Circuits and Electronics&rdwuo; is an on-line adaption of MIT's first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
   </section>
 
 <div style="display:none">
diff --git a/navigation.html b/navigation.html
index 667263926b..2d2054f899 100644
--- a/navigation.html
+++ b/navigation.html
@@ -1,15 +1,15 @@
 <div class="header-wrapper">
   <header>
-    <h1>Circuits and Electronics</h1>
+    <h1><em>MITx</em> Circuits and Electronics</h1>
 
     <nav>
       <ul class="coursenav">
         <li><a href="/courseware">Courseware</a></li>
+        <li><a href="/info">Info</a></li>
         <li><a href="/book">Textbook</a></li>
         <li><a href="/discussion">Discussion</a></li>
         <li><a href="/wiki">Wiki</a></li>
         <li><a href="/profile">Profile</a></li>
-	<li><a href="/info">Info</a></li>
       </ul>
     </nav>
   </header>
diff --git a/profile.html b/profile.html
index ca6b864f02..e50efed801 100644
--- a/profile.html
+++ b/profile.html
@@ -48,7 +48,7 @@ $(function() {
 
       $('#change_password').click(function(){
         $('.modal').trigger('click');
-          log_event("profile", {"type":"password_show"});
+        log_event("profile", {"type":"password_show"});
       });
 
     $('#pwd_reset_button').click(function() {
@@ -58,7 +58,7 @@ $(function() {
          log_event("profile", {"type":"password_send"});
       });
     });
-})
+});
 
 </script>
 
@@ -82,15 +82,13 @@ $(function() {
       </ul>
 
       <!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
-      <!-- hidden trigger for password -->
 
       <div id="change_password_pop">
         <h2>Password reset</h2>
+        <p>We'll e-mail you a password reset link at ${email}. Follow the link in the email to reset your password.</p>
 
-        <p>We'll e-mail you a password reset link at ${email}.</p>
         <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
-
-        <input type="button" id="pwd_reset_button" value="Reset Password" />
+        <input type="submit" id="pwd_reset_button" value="Reset Password" />
       </div>
 
     </section>
diff --git a/sass/_base.scss b/sass/_base.scss
index a1c643af3d..db8b718fb7 100644
--- a/sass/_base.scss
+++ b/sass/_base.scss
@@ -11,14 +11,15 @@ h2 {
   text-transform: uppercase;
 }
 
-h3 {
-  
-}
-
 p {
   margin-bottom: $body-line-height;
 }
 
+em {
+  font-style: italic;
+  font-family: Georgia, serif;
+}
+
 #{$all-text-inputs}, textarea {
   @include box-shadow(0 -1px 0 #fff);
   @include linear-gradient(#eee, #fff);
diff --git a/sass/_index.scss b/sass/_index.scss
index ca87a64d82..70729759d8 100644
--- a/sass/_index.scss
+++ b/sass/_index.scss
@@ -5,6 +5,13 @@
   src: local('Open Sans'), local('OpenSans'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff') format('woff');
 }
 
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Open Sans Italic'), local('OpenSans-Italic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff') format('woff');
+}
+
 @font-face {
   font-family: 'Open Sans';
   font-style: normal;
@@ -12,6 +19,12 @@
   src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff') format('woff');
 }
 
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 800;
+  src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxsBo4hlZyBvkZICS3KpNonM.woff') format('woff');
+}
 // Extends
 //---------------------------------------- //
 .wrapper {
@@ -97,6 +110,10 @@ body {
     margin-bottom: lh();
   }
 
+  em {
+    font-style: italic;
+  }
+
   #{$all-text-inputs}, textarea {
     @include box-shadow(0 -1px 0 #fff);
     @include linear-gradient(#eee, #fff);
@@ -170,7 +187,7 @@ header.announcement {
         margin-right: lh();
 
         a {
-          font: 800 18px $header-font-family;
+          font: italic 800 18px $header-font-family;
           color: #fff;
           text-decoration: none;
         }
diff --git a/sass/_layout.scss b/sass/_layout.scss
index ff82cabc80..f1fd1d4395 100644
--- a/sass/_layout.scss
+++ b/sass/_layout.scss
@@ -29,6 +29,11 @@ html {
           float: left;
           color: #000;
           text-shadow: 0 1px 0 lighten($mit-red, 10%);
+
+          em {
+            @include inline-block();
+            padding-right: lh();
+          }
         }
 
         nav {
@@ -44,7 +49,7 @@ html {
             margin: 0;
 
             li {
-              margin-right: $body-line-height;
+              margin-right: lh();
               display: inline-block;
               margin-bottom: 0;