diff --git a/main.html b/main.html
index ad1d7bd2de..05d00112f5 100644
--- a/main.html
+++ b/main.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%block name="title"><title>MITX 6.002</title></%block>
+  <%block name="title"><title>MITx 6.002</title></%block>
 
   <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
   <link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
@@ -71,21 +71,24 @@
     <div id="calculator_div" class="leanModal_box">
       <form id="calculator">
         <input type="text" id="calculator_input">
-        <input id="calculator_button" type="submit" value="=&gt;">
+        <input id="calculator_button" type="submit" value="=">
         <input type="text" id="calculator_output" readonly>
       </form>
 
-<table>      <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr>
-      <tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr>
-      <tr><td align="right">Functions</td><td>&nbsp;:&nbsp;</td><td align="left"> sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </td></tr>
-      <tr><td align="right">Constants</td><td>&nbsp;:&nbsp;</td><td align="left"> e</td></tr>
-      <!--p> Unsupported: ||, j </p
-Students won't know what parallel means at this time.
-Complex numbers aren't well tested in the courseware, so we would prefer to not expose them.
-If you read the comments in the source, feel free to use them. If you run into a bug, please
-let us know. But we can't officially support them right now.
--->
-</table>
+      <dl>
+        <dt>Suffixes:</dt>
+        <dd> %kMGTcmunp</dd>
+        <dt>Operations:</dt>
+        <dd>^ * / + - ()</dd>
+        <dt>Functions:</dt>
+        <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
+        <dt>Constants</dt>
+        <dd>e</dd>
+
+       <!-- Students won't know what parallel means at this time.  Complex numbers aren't well tested in the courseware, so we would prefer to not expose them.  If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
+
+       <dt>Unsupported:</dt> <dd>||, j </dd>  -->
+      </dl>
     </div>
 
 <script>
diff --git a/marketing.html b/marketing.html
index 34768f67bb..26c8ec6f38 100644
--- a/marketing.html
+++ b/marketing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%block name="title"><title>MITX 6.002</title></%block>
+  <%block name="title"><title>MITx 6.002</title></%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" />
diff --git a/profile.html b/profile.html
index c653e61a6d..422d21f2b8 100644
--- a/profile.html
+++ b/profile.html
@@ -72,7 +72,7 @@ $(function() {
     $('#pwd_reset_button').click(function() {
       $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }",
                     "email"  : $('#id_email').val()}, function(data){
-         $('#pwd_reset').html(data);
+         $("#password_reset_complete_link").click();
          log_event("profile", {"type":"password_send"});
       });
     });
