diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 1eaeb69c3f..98e8131997 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -303,11 +303,11 @@ address {
     position: relative;
     float: left;
     width: 520px;
-    padding-bottom: 15px;
+    padding-bottom: 20px;
 }
 
 #input_form_status, #input_form_direct {
-    padding-bottom: 45px;
+    padding-bottom: 50px;
 }
 
 .form_notice {
@@ -325,8 +325,8 @@ address {
 }
 
 .form_notice_placeholder .placeholder {
-    width: 473px;
-    padding: 4px 10px 4px 10px;
+    width: 508px;
+    padding: 4px 4px 4px 6px;
     border: 1px solid #a6a6a6;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
@@ -336,12 +336,13 @@ address {
     -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
     z-index: 97;
     font-size: 1em;
+    color: #888;
 }
 
 .form_notice textarea {
-    width: 473px;
+    width: 483px;
     height: 42px;
-    padding: 6px 10px 18px 10px;
+    padding: 6px 5px 18px 5px;
     border: 1px solid #a6a6a6;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
@@ -354,7 +355,7 @@ address {
 }
 
 #form_notice-direct.form_notice textarea {
-    width: 498px;
+    width: 508px;
 }
 
 .form_notice label.notice_data-attach {
@@ -373,7 +374,7 @@ address {
 .form_notice .count {
     position: absolute;
     top: 50px;
-    right: 35px;
+    right: 32px;
     font-size: 0.8em; 
     height: 1em;
     z-index: 99;
@@ -381,16 +382,16 @@ address {
 
 #form_notice-direct.form_notice .count {
     top: 80px;
-    right: 10px;
+    right: 7px;
 }
 
 .form_notice #notice_action-submit {
     position: absolute;
     top: 100%;
     left: 0px;
-    margin-top: -44px;
+    margin-top: -49px;
     float: left;
-    width: 90px;
+    width: 100px;
     padding: 0px;
     z-index: 99;
 }
@@ -407,6 +408,9 @@ address {
     margin-top: 10px;
     padding: 5px 5px 5px 10px;
     border: 1px solid #ccc;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 
 .form_notice .error {
@@ -423,7 +427,78 @@ address {
 }
 
 .input_form fieldset fieldset {
-    margin-bottom: 10px !important;
+    width: 400px;
+    float: left;
+    background: none;
+    border: none;
+    margin-bottom: 0px !important;
+    padding: 0px !important;
+}
+
+.input_form .form_settings .form_data li {
+    position: relative;
+    margin-bottom: 12px;
+}
+
+.input_form fieldset fieldset label {
+    position: absolute;
+    top: 0;
+    left: 6px;
+    float: none;
+    text-align: left;
+    color: #888;
+    cursor: text;
+}
+
+.input_form .form_settings li input {
+    width: 388px;
+    margin-left: 0;
+    margin-right: 0;
+    padding: 4px 5px 4px 5px;
+    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);
+    font-size: 1em;
+}
+
+.input_form .form_settings li textarea {
+    width: 388px;
+    margin-left: 0;
+    padding: 4px 5px 4px 5px;
+    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);
+    z-index: 97;
+    font-size: 1em;
+}
+
+.input_form .form_settings p.form_guide {
+    margin-left: 5px;
+}
+
+.input_form .form_settings .submit {
+    position: relative;
+    top: 0;
+    right: 0;
+    float: right;   
+    width: 100px;
+    height: 26px;
+    line-height: 26px;
+    padding: 0px 10px;
+    margin: 0px;
+    color:#fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.1em;
+    z-index: 1;
 }
 
 .to-selector { 
@@ -432,15 +507,16 @@ address {
 }
 
 .form_settings label[for=notice_to] {
-    margin-left: 100px;
-    margin-right: 5px;
+    left: 5px;
+    margin-left: 0px;
+    margin-right: 10px;
+    position: relative;
+    clear: left;
 }
 
 .checkbox-wrapper {
     padding: 2px;
-    clear: left;
-    display: block;
-    margin-left: 26%;
+    margin-left: 10px;
 }
 
 .form_notice .checkbox-wrapper {
@@ -453,6 +529,7 @@ address {
     margin-top: 6px;
     line-height: 1.2em;
     left: -3px;
+    float: none;
 }
 
 .checkbox-wrapper #notice_private {
@@ -465,6 +542,11 @@ address {
     opacity: 0.6;
 }
 
+.checkbox-wrapper.unchecked label.checkbox:hover {
+    opacity: 1;
+    cursor: pointer;
+}
+
 .checkbox-wrapper.checked label.checkbox {
     padding-left: 20px;
     background: url(../images/lock.png) no-repeat 0px 0px;
@@ -472,6 +554,10 @@ address {
     opacity: 1;
 }
 
+.checkbox-wrapper.checked label.checkbox:hover {
+    cursor: pointer;
+}
+
 #aside_primary {
     width: 218px;
     float: left;
@@ -755,7 +841,7 @@ div.entry-content a.response:after {
 }
 
 .threaded-replies .form_notice textarea {
-    width: 385px;
+    width: 395px;
 }
 
 .threaded-replies .form_notice label.notice_data-attach {
@@ -776,6 +862,7 @@ div.entry-content a.response:after {
 
 .threaded-replies .form_notice #notice_action-submit {
     left: 10px;
+    margin-top: -44px;
 }
 
 .threaded-replies .form_notice .error,
@@ -1177,6 +1264,16 @@ ul.bookmark-tags a:hover {
     margin-bottom: 10px;
 }
 
+#form_initial_bookmark.form_settings .form_data li {
+    margin-bottom: 0px;
+}
+
+#form_new_bookmark.form_settings .bookmarkform-thumbnail {
+    position: absolute;
+    top: 50px;
+    right: 0px;
+}
+
 /* Onboard specific styles */
 
 .onboard-flash {
@@ -1356,6 +1453,24 @@ table.profile_list tr.alt {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
 }
 
+#input_form_event .form_settings .form_data {
+    float: left;
+}
+
+#input_form_event .form_settings .form_data li {
+    float: left;
+    width: auto;
+}
+
+#input_form_event .form_settings .form_data label {
+    width: auto;
+}
+
+#event-startdate, #event-starttime, #event-enddate, #event-endtime {
+    width: 120px;
+    margin-right: 20px;
+}
+
 /* Limited-scope specific styles */
 
 .limited-scope .entry-content .timestamp {
@@ -1427,7 +1542,7 @@ table.profile_list tr.alt {
     display: none;
 }
 
-.question label[for=answer], .qna-full-question label[for=answer] {
+.question label[for=qna-answer], .qna-full-question label[for=qna-answer] {
     display: none;
 }