diff --git a/copyright.html b/copyright.html
index eb75b58515..a238a12ec3 100644
--- a/copyright.html
+++ b/copyright.html
@@ -1,19 +1,5 @@
 <%inherit file="marketing.html" />
 
-<header class="announcement">
-  <div class="anouncement-wrapper">
-  <nav>
-    <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="modal login" href="#login">Log In</a>
-  </nav>
-
-    <section>
-      <h1>MITx</h1>
-      <h2>An MIT Education Anywhere. For free.</h2>
-    </section>
-  </div>
-</header>
-
 <section class="copyright">
 
   <div>
diff --git a/honor.html b/honor.html
index 13be4777b8..5a36865865 100644
--- a/honor.html
+++ b/honor.html
@@ -1,19 +1,5 @@
 <%inherit file="marketing.html" />
 
-<header class="announcement">
-  <div class="anouncement-wrapper">
-  <nav>
-    <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="modal login" href="#login">Log In</a>
-  </nav>
-
-    <section>
-      <h1>MITx</h1>
-      <h2>An MIT Education Anywhere. For free.</h2>
-    </section>
-  </div>
-</header>
-
 <section class="honor-code">
   <div>
     <h1> Honor Code </h1>
diff --git a/index.html b/index.html
index 634b101d5d..09c3787347 100644
--- a/index.html
+++ b/index.html
@@ -1,11 +1,9 @@
 <%inherit file="marketing.html" /> 
 
+<%block name="header">
 <header class="announcement course">
   <div class="anouncement-wrapper">
-  <nav>
-    <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="" rel="leanModal" href="#login">Log In</a>
-  </nav>
+    ${parent.header_nav()}
 
     <section class="course">
       <section>
@@ -16,23 +14,22 @@
       <p> Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, &ldquo;6.002x Circuits and Electronics&rdquo; is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide  from February 21, 2012 through June&nbsp;10,&nbsp;2012.</p>
     </section>
   </div>
-
 </header>
-
+</%block>
 
 <section class="index-content">
   <section class="about-course">
-  
+
     <section class="about-info">
       <h1>About 6.002</h1>
-  
+
       <p>6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
 
 <p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. Students should expect to spend approximately 10  hours per week on the course.  The 6.002 content was created collaboratively by Profs. Anant Agarwal and Jeffrey H. Lang.</p>
 
       <!-- <p> The course uses the textbook Foundations of Analog and Digital Electronic Circuits. Agarwal, Anant, and Jeffrey H. Lang. San Mateo, CA: Morgan Kaufmann Publishers, Elsevier, July 2005. ISBN: 9781558607354. While recommended, the book is not required -- relevant section will be provided electronically as part of the on-line course.</p> -->
     </section>
-  
+
     <section class="on-mitx">
       <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 -->
 
@@ -45,7 +42,7 @@
       <h1> Requirements </h1>
 
       <p>In order to succeed in this course, students must have taken an  AP level physics course in electricity and magnetism.  Students must know basic calculus and  linear algebra, and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for students with weaker math backgrounds.</p>
-  
+
       <p>The course web site was developed and tested primarily with Google Chrome. We support Mozilla Firefox as well. While we will attempt to make it possible to complete the course with Internet Explorer, portions of the web site functionality will be unavailable. The videos require Flash.</p>
     </section>
 
@@ -102,18 +99,13 @@
 </section>
 
   <div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
-  <div id="login" class="leanModal_box"><%include file="login.html" /></div>
-  <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
-  <div id="reset_done" class="leanModal_box"></div>
 