@@ -155,9 +155,7 @@ $(function() {
 
       <div id="change_password_pop">
         <h2>Password change</h2>
-        <p>We'll e-mail you a password reset link at ${email}. Follow
-        the link in the confirmation email to change your
-        password.</p>
+        <p>We'll e-mail a password reset link to ${email}.</p>
 
         <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
         <input type="submit" id="pwd_reset_button" value="Reset Password" />
@@ -167,3 +165,8 @@ $(function() {
   </div>
 </section>
 
+      <div id="password_reset_complete" class="leanModal_box">
+      <a href="#password_reset_complete" rel="leanModal" id="password_reset_complete_link"></a>
+        <h1>Password Reset Email Sent</h1>
+        An email has been sent to ${email}. Follow the link in the email to change your password.
+      </div>
diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss
index c1babea4ec..a1ff71cb0e 100644
--- a/sass/_askbot-original.scss
+++ b/sass/_askbot-original.scss
@@ -1014,27 +1014,27 @@ ul {
   font-weight: bold;
   font-size: 24px; }
 
-#fmask {
-  margin-bottom: 30px;
-  width: 100%; }
+// #fmask {
+//   margin-bottom: 30px;
+//   width: 100%; }
 
-#askFormBar {
-  display: inline-block;
-  padding: 4px 7px 5px 0px;
-  margin-top: 0px;
-  p {
-    margin: 0 0 5px 0;
-    font-size: 14px;
-    color: #525252;
-    line-height: 1.4; }
-  .questionTitleInput {
-    font-size: 24px;
-    line-height: 24px;
-    height: 36px;
-    margin: 0px;
-    padding: 0px 0 0 5px;
-    border: #cce6ec 3px solid;
-    width: 725px; } }
+// #askFormBar {
+//   display: inline-block;
+//   padding: 4px 7px 5px 0px;
+//   margin-top: 0px;
+//   p {
+//     margin: 0 0 5px 0;
+//     font-size: 14px;
+//     color: #525252;
+//     line-height: 1.4; }
+//   .questionTitleInput {
+//     font-size: 24px;
+//     line-height: 24px;
+//     height: 36px;
+//     margin: 0px;
+//     padding: 0px 0 0 5px;
+//     border: #cce6ec 3px solid;
+//     width: 725px; } }
 
 .ask-page div#question-list, .edit-question-page div#question-list {
   float: none;
@@ -1075,12 +1075,12 @@ ul {
   color: #525252;
   font-size: 13px; }
 
-.ask-page #id_tags, .edit-question-page #id_tags {
-  border: #cce6ec 3px solid;
-  height: 25px;
-  padding-left: 5px;
-  width: 395px;
-  font-size: 14px; }
+// .ask-page #id_tags, .edit-question-page #id_tags {
+//   border: #cce6ec 3px solid;
+//   height: 25px;
+//   padding-left: 5px;
+//   width: 395px;
+//   font-size: 14px; }
 
 .title-desc {
   color: #707070;
@@ -1126,8 +1126,8 @@ ul {
 //   margin-bottom: 10px;
 //   width: 710px; }
 
-#id_title {
-  width: 100%; }
+// #id_title {
+//   width: 100%; }
 
 // .wmd-preview {
 //   margin: 3px 0 5px 0;
@@ -2192,10 +2192,11 @@ ins {
 span {
   &.text-counter {
     margin-right: 20px; }
-  &.form-error {
-    color: #990000;
-    font-weight: normal;
-    margin-left: 5px; } }
+  // &.form-error {
+  //   color: #990000;
+  //   font-weight: normal;
+  //   margin-left: 5px; }
+  }
 
 p.form-item {
   margin: 0px; }
@@ -2247,11 +2248,11 @@ label.retag-error {
   margin-top: 10px;
   padding: 10px; }
 
-span.form-error {
-  color: #990000;
-  font-size: 90%;
-  font-weight: normal;
-  margin-left: 5px; }
+// span.form-error {
+//   color: #990000;
+//   font-size: 90%;
+//   font-weight: normal;
+//   margin-left: 5px; }
 
 .favorites-empty {
   width: 32px;
diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss
index c313320c5a..1743b236a3 100644
--- a/sass/_discussion-answers.scss
+++ b/sass/_discussion-answers.scss
@@ -54,3 +54,19 @@ div.answer-own {
   padding-left: flex-grid(1.2);
   padding-top: 10px;
 }
+
+div.answer-actions {
+  text-align: right;
+  margin: 0;
+  padding: 0;
+
+  span.sep {
+    color: #ddd;
+  }
+  a {
+    text-decoration: none;
+  }
+  a.question-edit, a.permant-link {
+    color: #999;
+  }
+}
diff --git a/sass/_discussion-forms.scss b/sass/_discussion-forms.scss
index af758bde45..4b6098adf9 100644
--- a/sass/_discussion-forms.scss
+++ b/sass/_discussion-forms.scss
@@ -12,8 +12,19 @@ form.answer-form {
     width: 99%;
   }
 
-  span.form-error {
-    display: block;
+  div.form-item {
+    margin: 25px 0;
+
+    label {
+      display: block;
+      margin-bottom: -5px;
+    }
+  }
+
+  span.form-error, label.form-error {
+    color: #990000;
+    display: inline;
+    font-size: 90%;
     font-weight: bold;
     padding: 10px 0;
   }
@@ -50,7 +61,24 @@ form.answer-form {
     }
   }
 }
+
 input.after-editor {
   margin-bottom: 20px;
   margin-right: 10px;
 }
+
+form.question-form {
+  @extend .answer-form;
+  border: none;
+  padding: 0;
+  margin-top: -15px;
+
+  input[type="text"] {
+    width: flex-grid(6);
+  }
+
+  input[type="checkbox"] {
+    margin-top: 10px;
+  }
+}
+
diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss
index 32b45bb7de..cbadfa3074 100644
--- a/sass/_leanmodal.scss
+++ b/sass/_leanmodal.scss
@@ -18,12 +18,30 @@ div.leanModal_box {
   background: #fff;
   padding: lh(2);
 
+  a.modal_close {
+    position: absolute;
+    top: 12px;
+    right: 12px;
+    display: block;
+    width: 14px;
+    height: 14px;
+    z-index: 2;
+    color: #aaa;
+    font-style: normal;
+
+    &:hover{
+      text-decoration: none;
+      color: $mit-red;
+    }
+  }
+
   h1 {
     font-size: 24px;
     margin-top: 0;
     padding-bottom: lh();
     border-bottom: 1px solid #eee;
     margin-bottom: lh();
+    text-align: left;
   }
 
   &#enroll {
@@ -187,3 +205,52 @@ div#feedback_div{
     }
   }
 }
