diff --git a/js/auto-reload.js b/js/auto-reload.js
index 47063984..6935409e 100644
--- a/js/auto-reload.js
+++ b/js/auto-reload.js
@@ -158,7 +158,7 @@ $(document).ready(function(){
 							first_new_post = this;
 							makeIcon();
 						}
-						$(this).insertAfter($('div.post:last').next()).after('<br class="clear">');
+						$('div.thread').append($('<br class="clear">')).after(this);
 						new_posts++;
 						loaded_posts++;
 						$(document).trigger('new_post', this);
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 33e953ee..aa130c0a 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -85,5 +85,6 @@
 {% for post in post.posts %}
 	{% include 'post_reply.html' %}
 {% endfor %}
-<br class="clear"/>{% if hr %}<hr/>{% endif %}
+<br class="clear"/>
 </div>
+{% if hr %}<hr/>{% endif %}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 67117c1e..83f70775 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -47,8 +47,7 @@
 						{% endif %}
                                                  id="img-{{ post.id }}" data-subject="{% if post.subject %}{{ post.subject }}{% endif %}" data-name="{{ post.name }}" data-muhdifference="{{ post.muhdifference }}" data-last-reply="{% if post.last_reply %}{{ post.last_reply }}{% endif %}" data-last-subject="{% if post.last_reply_subject %}{{ post.last_reply_subject }}{% endif %}" data-last-name="{% if post.last_reply %}{{ post.last_reply_name }}{% endif %}" data-last-difference="{% if post.last_reply %}{{ post.last_reply_difference }}{% endif %}" class="{{post.board}} thread-image" title="{{post.bump|date('%b %d %H:%M')}}">
                                         </a>
-                                        <p>
-                                                <span class="replies">
+                                                <div class="replies">
                                                         <strong>R: {{ post.reply_count }} / I: {{ post.image_count }}</strong>
                                                         {% if post.subject %}
 								<p class="intro">
@@ -61,8 +60,7 @@
 							{% endif %}
 
 								{{ post.body }}
-                                                </span>
-                                        </p>
+                                                </div>
                                 </div>
                         </div>
                 {% endfor %}