-
-<script> 
+<script>
 $(function() {
-/* Set up FancyBox pop-ups */
 
     // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
 
-    /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX. 
+    /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
             Either shows error, or shows success. */
 
     $('#create_account_button').click(function() {
@@ -137,34 +129,6 @@ $(function() {
         );
     });
 
-    /* Handles when the user tries to log in. Grabs form data. Does AJAX. 
-            Either shows error, or redirects. */
-    $('#login_button').click(function() {
-      var submit_data={};
-      $.each($("[id^=li_]"), function(index,value){
-        submit_data[value.name]=value.value;
-      });
-      submit_data["remember"] = ($('#remember').attr("checked")? true : false);
-
-    postJSON('/login',
-           submit_data,
-           function(json) {
-               if(json.success) {
-                  location.href="/courseware";
-               } else {
-                  $('#login_error').html("Invalid Login");
-               }
-             }
-        );
-    });
-
-    $('#pwd_reset_button').click(function() {
-        $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
-          "email"  : $('#id_email').val()}, function(data){
-          $('#pwd_reset').html(data);
-          });
-        });
-
     /* Activate stupid spinner drop-downs in enrollment form */
     var spinner_array=$("[id^=spinner_]");
        spinner_array.each(function(i) {
diff --git a/main.html b/main.html
index 5e8fcc6136..24108f5429 100644
--- a/main.html
+++ b/main.html
@@ -12,7 +12,7 @@
   <script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
   <script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
   <script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
-	<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
+  <script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
   <script type="text/javascript" src="/static/js/video_player.js"></script>
   <script type="text/javascript" src="/static/js/schematic.js"></script>
   <script type="text/javascript" src="/static/js/cktsim.js"></script>
@@ -32,11 +32,11 @@
   </script>
   <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
 
-	<script type="text/javascript">
-		$(function(){
-			$("a[rel*=leanModal]").leanModal();
-		});
-	</script>
+  <script type="text/javascript">
+    $(function(){
+      $("a[rel*=leanModal]").leanModal();
+    });
+  </script>
 <%block name="headextra"/>
 
 </head>
@@ -59,7 +59,7 @@
   </footer>
 
     <div id="feedback_div" class="leanModal_box">
-      <p>Found a bug? Got an idea for improving our system? Let us know.</p> 
+      <p>Found a bug? Got an idea for improving our system? Let us know.</p>
 
       <form>
         <ol>
@@ -71,8 +71,8 @@
 
     </div>
 
-    <div id="calculator_div" class="leanModal_box"> 
-      <input type="text" id="calculator_input"> 
+    <div id="calculator_div" class="leanModal_box">
+      <input type="text" id="calculator_input">
       <input id="calculator_button" type=button value="=&gt;">
       <input type="text" id="calculator_output" readonly>
 
diff --git a/marketing.html b/marketing.html
index 4c75eb55d3..79c25e0557 100644
--- a/marketing.html
+++ b/marketing.html
@@ -12,23 +12,41 @@
   <!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
   <script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
   <link rel="stylesheet" href="/static/lib/fancybox/jquery.fancybox-1.3.4.css">
-	<script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
+  <script type="text/javascript" src="/static/lib/jquery.leanModal.min.js"></script>
   <script type="text/javascript" src="/static/lib//swfobject/swfobject.js"></script>
   <script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
   <script type="text/javascript" src="/static/js/video_player.js"></script>
   <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
 
-	<script type="text/javascript">
-		$(function(){
-			$("a[rel*=leanModal]").leanModal();
-		});
-	</script>
+  <script type="text/javascript">
+    $(function(){
+      $("a[rel*=leanModal]").leanModal();
+    });
+  </script>
 
 <%block name="headextra"/>
 
 </head>
 
 <body>
+  <%block name="header">
+  <header class="announcement">
+    <div class="anouncement-wrapper">
+    <%block name="header_nav">
+    <nav>
+      <h1><a href="/t/mitx_global.html">MITx</a></h1>
+      <a rel="leanModal" class="login" href="#login">Log In</a>
+    </nav>
+    </%block>
+    <%block name="header_text">
+      <section>
+        <h1>MITx</h1>
+        <h2>An MIT Education Anywhere. For free.</h2>
+      </section>
+     </%block>
+    </div>
+  </header>
+  </%block>
 
   ${self.body()}
   <%block name="bodyextra"/>
@@ -39,63 +57,48 @@
       <p> Copyright (c). 2011. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
 
       <ul>
-        <li><a href="/t/tos.html">Terms of service</a></li>
+        <li><a href="/t/tos.html">Terms of Service</a></li>
         <li><a href="/t/privacy.html">Privacy Policy</a></li>
         <li><a href="/t/honor.html">Honor Code</a></li>
       </ul>
     </div>
   </footer>
 
-  <div style="display:none">
-    <div id="feedback_div">
-      Found a bug? Got an idea for improving our system? Let us know. 
-
-      <form>
-        <ol>
-          <li><label>Subject:</label> <input id="feedback_subject" size=40></li>
-          <li><label>Feedback: </label><textarea id="feedback_message" cols="40" rows="5"></textarea></li>
-          <li><input id="feedback_button" type="button" value="Submit"></li>
-        </ol>
-      </form>
-
-    </div>
-  </div>
-
-  <div style="display:none">
-    <div id="calculator_div">
-      <input id="calculator_input" > 
-      <input id="calculator_button" type=button value="=&gt;">
-      <input id="calculator_output" readonly>
-
-      <p>Supported operations: ^ * / + - || ()</p>
-      <p>Supported suffixes: %kMGTcmunp</p>
-    </div>
-  </div>
+  <div id="login" class="leanModal_box"><%include file="login.html" /></div>
+  <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
+  <div id="reset_done" class="leanModal_box"></div>
 
 <script>
-  // Feedback form
-$(function() {
-    $("#feedback_button").click(function(){
-      postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
-        "url":document.URL,
-        "message":$("#feedback_message").attr("value")},
-        function(data){
-        $("#feedback_subject").attr("value","");
-        $("#feedback_message").attr("value","");
-        $("#feedback_div").html("Feedback submitted. Thank you");
-        });
-      });
+$(document).ready(function(){
+    /* Handles when the user tries to log in. Grabs form data. Does AJAX.
+       Either shows error, or redirects. */
+  $('#login_button').click(function() {
+    var submit_data={};
+    $.each($("[id^=li_]"), function(index,value){
+      submit_data[value.name]=value.value;
     });
+    submit_data["remember"] = ($('#remember').attr("checked")? true : false);
 
-// Calculator
-$(function() {
-    $("#calculator_button").click(function(){
-      $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
-        function(data){
-        $("#calculator_output").attr("value",data.result);
-        });
-      });
+    postJSON('/login',
+      submit_data,
+      function(json) {
+        if(json.success) {
+          location.href="/courseware";
+        } else {
+          $('#login_error').html("Invalid Login");
+        }
+      }
+    );
+  });
+
+  $('#pwd_reset_button').click(function() {
+    $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
+      "email"  : $('#id_email').val()}, function(data){
+        $('#pwd_reset').html(data);
     });
+  });
+
+});
 </script>
 
 </body>
diff --git a/mitx_global.html b/mitx_global.html
index 2972370b6f..1fccdae61b 100644
--- a/mitx_global.html
+++ b/mitx_global.html
@@ -1,18 +1,5 @@
 <%inherit file="marketing.html" />
 
-<header class="announcement home">
-  <div class="anouncement-wrapper">
-  <nav>
-    <a class="modal login" href="#login">Log In</a>
-  </nav>
-
-    <section>
-      <h1><em>MITx</em></h1>
-      <h2>An MIT Education Anywhere. For free.</h2>
-    </section>
-  </div>
-</header>
-
 <section class="index-content">
   <section class="about">
     <h1><em>MITx</em> is MIT&rsquo;s online learning initiative.</h1>
@@ -49,29 +36,14 @@
 
     <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">
-  <div id="login"><%include file="login.html" /></div>
-</div>
-
-<div style="display:none">
-  <div id="pwd_reset"><%include file="password_reset_form.html" /></div>
-</div>
-
-<div style="display:none">
-  <div id="reset_done"></div>
-</div>
 </section>
-
-
 <script>
 
 $(function() {
-/* Set up FancyBox pop-ups */
 
     // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
 
-    /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX. 
+    /* Handles when the user hits 'enroll'. Grabs form data. Does AJAX.
             Either shows error, or shows success. */
 
     $('#create_account_button').click(function() {
@@ -95,34 +67,6 @@ $(function() {
         );
     });
 
-    /* Handles when the user tries to log in. Grabs form data. Does AJAX. 
-            Either shows error, or redirects. */
-    $('#login_button').click(function() {
-      var submit_data={};
-      $.each($("[id^=li_]"), function(index,value){
-        submit_data[value.name]=value.value;
-      });
-      submit_data["remember"] = ($('#remember').attr("checked")? true : false);
-
-    postJSON('/login',
-           submit_data,
-           function(json) {
-               if(json.success) {
-                  location.href="/courseware";
-               } else {
-                  $('#login_error').html("Invalid Login");
-               }
-             }
-        );
-    });
-
-    $('#pwd_reset_button').click(function() {
-        $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
-          "email"  : $('#id_email').val()}, function(data){
-          $('#pwd_reset').html(data);
-          });
-        });
-
     /* Activate stupid spinner drop-downs in enrollment form */
     var spinner_array=$("[id^=spinner_]");
        spinner_array.each(function(i) {
diff --git a/privacy.html b/privacy.html
index e79a1db5ca..dda3f33aef 100644
--- a/privacy.html
+++ b/privacy.html
@@ -1,19 +1,5 @@
 <%inherit file="marketing.html" />
 
-<header class="announcement">
-  <div class="anouncement-wrapper">
-  <nav>
-    <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="modal login" href="#login">Log In</a>
-  </nav>
-
-    <section>
-      <h1>MITx</h1>
-      <h2>An MIT Education Anywhere. For free.</h2>
-    </section>
-  </div>
-</header>
-
 <section class="privacy-policy">
   <div>
     <h1> Privacy Policy </h1>
diff --git a/tos.html b/tos.html
index 50350735b5..e71023997e 100644
--- a/tos.html
+++ b/tos.html
@@ -1,19 +1,5 @@
 <%inherit file="marketing.html" />
 
-<header class="announcement">
-  <div class="anouncement-wrapper">
-  <nav>
-    <h1><a href="/t/mitx_global.html">MITx</a></h1>
-    <a class="modal login" href="#login">Log In</a>
-  </nav>
-
-    <section>
-      <h1>MITx</h1>
-      <h2>An MIT Education Anywhere. For free.</h2>
-    </section>
-  </div>
-</header>
-
 <section class="tos">
   <div>
     <h1>MITx Terms of Service</h1>