+
+div#calculator_div {
+  max-width: 500px;
+
+  form {
+    padding-bottom: lh();
+    margin-bottom: lh();
+    border-bottom: 1px solid #ddd;
+
+    input#calculator_input {
+      width: 400px;
+    }
+
+    input#calculator_button {
+      background: 0;
+      color: $mit-red;
+      border: 0;
+      @include box-shadow(none);
+      padding: 0;
+      text-shadow: none;
+
+      &:hover {
+        color: #333;
+      }
+    }
+
+    input#calculator_output {
+      border: 0;
+      background: 0;
+      padding: lh(.35);
+      width: 60px;
+      font-size: 24px;
+      font-weight: bold;
+    }
+  }
+
+  dl {
+    dt {
+      float: left;
+      clear: both;
+      padding-right: lh(.5);
+      font-weight: bold;
+    }
+
+    dd {
+      float: left;
+    }
+  }
+}
diff --git a/simplewiki_base.html b/simplewiki_base.html
index 2770013771..17f110bf1a 100644
--- a/simplewiki_base.html
+++ b/simplewiki_base.html
@@ -102,10 +102,7 @@
           <div id="wiki_create_form">
             <%
               theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
-              if (wiki_article is not UNDEFINED):
-                baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
-              else:
-                baseURL = reverse("wiki_create", args=["/"])
+              baseURL = reverse("wiki_create", args=["/"])
             %>
 
             <form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 65ecbff4aa..a2161a22a7 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Create Article - MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
 Create article
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 30e2c6ecc0..7d7a9c6bb8 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
 ${ wiki_article.title }
diff --git a/simplewiki_error.html b/simplewiki_error.html
index f4269f1043..8b7324a998 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,7 +6,7 @@
     from django.core.urlresolvers import reverse
 %>
 
-<%block name="title"><title>Oops... - MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
 
 
 <%block name="wiki_page_title">
diff --git a/simplewiki_history.html b/simplewiki_history.html
index bea5a02284..87daba9f21 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html
index 8b579feda2..a1a7273692 100644
--- a/simplewiki_instructions.html
+++ b/simplewiki_instructions.html
@@ -5,7 +5,7 @@
   <p class="markdown-example">circuit:basic</p>
   <p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
   To create a new wiki article, create a link to it. Clicking the link gives you the creation page.  
-  <p class="markdown-example">[Article Name](wiki:ArticleName)</p>
+  <p class="markdown-example">[Article Name](/wiki/view/ArticleName)</p>
   Other useful examples:<br>
   <p class="markdown-example">[Link](http://google.com)</p>
   <p class="markdown-example">Huge Header
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 267a1f921b..c7d43dbeb5 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Search Results - MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
diff --git a/simplewiki_view.html b/simplewiki_view.html
index 05243b0bc1..ef7b02d6b2 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
+<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
 
 <%block name="wiki_page_title">
   ${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}

Suffixes	:	%kMGTcmunp
Operations	:	^ * / + - ()
Functions	:	sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
Constants	:	e