diff --git a/profile.html b/profile.html
index e50efed801..689bffaa38 100644
--- a/profile.html
+++ b/profile.html
@@ -84,8 +84,10 @@ $(function() {
       <!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
 
       <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>
+        <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>
 
         <input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
         <input type="submit" id="pwd_reset_button" value="Reset Password" />
diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss
index 6fb2f026d6..461bc05176 100644
--- a/sass/_askbot-original.scss
+++ b/sass/_askbot-original.scss
@@ -1205,448 +1205,451 @@ ul {
 .edit-question-page .title-desc, #fmedit .title-desc, .wmd-preview .title-desc {
   margin-bottom: 10px; }
 
-.question-page {
-  h1 {
-    padding-top: 0px;
-    font-family: 'Yanone Kaffeesatz',sans-serif;
-    a {
-      color: #464646;
-      font-size: 30px;
-      font-weight: normal;
-      line-height: 1; } }
-  p.rss {
-    float: none;
-    clear: both;
-    padding: 3px 0 0 23px;
-    font-size: 15px;
-    width: 110px;
-    background-position: center left;
-    margin-left: 0px !important;
-    a {
-      font-family: 'Yanone Kaffeesatz',sans-serif;
-      vertical-align: top; } }
-  .question-content {
-    float: right;
-    width: 682px;
-    margin-bottom: 10px; }
-  #question-table {
-    float: left;
-    border-top: #f0f0f0 1px solid;
-    margin: 6px 0 6px 0;
-    border-spacing: 0px;
-    width: 670px;
-    padding-right: 10px; }
-  .answer-table {
-    margin: 6px 0 6px 0;
-    border-spacing: 0px;
-    width: 670px;
-    padding-right: 10px;
-    margin-top: 0px;
-    border-bottom: 1px solid #D4D4D4;
-    float: right;
-    td {
-      width: 20px;
-      vertical-align: top; } }
-  #question-table td {
-    width: 20px;
-    vertical-align: top; }
-  .question-body, .answer-body {
-    overflow: auto;
-    margin-top: 10px;
-    font-family: Arial;
-    color: #4b4b4b; }
-  .question-body p, .answer-body p {
-    margin-bottom: 14px;
-    line-height: 1.4;
-    font-size: 14px;
-    padding: 0px 5px 5px 0px; }
-  .question-body a, .answer-body a {
-    color: #1b79bd; }
-  .question-body li, .answer-body li {
-    margin-bottom: 7px; }
-  .question-body IMG, .answer-body IMG {
-    max-width: 600px; }
-  .post-update-info-container {
-    float: right;
-    width: 175px; }
-  .post-update-info {
-    background: white url(../images/background-user-info.png) repeat-x bottom;
-    float: right;
-    font-size: 9px;
-    font-family: Arial;
-    width: 158px;
-    padding: 4px;
-    margin: 0px 0px 5px 5px;
-    line-height: 14px;
-    border-radius: 4px;
-    -ms-border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    -khtml-border-radius: 4px;
-    -webkit-box-shadow: 0px 2px 1px #bfbfbf;
-    -moz-box-shadow: 0px 2px 1px #bfbfbf;
-    box-shadow: 0px 2px 1px #bfbfbf;
-    p {
-      line-height: 13px;
-      font-size: 11px;
-      margin: 0 0 2px 1px;
-      padding: 0; }
-    a {
-      color: #444; }
-    .gravatar {
-      float: left;
-      margin-right: 4px; }
-    p.tip {
-      color: #444;
-      line-height: 13px;
-      font-size: 10px; } }
-  .post-controls {
-    font-size: 11px;
-    line-height: 12px;
-    min-width: 200px;
-    padding-left: 5px;
-    text-align: right;
-    clear: left;
-    float: right;
-    margin-top: 10px;
-    margin-bottom: 8px;
-    a {
-      color: #777;
-      padding: 0px 3px 3px 22px;
-      cursor: pointer;
-      border: none;
-      font-size: 12px;
-      font-family: Arial;
-      text-decoration: none;
-      height: 18px;
-      display: block;
-      float: right;
-      line-height: 18px;
-      margin-top: -2px;
-      margin-left: 4px;
-      &:hover {
-        background-color: #f5f0c9;
-        border-radius: 3px;
-        -ms-border-radius: 3px;
-        -moz-border-radius: 3px;
-        -webkit-border-radius: 3px;
-        -khtml-border-radius: 3px; } }
-    .sep {
-      color: #ccc;
-      float: right;
-      height: 18px;
-      font-size: 18px; }
-    .question-delete {
-      background: url(../images/delete.png) no-repeat center left;
-      padding-left: 16px; } }
-  .answer-controls .question-delete {
-    background: url(../images/delete.png) no-repeat center left;
-    padding-left: 16px; }
-  .post-controls .question-flag, .answer-controls .question-flag {
-    background: url(../images/flag.png) no-repeat center left; }
-  .post-controls .question-edit, .answer-controls .question-edit {
-    background: url(../images/edit2.png) no-repeat center left; }
-  .post-controls .question-retag, .answer-controls .question-retag {
-    background: url(../images/retag.png) no-repeat center left; }
-  .post-controls .question-close, .answer-controls .question-close {
-    background: url(../images/close.png) no-repeat center left; }
-  .post-controls .permant-link, .answer-controls .permant-link {
-    background: url(../images/link.png) no-repeat center left; }
-  .tabBar {
-    width: 100%; }
-  #questionCount {
-    float: left;
-    font-family: 'Yanone Kaffeesatz',sans-serif;
-    line-height: 15px; }
-  .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote {
-    width: 25px;
-    height: 20px;
-    cursor: pointer; }
-  .question-img-upvote, .answer-img-upvote {
-    background: url(../images/vote-arrow-up-new.png) no-repeat; }
-  .question-img-downvote, .answer-img-downvote {
-    background: url(../images/vote-arrow-down-new.png) no-repeat; }
-  .question-img-upvote {
-    &:hover, &.on {
-      background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
-  .answer-img-upvote {
-    &:hover, &.on {
-      background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
-  .question-img-downvote {
-    &:hover, &.on {
-      background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
-  .answer-img-downvote {
-    &:hover, &.on {
-      background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
-  #fmanswer_button {
-    margin: 8px 0px; }
-  .question-img-favorite:hover {
-    background: url(../images/vote-favorite-on.png); }
-  div.comments {
-    padding: 0; }
-  #comment-title {
-    font-weight: bold;
-    font-size: 23px;
-    color: #7ea9b3;
-    width: 200px;
-    float: left;
-    font-family: 'Yanone Kaffeesatz',sans-serif; }
-  .comments {
-    font-size: 12px;
-    clear: both;
-    div.controls {
-      clear: both;
-      float: left;
-      width: 100%;
-      margin: 3px 0 20px 5px; }
-    .controls a {
-      color: #988e4c;
-      padding: 0 3px 2px 22px;
-      font-family: Arial;
-      font-size: 13px;
-      background: url(../images/comment.png) no-repeat center left;
-      &:hover {
-        background-color: #f5f0c9;
-        text-decoration: none; } }
-    .button {
-      color: #988e4c;
-      font-size: 11px;
-      padding: 3px;
-      cursor: pointer; }
-    a {
-      background-color: inherit;
-      color: #1b79bd;
-      padding: 0; }
-    form.post-comments {
-      margin: 3px 26px 0 42px;
-      textarea {
-        font-size: 13px;
-        line-height: 1.3; } }
-    textarea {
-      height: 42px;
-      width: 100%;
-      margin: 7px 0 5px 1px;
-      font-family: Arial;
-      outline: none;
-      overflow: auto;
-      font-size: 12px;
-      line-height: 140%;
-      padding-left: 2px;
-      padding-top: 3px;
-      border: #cce6ec 3px solid; }
-    input {
-      margin-left: 10px;
-      margin-top: 1px;
-      vertical-align: top;
-      width: 100px; }
-    button {
-      background: url(../images/small-button-blue.png) repeat-x top;
-      border: 0;
-      color: #4a757f;
-      font-family: Arial;
-      font-size: 13px;
-      width: 100px;
-      font-weight: bold;
-      height: 27px;
-      line-height: 25px;
-      margin-bottom: 5px;
-      cursor: pointer;
-      border-radius: 4px;
-      -ms-border-radius: 4px;
-      -moz-border-radius: 4px;
-      -webkit-border-radius: 4px;
-      -khtml-border-radius: 4px;
-      text-shadow: 0px 1px 0px #e6f6fa;
-      -moz-text-shadow: 0px 1px 0px #e6f6fa;
-      -webkit-text-shadow: 0px 1px 0px #e6f6fa;
-      -webkit-box-shadow: 1px 1px 2px #808080;
-      -moz-box-shadow: 1px 1px 2px #808080;
-      box-shadow: 1px 1px 2px #808080;
-      &:hover {
-        background: url(../images/small-button-blue.png) bottom repeat-x;
-        text-shadow: 0px 1px 0px #c6d9dd;
-        -moz-text-shadow: 0px 1px 0px #c6d9dd;
-        -webkit-text-shadow: 0px 1px 0px #c6d9dd; } }
-    .counter {
-      display: inline-block;
-      width: 245px;
-      float: right;
-      color: #b6a475 !important;
-      vertical-align: top;
-      font-family: Arial;
-      float: right;
-      text-align: right; }
-    .comment {
-      border-bottom: 1px solid #edeeeb;
-      clear: both;
-      margin: 0;
-      margin-top: 8px;
-      padding-bottom: 4px;
-      overflow: auto;
-      font-family: Arial;
-      font-size: 11px;
-      min-height: 25px;
-      background: white url(../images/comment-background.png) bottom repeat-x;
-      border-radius: 5px;
-      -ms-border-radius: 5px;
-      -moz-border-radius: 5px;
-      -webkit-border-radius: 5px;
-      -khtml-border-radius: 5px; }
-    div.comment:hover {
-      background-color: #efefef; }
-    a.author {
-      background-color: inherit;
-      color: #1b79bd;
-      padding: 0;
-      &:hover {
-        text-decoration: underline; } }
-    span.delete-icon {
-      background: url(../images/close-small.png) no-repeat;
-      border: 0;
-      width: 14px;
-      height: 14px;
-      &:hover {
-        border: #BC564B 2px solid;
-        border-radius: 10px;
-        -ms-border-radius: 10px;
-        -moz-border-radius: 10px;
-        -webkit-border-radius: 10px;
-        -khtml-border-radius: 10px;
-        margin: -3px 0px 0px -2px; } }
-    .content {
-      margin-bottom: 7px; }
-    .comment-votes {
-      float: left;
-      width: 37px;
-      line-height: 130%;
-      padding: 6px 5px 6px 3px; }
-    .comment-body {
-      line-height: 1.3;
-      margin: 3px 26px 0 46px;
-      padding: 5px 3px;
-      color: #666;
-      font-size: 13px;
-      .edit {
-        padding-left: 6px; }
-      p {
-        font-size: 13px;
-        line-height: 1.3;
-        margin-bottom: 3px;
-        padding: 0; } }
-    .comment-delete {
-      float: right;
-      width: 14px;
-      line-height: 130%;
-      padding: 8px 6px; }
-    .upvote {
-      margin: 0px;
-      padding-right: 17px;
-      padding-top: 2px;
-      text-align: right;
-      height: 20px;
-      font-size: 13px;
-      font-weight: bold;
-      color: #777;
-      &.upvoted {
-        color: #d64000; }
-      &.hover {
-        background: url(../images/go-up-grey.png) no-repeat;
-        background-position: right 1px; }
-      &:hover {
-        background: url(../images/go-up-orange.png) no-repeat;
-        background-position: right 1px; } }
-    .help-text {
-      float: right;
-      text-align: right;
-      color: gray;
-      margin-bottom: 0px;
-      margin-top: 0px;
-      line-height: 50%; } }
-  #questionTools {
-    font-size: 22px;
-    margin-top: 11px;
-    text-align: left; }
-  .question-status {
-    margin-top: 10px;
-    margin-bottom: 15px;
-    padding: 20px;
-    background-color: #fef7cc;
-    text-align: center;
-    border: #e1c04a 1px solid;
-    h3 {
-      font-size: 20px;
-      color: #707070;
-      font-weight: normal; } }
-  .vote-buttons {
-    float: left;
-    text-align: center;
-    padding-top: 2px;
-    margin: 10px 10px 0px 3px;
-    IMG {
-      cursor: pointer; } }
-  .vote-number {
-    font-family: 'Yanone Kaffeesatz',sans-serif;
-    padding: 0px 0 5px 0;
-    font-size: 25px;
-    font-weight: bold;
-    color: #777; }
-  .vote-buttons .notify-sidebar {
-    text-align: left;
-    width: 120px;
-    label {
-      vertical-align: top; } }
-  .tabBar-answer {
-    margin-bottom: 15px;
-    padding-left: 7px;
-    width: 723px;
-    margin-top: 10px; }
-  .answer .vote-buttons {
-    float: left; }
-  .accepted-answer {
-    background-color: #f7fecc;
-    border-bottom-color: #9BD59B;
-    .vote-buttons {
-      width: 27px;
-      margin-right: 10px;
-      margin-top: 10px; } }
-  .answer .post-update-info a {
-    color: #444444; }
-  .answered {
-    background: #CCC;
-    color: #999; }
-  .answered-accepted {
-    background: #DCDCDC;
-    color: #763333;
-    strong {
-      color: #E1E818; } }
-  .answered-by-owner {
-    background: #F1F1FF;
-    .comments {
-      .button {
-        background-color: #E6ECFF; }
-      background-color: #E6ECFF; }
-    .vote-buttons {
-      margin-right: 10px; } }
-  .answer-img-accept:hover {
-    background: url(../images/vote-accepted-on.png); }
-  .answer-body {
-    a {
-      color: #1b79bd; }
-    li {
-      margin-bottom: 0.7em; } }
-  #fmanswer {
-    color: #707070;
-    line-height: 1.2;
-    margin-top: 10px;
-    h2 {
-      font-family: 'Yanone Kaffeesatz',sans-serif;
-      color: #7ea9b3;
-      font-size: 24px; }
-    label {
-      font-size: 13px; } }
-  .message {
-    padding: 5px;
-    margin: 0px 0 10px 0; } }
+// .question-page {
+//   h1 {
+//     padding-top: 0px;
+//     font-family: 'Yanone Kaffeesatz',sans-serif;
+//     a {
+//       color: #464646;
+//       font-size: 30px;
+//       font-weight: normal;
+//       line-height: 1; } }
+//   p.rss {
+//     float: none;
+//     clear: both;
+//     padding: 3px 0 0 23px;
+//     font-size: 15px;
+//     width: 110px;
+//     background-position: center left;
+//     margin-left: 0px !important;
+//     a {
+//       font-family: 'Yanone Kaffeesatz',sans-serif;
+//       vertical-align: top; } }
+//   .question-content {
+//     float: right;
+//     width: 682px;
+//     margin-bottom: 10px; }
+//   #question-table {
+//     float: left;
+//     border-top: #f0f0f0 1px solid;
+//     margin: 6px 0 6px 0;
+//     border-spacing: 0px;
+//     width: 670px;
+//     padding-right: 10px; }
+//   .answer-table {
+//     margin: 6px 0 6px 0;
+//     border-spacing: 0px;
+//     width: 670px;
+//     padding-right: 10px;
+//     margin-top: 0px;
+//     border-bottom: 1px solid #D4D4D4;
+//     float: right;
+//     td {
+//       width: 20px;
+//       vertical-align: top; } }
+//   #question-table td {
+//     width: 20px;
+//     vertical-align: top; }
+//   .question-body, .answer-body {
+//     overflow: auto;
+//     margin-top: 10px;
+//     font-family: Arial;
+//     color: #4b4b4b; }
+//   .question-body p, .answer-body p {
+//     margin-bottom: 14px;
+//     line-height: 1.4;
+//     font-size: 14px;
+//     padding: 0px 5px 5px 0px; }
+//   .question-body a, .answer-body a {
+//     color: #1b79bd; }
+//   .question-body li, .answer-body li {
+//     margin-bottom: 7px; }
+//   .question-body IMG, .answer-body IMG {
+//     max-width: 600px; }
+//   .post-update-info-container {
+//     float: right;
+//     width: 175px; }
+//   .post-update-info {
+//     background: white url(../images/background-user-info.png) repeat-x bottom;
+//     float: right;
+//     font-size: 9px;
+//     font-family: Arial;
+//     width: 158px;
+//     padding: 4px;
+//     margin: 0px 0px 5px 5px;
+//     line-height: 14px;
+//     border-radius: 4px;
+//     -ms-border-radius: 4px;
+//     -moz-border-radius: 4px;
+//     -webkit-border-radius: 4px;
+//     -khtml-border-radius: 4px;
+//     -webkit-box-shadow: 0px 2px 1px #bfbfbf;
+//     -moz-box-shadow: 0px 2px 1px #bfbfbf;
+//     box-shadow: 0px 2px 1px #bfbfbf;
+//     p {
+//       line-height: 13px;
+//       font-size: 11px;
+//       margin: 0 0 2px 1px;
+//       padding: 0; }
+//     a {
+//       color: #444; }
+//     .gravatar {
+//       float: left;
+//       margin-right: 4px; }
+//     p.tip {
+//       color: #444;
+//       line-height: 13px;
+//       font-size: 10px; } }
+//   .post-controls {
+//     font-size: 11px;
+//     line-height: 12px;
+//     min-width: 200px;
+//     padding-left: 5px;
+//     text-align: right;
+//     clear: left;
+//     float: right;
+//     margin-top: 10px;
+//     margin-bottom: 8px;
+//     a {
+//       color: #777;
+//       padding: 0px 3px 3px 22px;
+//       cursor: pointer;
+//       border: none;
+//       font-size: 12px;
+//       font-family: Arial;
+//       text-decoration: none;
+//       height: 18px;
+//       display: block;
+//       float: right;
+//       line-height: 18px;
+//       margin-top: -2px;
+//       margin-left: 4px;
+//       &:hover {
+//         background-color: #f5f0c9;
+//         border-radius: 3px;
+//         -ms-border-radius: 3px;
+//         -moz-border-radius: 3px;
+//         -webkit-border-radius: 3px;
+//         -khtml-border-radius: 3px; } }
+//     .sep {
+//       color: #ccc;
+//       float: right;
+//       height: 18px;
+//       font-size: 18px; }
+//     .question-delete {
+//       background: url(../images/delete.png) no-repeat center left;
+//       padding-left: 16px; } }
+//   .answer-controls .question-delete {
+//     background: url(../images/delete.png) no-repeat center left;
+//     padding-left: 16px; }
+//   .post-controls .question-flag, .answer-controls .question-flag {
+//     background: url(../images/flag.png) no-repeat center left; }
+//   .post-controls .question-edit, .answer-controls .question-edit {
+//     background: url(../images/edit2.png) no-repeat center left; }
+//   .post-controls .question-retag, .answer-controls .question-retag {
+//     background: url(../images/retag.png) no-repeat center left; }
+//   .post-controls .question-close, .answer-controls .question-close {
+//     background: url(../images/close.png) no-repeat center left; }
+//   .post-controls .permant-link, .answer-controls .permant-link {
+//     background: url(../images/link.png) no-repeat center left; }
+//   .tabBar {
+//     width: 100%; }
+//   #questionCount {
+//     float: left;
+//     font-family: 'Yanone Kaffeesatz',sans-serif;
+//     line-height: 15px; }
+//   .question-img-upvote, .question-img-downvote, .answer-img-upvote, .answer-img-downvote {
+//     width: 25px;
+//     height: 20px;
+//     cursor: pointer; }
+//   .question-img-upvote, .answer-img-upvote {
+//     background: url(../images/vote-arrow-up-new.png) no-repeat; }
+//   .question-img-downvote, .answer-img-downvote {
+//     background: url(../images/vote-arrow-down-new.png) no-repeat; }
+//   .question-img-upvote {
+//     &:hover, &.on {
+//       background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
+//   .answer-img-upvote {
+//     &:hover, &.on {
+//       background: url(../images/vote-arrow-up-on-new.png) no-repeat; } }
+//   .question-img-downvote {
+//     &:hover, &.on {
+//       background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
+//   .answer-img-downvote {
+//     &:hover, &.on {
+//       background: url(../images/vote-arrow-down-on-new.png) no-repeat; } }
+//   #fmanswer_button {
+//     margin: 8px 0px; }
+//   .question-img-favorite:hover {
+//     background: url(../images/vote-favorite-on.png); }
+//   div.comments {
+//     padding: 0; }
+//   #comment-title {
+//     font-weight: bold;
+//     font-size: 23px;
+//     color: #7ea9b3;
+//     width: 200px;
+//     float: left;
+//     font-family: 'Yanone Kaffeesatz',sans-serif; }
+//   .comments {
+//     font-size: 12px;
+//     clear: both;
+//     div.controls {
+//       clear: both;
+//       float: left;
+//       width: 100%;
+//       margin: 3px 0 20px 5px; }
+//     .controls a {
+//       color: #988e4c;
+//       padding: 0 3px 2px 22px;
+//       font-family: Arial;
+//       font-size: 13px;
+//       background: url(../images/comment.png) no-repeat center left;
+//       &:hover {
+//         background-color: #f5f0c9;
+//         text-decoration: none; } }
+//     .button {
+//       color: #988e4c;
+//       font-size: 11px;
+//       padding: 3px;
+//       cursor: pointer; }
+//     a {
+//       background-color: inherit;
+//       color: #1b79bd;
+//       padding: 0; }
+//     form.post-comments {
+//       margin: 3px 26px 0 42px;
+//       textarea {
+//         font-size: 13px;
+//         line-height: 1.3; } }
+//     textarea {
+//       height: 42px;
+//       width: 100%;
+//       margin: 7px 0 5px 1px;
+//       font-family: Arial;
+//       outline: none;
+//       overflow: auto;
+//       font-size: 12px;
+//       line-height: 140%;
+//       padding-left: 2px;
+//       padding-top: 3px;
+//       border: #cce6ec 3px solid; }
+//     input {
+//       margin-left: 10px;
+//       margin-top: 1px;
+//       vertical-align: top;
+//       width: 100px; }
+//     button {
+//       background: url(../images/small-button-blue.png) repeat-x top;
+//       border: 0;
+//       color: #4a757f;
+//       font-family: Arial;
+//       font-size: 13px;
+//       width: 100px;
+//       font-weight: bold;
+//       height: 27px;
+//       line-height: 25px;
+//       margin-bottom: 5px;
+//       cursor: pointer;
+//       border-radius: 4px;
+//       -ms-border-radius: 4px;
+//       -moz-border-radius: 4px;
+//       -webkit-border-radius: 4px;
+//       -khtml-border-radius: 4px;
+//       text-shadow: 0px 1px 0px #e6f6fa;
+//       -moz-text-shadow: 0px 1px 0px #e6f6fa;
+//       -webkit-text-shadow: 0px 1px 0px #e6f6fa;
+//       -webkit-box-shadow: 1px 1px 2px #808080;
+//       -moz-box-shadow: 1px 1px 2px #808080;
+//       box-shadow: 1px 1px 2px #808080;
+//       &:hover {
+//         background: url(../images/small-button-blue.png) bottom repeat-x;
+//         text-shadow: 0px 1px 0px #c6d9dd;
+//         -moz-text-shadow: 0px 1px 0px #c6d9dd;
+//         -webkit-text-shadow: 0px 1px 0px #c6d9dd; } }
+//     .counter {
+//       display: inline-block;
+//       width: 245px;
+//       float: right;
+//       color: #b6a475 !important;
+//       vertical-align: top;
+//       font-family: Arial;
+//       float: right;
+//       text-align: right; }
+//     .comment {
+//       border-bottom: 1px solid #edeeeb;
+//       clear: both;
+//       margin: 0;
+//       margin-top: 8px;
+//       padding-bottom: 4px;
+//       overflow: auto;
+//       font-family: Arial;
+//       font-size: 11px;
+//       min-height: 25px;
+//       background: white url(../images/comment-background.png) bottom repeat-x;
+//       border-radius: 5px;
+//       -ms-border-radius: 5px;
+//       -moz-border-radius: 5px;
+//       -webkit-border-radius: 5px;
+//       -khtml-border-radius: 5px; }
+//     div.comment:hover {
+//       background-color: #efefef; }
+//     a.author {
+//       background-color: inherit;
+//       color: #1b79bd;
+//       padding: 0;
+//       &:hover {
+//         text-decoration: underline; } }
+//     span.delete-icon {
+//       background: url(../images/close-small.png) no-repeat;
+//       border: 0;
+//       width: 14px;
+//       height: 14px;
+//       &:hover {
+//         border: #BC564B 2px solid;
+//         border-radius: 10px;
+//         -ms-border-radius: 10px;
+//         -moz-border-radius: 10px;
+//         -webkit-border-radius: 10px;
+//         -khtml-border-radius: 10px;
+//         margin: -3px 0px 0px -2px; } }
+//     .content {
+//       margin-bottom: 7px; }
+//     .comment-votes {
+//       float: left;
+//       width: 37px;
+//       line-height: 130%;
+//       padding: 6px 5px 6px 3px; }
+//     .comment-body {
+//       line-height: 1.3;
+//       margin: 3px 26px 0 46px;
+//       padding: 5px 3px;
+//       color: #666;
+//       font-size: 13px;
+//       .edit {
+//         padding-left: 6px; }
+//       p {
+//         font-size: 13px;
+//         line-height: 1.3;
+//         margin-bottom: 3px;
+//         padding: 0; } }
+//     .comment-delete {
+//       float: right;
+//       width: 14px;
+//       line-height: 130%;
+//       padding: 8px 6px; }
+//     .upvote {
+//       margin: 0px;
+//       padding-right: 17px;
+//       padding-top: 2px;
+//       text-align: right;
+//       height: 20px;
+//       font-size: 13px;
+//       font-weight: bold;
+//       color: #777;
+//       &.upvoted {
+//         color: #d64000; }
+//       &.hover {
+//         background: url(../images/go-up-grey.png) no-repeat;
+//         background-position: right 1px; }
+//       &:hover {
+//         background: url(../images/go-up-orange.png) no-repeat;
+//         background-position: right 1px; } }
+//     .help-text {
+//       float: right;
+//       text-align: right;
+//       color: gray;
+//       margin-bottom: 0px;
+//       margin-top: 0px;
+//       line-height: 50%; } }
+//   #questionTools {
+//     font-size: 22px;
+//     margin-top: 11px;
+//     text-align: left; }
+//   .question-status {
+//     margin-top: 10px;
+//     margin-bottom: 15px;
+//     padding: 20px;
+//     background-color: #fef7cc;
+//     text-align: center;
+//     border: #e1c04a 1px solid;
+//     h3 {
+//       font-size: 20px;
+//       color: #707070;
+//       font-weight: normal; } }
+//   .vote-buttons {
+//     // float: left;
+//     // text-align: center;
+//     // padding-top: 2px;
+//     // margin: 10px 10px 0px 3px;
+//     IMG {
+//       cursor: pointer; } }
+//   .vote-number {
+//     font-family: 'Yanone Kaffeesatz',sans-serif;
+//     padding: 0px 0 5px 0;
+//     font-size: 25px;
+//     font-weight: bold;
+//     color: #777; }
+//   .vote-buttons .notify-sidebar {
+//     // text-align: left;
+//     // width: 120px;
+//     label {
+//       vertical-align: top; } }
+//   .tabBar-answer {
+//     margin-bottom: 15px;
+//     padding-left: 7px;
+//     width: 723px;
+//     margin-top: 10px; }
+//   .answer .vote-buttons {
+//     // float: left;
+//   }
+//   .accepted-answer {
+//     background-color: #f7fecc;
+//     border-bottom-color: #9BD59B;
+//     // .vote-buttons {
+//     //   width: 27px;
+//     //   margin-right: 10px;
+//     //   margin-top: 10px; } 
+//   }
+//   .answer .post-update-info a {
+//     color: #444444; }
+//   .answered {
+//     background: #CCC;
+//     color: #999; }
+//   .answered-accepted {
+//     background: #DCDCDC;
+//     color: #763333;
+//     strong {
+//       color: #E1E818; } }
+//   .answered-by-owner {
+//     background: #F1F1FF;
+//     .comments {
+//       .button {
+//         background-color: #E6ECFF; }
+//       background-color: #E6ECFF; }
+//     // .vote-buttons {
+//       // margin-right: 10px; }
+//     }
+//   .answer-img-accept:hover {
+//     background: url(../images/vote-accepted-on.png); }
+//   .answer-body {
+//     a {
+//       color: #1b79bd; }
+//     li {
+//       margin-bottom: 0.7em; } }
+//   #fmanswer {
+//     color: #707070;
+//     line-height: 1.2;
+//     margin-top: 10px;
+//     h2 {
+//       font-family: 'Yanone Kaffeesatz',sans-serif;
+//       color: #7ea9b3;
+//       font-size: 24px; }
+//     label {
+//       font-size: 13px; } }
+//   .message {
+//     padding: 5px;
+//     margin: 0px 0 10px 0; } }
 
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   textarea {
@@ -2704,4 +2707,3 @@ pre.prettyprint {
 //     color: #404; }
 //   .atv {
 //     color: #060; } }
-
diff --git a/sass/_base.scss b/sass/_base.scss
index 4df1d6de88..a703cf208e 100644
--- a/sass/_base.scss
+++ b/sass/_base.scss
@@ -2,6 +2,12 @@
   outline-color: #ccc;
 }
 
+h1, h2, h3, h4, h5, h6 {
+  a {
+    color: #000;
+  }
+}
+
 h1 {
   font-size:1.6em;
   margin:20px 0 10px 0;
diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss
index 73b39f738f..8c7f04871a 100644
--- a/sass/_discussion-questions.scss
+++ b/sass/_discussion-questions.scss
@@ -74,10 +74,6 @@ ul.question-list {
           font-weight: normal;
           margin: 0px 0 15px 0;
           text-transform: none;
-
-          a {
-            color: #000;
-          }
         }
 
         div.user-info {
@@ -158,3 +154,41 @@ div.search-tips {
 .search-result-summary {
 }
 
+div.post-update-info {
+  @include box-sizing(border-box);
+  @include border-radius(5px);
+  background:lighten(#F6EFD4, 5%);
+  padding: 10px;
+
+  a {
+    color:$mit-red ;
+  }
+
+  div.change-date {
+    font-size: 12px;
+    margin-bottom: 10px;
+  }
+
+  div.avatar {
+    display: inline-block;
+    float: left;
+    margin-right: 3px;
+
+    img.gravatar {
+      background: white;
+      border: 1px solid darken(#F6EFD4, 10%);
+      margin-right: 5px;
+      padding: 3px ;
+      vertical-align: bottom;
+    }
+  }
+
+  div.user-meta {
+    display: inline-block;
+    width: 60%;
+
+    span.user-badges {
+      display: block;
+    }
+  }
+}
diff --git a/sass/_discussion-tags.scss b/sass/_discussion-tags.scss
index af4fc11f4a..8dcbb2446e 100644
--- a/sass/_discussion-tags.scss
+++ b/sass/_discussion-tags.scss
@@ -10,13 +10,13 @@ ul.tags {
     display: inline;
     font-size: 12px;
     margin-left: 15px;
-    padding: 5px 10px 5px 5px;
+    padding: 3px 10px 5px 5px;
 
     &:before {
      content:"";
      position:absolute;
      top:0;
-     left:-12px;
+     left:-11px;
      width:0;
      height:0;
      border-color:transparent #eee transparent transparent;
diff --git a/sass/_question-view.scss b/sass/_question-view.scss
new file mode 100644
index 0000000000..1035f156df
--- /dev/null
+++ b/sass/_question-view.scss
@@ -0,0 +1,70 @@
+div.question-header {
+  div.vote-buttons {
+    display: inline-block;
+    float: left;
+    width: flex-grid(1,9);
+    margin-right: flex-gutter(9);
+  }
+
+  div.question-container {
+    display: inline-block;
+    float: left;
+    width: flex-grid(8,9);
+
+    h1 {
+      margin-top: 0;
+    }
+
+    div.meta-bar {
+      border-bottom: 1px solid #eee;
+      display: block;
+      margin: 20px 0 10px;
+      overflow: hidden;
+      padding-bottom: 15px;
+
+
+      div.tag-list {
+        display: inline-block;
+        float:left;
+        width: flex-grid(4,8);
+        margin-right: flex-gutter(8);
+      }
+
+      div.question-actions {
+        display: inline-block;
+        float:left;
+        text-align: right;
+        width: flex-grid(4,8);
+
+        a {
+          color: darken(#F6EFD4, 50%);
+
+          &.question-delete {
+            color: $mit-red;
+          }
+        }
+
+        span.sep {
+          color: darken(#F6EFD4, 10%);
+        }
+      }
+    }
+
+    div.question-content {
+      overflow: hidden;
+
+      div.question-body {
+        display: inline-block;
+        float: left;
+        margin-right: flex-gutter(8);
+        width: flex-grid(6.2,8);
+      }
+
+      div.post-update-info {
+        display: inline-block;
+        float: left;
+        width: flex-grid(1.8,8);
+      }
+    }
+  }
+}
diff --git a/sass/application.scss b/sass/application.scss
index cf57b00093..6d046c2a6a 100644
--- a/sass/application.scss
+++ b/sass/application.scss
@@ -14,7 +14,7 @@
 @import "wiki-basic-html", "wiki-create", "wiki";
 @import "activation";
 @import "help";
-@import "askbot-original", "discussion", "discussion-questions", "discussion-tags" ;
+@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ;
 
 // left over
 @import "theme";