diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 6d06136..6f7df54 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,26 +1,29 @@
-<span class="tags">
-	<!-- BEGIN tags -->
-	<a href="{config.relative_path}/tags/{tags.value}">
-	<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span>
-	<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
-	<!-- END tags -->
-</span>
-
-<div class="topic-main-buttons pull-right">
-	<span class="loading-indicator btn pull-left hidden" done="0">
-		<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
+<div class="clearfix">
+	<span class="tags">
+		<!-- BEGIN tags -->
+		<a href="{config.relative_path}/tags/{tags.value}">
+		<span class="tag-item" data-tag="{tags.value}" style="<!-- IF tags.color -->color: {tags.color};<!-- ENDIF tags.color --><!-- IF tags.bgColor -->background-color: {tags.bgColor};<!-- ENDIF tags.bgColor -->">{tags.value}</span>
+		<span class="tag-topic-count human-readable-number" title="{tags.score}">{tags.score}</span></a>
+		<!-- END tags -->
 	</span>
 
-	<!-- IMPORT partials/topic/stats.tpl -->
+	<div class="topic-main-buttons pull-right">
+		<span class="loading-indicator btn pull-left hidden" done="0">
+			<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
+		</span>
 
-	<br class="visible-xs"/>
+		<!-- IMPORT partials/topic/stats.tpl -->
 
-	<!-- IMPORT partials/topic/reply-button.tpl -->
+		<br class="visible-xs"/>
 
-	<!-- IMPORT partials/topic/watch.tpl -->
+		<!-- IMPORT partials/topic/reply-button.tpl -->
 
-	<!-- IMPORT partials/topic/sort.tpl -->
+		<!-- IMPORT partials/topic/watch.tpl -->
 
-	<!-- IMPORT partials/thread_tools.tpl -->
+		<!-- IMPORT partials/topic/sort.tpl -->
+
+		<!-- IMPORT partials/thread_tools.tpl -->
+	</div>
 </div>
 
+<hr/>
\ No newline at end of file
diff --git a/templates/topic.tpl b/templates/topic.tpl
index d88106c..67746df 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -28,20 +28,20 @@
 				<!-- IMPORT partials/topic/post.tpl -->
 
 				<!-- IF !posts.index -->
-				<div class="post-bar clearfix" data-index="{posts.index}">
+				<div class="post-bar" data-index="{posts.index}">
 					<!-- IMPORT partials/post_bar.tpl -->
 				</div>
-				<hr />
+
 				<!-- ENDIF !posts.index -->
 			</li>
 
 		<!-- END posts -->
 	</ul>
 
-	<div class="post-bar bottom-post-bar clearfix <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
+	<div class="post-bar bottom-post-bar <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
 		<!-- IMPORT partials/post_bar.tpl -->
 	</div>
-	<hr />
+
 
 	<!-- IF config.usePagination -->
 		<!-- IMPORT partials/paginator.tpl -->