diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index b3ead08f73..fbaacabf70 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -717,7 +717,7 @@ address {
 }
 
 #content .notice {
-    padding-bottom: 14px;
+    padding-bottom: 4px;
     border-bottom: 2px dotted #eee;
 }
 
@@ -728,7 +728,7 @@ address {
 
 #content .notice .author .photo {
     left: 0px;
-    top: 9px;
+    top: 7px;
 }
 
 #content .notice .entry-title {
@@ -768,6 +768,7 @@ div.entry-content a.response:after {
 
 .notice-options {
     margin-top: 4px;
+    margin-bottom: 10px;
 }
 
 .threaded-replies {
@@ -776,12 +777,17 @@ div.entry-content a.response:after {
     width: 458px;
     margin-left: 59px;
     margin-top: 10px;
+    margin-bottom: 10px;
     padding-right: 2px;
     border-left: 3px solid #ECECF2;
     background: #fafafa;
     font-size: 1em;
 }
 
+.user_in .threaded-replies {
+    margin-top: 0px;
+}
+
 #content .notice .threaded-replies .notice,
 #content .notice .threaded-replies .notice-data {
     width: 440px;
@@ -803,7 +809,7 @@ div.entry-content a.response:after {
 #content .threaded-replies .notice .author .photo {
     height: 24px;
     width: 24px;
-    top: 14px;
+    top: 12px;
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
@@ -817,7 +823,16 @@ div.entry-content a.response:after {
     clear:left;
     float:left;
     margin-left: 35px;
-    margin-top: 4px !important;
+    margin-top: 6px !important;
+}
+
+#content .notice .threaded-replies .notice div.entry-content.notice-faves {
+    margin-top: 2px !important;
+}
+
+#content .notice .threaded-replies .notice .notice-options {
+    margin-top: 5px;
+    margin-bottom: 0px;
 }
 
 .threaded-replies li {
@@ -831,6 +846,15 @@ div.entry-content a.response:after {
 .threaded-replies .placeholder {
     margin: 10px;
     width: 426px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    color: #888;
 }
 
 .threaded-replies .notice-reply {
@@ -1558,6 +1582,49 @@ table.profile_list tr.alt {
     content: ')';
 }
 
+.question .notice-answer {
+    margin-left: 10px;
+    padding-bottom: 10px;
+}
+
+ul.qna-dummy {
+    clear: left;
+    float: left;
+    list-style-type: none;
+    width: 458px;
+    margin-left: 59px;
+    padding-right: 2px;
+    border-left: 3px solid #ECECF2;
+    background: #fafafa;
+    font-size: 1em;
+}
+
+ul.qna-dummy + ul.threaded-replies li.notice:first-child {
+    border-top: 2px dotted #eee;
+    margin-top: -10px;
+    padding-top: 10px;
+}
+
+.qna-dummy-placeholder input {
+    margin: 10px;
+    width: 426px;
+    padding: 4px 4px 4px 6px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    color: #888;
+}
+
+li.notice-answer + li.notice {
+    border-top: 2px dotted #eee;
+    margin-top: -10px;
+    padding-top: 10px;
+}
+
 .question fieldset, .qna-full-question fieldset {
     margin: 0px;
 }
@@ -1570,10 +1637,10 @@ table.profile_list tr.alt {
     display: none;
 }
 
-.question textarea, .qna-full-question textarea {
-    width: 100%;
-    height: 42px;
-    padding: 6px 10px 18px 10px;
+.question #qna-answer, .qna-full-question #qna-answer {
+    width: 426px;
+    height: 54px;
+    padding: 6px 5px;
     border: 1px solid #a6a6a6;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
@@ -1582,12 +1649,12 @@ table.profile_list tr.alt {
     -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     font-size: 1.2em;
-    margin-top: 15px;
+    margin-top: 10px;
     margin-bottom: 10px;
 }
 
 .qna-full-question textarea {
-    width: 473px;
+    width: 508px;
 }
 
 .question-description input.submit, .answer-content input.submit {