diff --git a/src/UserAction.css b/src/UserAction.css
index e41c133..cc4a96f 100644
--- a/src/UserAction.css
+++ b/src/UserAction.css
@@ -37,27 +37,46 @@
     display: flex;
     margin-bottom: .5em;
 }
+
 .post-form-bar label {
     flex: 1;
 }
+
 .post-form-bar input[type=file] {
     border: 0;
     padding: 0 0 0 .5em;
 }
+
 @media screen and (max-width: 580px) {
     .post-form-bar input[type=file] {
         width: 120px;
     }
 }
+
+@media screen and (max-width: 320px) {
+    .post-form-bar input[type=file] {
+        width: 100px;
+    }
+}
+
 .post-form-bar button {
-    flex: 0 0 8em;
+    flex: 0 0 6em;
     margin-right: 0;
 }
+
+@media screen and (max-width: 580px) {
+    .post-form-bar button {
+        flex: 0 0 4.5em;
+        margin-right: 0;
+    }
+}
+
 .post-form-img-tip {
     font-size: small;
     margin-top: -.5em;
     margin-bottom: .5em;
 }
+
 .post-form textarea {
     resize: vertical;
     width: 100%;
diff --git a/src/UserAction.js b/src/UserAction.js
index a7c705b..3befbb9 100644
--- a/src/UserAction.js
+++ b/src/UserAction.js
@@ -476,7 +476,7 @@ export class ReplyForm extends Component {
                 {
                     this.state.preview ? 
                     <div className='reply-preview'>
-                        <HighlightedMarkdown text={this.state.text} color_picker={this.props.color_picker} show_pid={this.props.show_pid} />
+                        <HighlightedMarkdown key={this.props.pid} text={this.state.text} color_picker={this.props.color_picker} show_pid={this.props.show_pid} />
                     </div> :
                     <SafeTextarea key={this.props.pid} ref={this.area_ref} id={this.props.pid} on_change={this.on_change_bound} on_submit={this.on_submit.bind(this)} />
                 }