diff --git a/sass/_discussion-questions.scss b/sass/_discussion-questions.scss
index 8c7f04871a..18a4575aa6 100644
--- a/sass/_discussion-questions.scss
+++ b/sass/_discussion-questions.scss
@@ -153,42 +153,3 @@ 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/_question-view.scss b/sass/_question-view.scss
index 4f3cac582f..abbc16669f 100644
--- a/sass/_question-view.scss
+++ b/sass/_question-view.scss
@@ -2,34 +2,40 @@ div.question-header {
   div.vote-buttons {
     display: inline-block;
     float: left;
-    width: flex-grid(1,9);
     margin-right: flex-gutter(9);
+    width: flex-grid(0.7,9);
 
-    ul li {
-      background-position: center;
-      background-repeat: no-repeat;
-      cursor: pointer;
-      font-weight: bold;
-      height: 20px;
-      list-style: none;
-      padding: 10px;
-      text-align: center;
-      width: 25px;
+    ul {
+      li {
+        background-position: center;
+        background-repeat: no-repeat;
+        cursor: pointer;
+        font-weight: bold;
+        height: 20px;
+        list-style: none;
+        padding: 10px;
+        text-align: center;
+        width: 70%;
 
-      &.question-img-upvote, &.answer-img-upvote  {
-        background-image: url(/static/images/askbot/vote-arrow-up-new.png);
-        background-color: #F6EFD4;
-
-        &:hover, &.on {
-          background-image: url(/static/images/askbot/vote-arrow-up-on-new.png);
+        &.post-vote {
+          @include border-radius(4px);
+          background-color: lighten(#F6EFD4, 3%);
         }
-      }
 
-      &.question-img-downvote, &.answer-img-downvote  {
-        background-image: url(/static/images/askbot/vote-arrow-down-new.png);
+        &.question-img-upvote, &.answer-img-upvote  {
+          background-image: url(/static/images/askbot/vote-arrow-up.png);
 
-        &:hover, &.on {
-          background-image: url(/static/images/askbot/vote-arrow-down-on-new.png);
+          &:hover, &.on {
+            background-color:#d1e3a8;
+          }
+        }
+
+        &.question-img-downvote, &.answer-img-downvote  {
+          background-image: url(/static/images/askbot/vote-arrow-down.png);
+
+          &:hover, &.on {
+            background-color:#eac6ad;
+          }
         }
       }
     }
@@ -38,7 +44,7 @@ div.question-header {
   div.question-container {
     display: inline-block;
     float: left;
-    width: flex-grid(8,9);
+    width: flex-grid(8.3,9);
 
     h1 {
       margin-top: 0;
@@ -47,9 +53,9 @@ div.question-header {
     div.meta-bar {
       border-bottom: 1px solid #eee;
       display: block;
-      margin: 20px 0 10px;
+      margin: 10px 0;
       overflow: hidden;
-      padding-bottom: 15px;
+      padding: 5px 0 10px;
 
 
       div.tag-list {
@@ -89,10 +95,128 @@ div.question-header {
         width: flex-grid(6.2,8);
       }
 
-      div.post-update-info {
+      div.post-update-container {
         display: inline-block;
         float: left;
         width: flex-grid(1.8,8);
+
+        div.post-update-info {
+          @include box-sizing(border-box);
+          @include border-radius(5px);
+          background:lighten(#F6EFD4, 5%);
+          padding: 10px;
+          margin-bottom: 10px;
+
+          &:last-child {
+            margin-bottom: 0;
+          }
+
+          &.revision {
+            text-align: center;
+            background:lighten(#F6EFD4, 7%);
+
+            a {
+              color: black;
+            }
+          }
+
+          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;
+            }
+          }
+        }
+      }
+    }
+
+    div.comments-container {
+      @include box-sizing(border-box);
+      background: lighten(#efefef, 3%);
+      padding: 3%;
+      display: inline-block;
+      margin: 15px 0 0;
+      padding: 3%;
+      width: 100%;
+
+      div.comments-content {
+        font-size: 13px;
+
+        div.comment {
+          border-bottom: 1px solid #ddd;
+          border-top: 1px solid #fff;
+          padding: 15px 0;
+          display: block;
+
+          &:first-child {
+            border-top: 0;
+          }
+
+          &:last-child {
+            margin-bottom: 20px;
+          }
+
+          div.comment-votes {
+            display: inline;
+
+            .upvote {
+              background: #ccc;
+              display:inline-block;
+              margin: 0px;
+              padding-right: 17px;
+              padding-top: 2px;
+              height: 20px;
+              color: #777;
+              width: 20px;
+            }
+          }
+
+          div.comment-delete {
+            display: inline;
+          }
+
+          div.comment-body {
+          }
+        }
+      }
+
+      #edit-comment-form {
+        margin: 10px 0;
+        min-height: 100px;
+        width: 99%;
+        resize: vertical;
+      }
+      .counter {
+        color: #888;
+        display: block;
+        float: right;
+        margin-top: 5px;
+        text-align: right;
       }
     }
   }