diff --git a/less/topic.less b/less/topic.less
index cc40f68..50e5770 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -601,7 +601,7 @@
 }
 
 [component="post"] {
-	&.topic-owner-post .post-header .avatar {
+	&.topic-owner-post>.post-header .avatar {
 		-webkit-box-shadow: 0px 0px 4px 3px @brand-primary;
 		-moz-box-shadow: 0px 0px 4px 3px @brand-primary;
 		box-shadow: 0px 0px 4px 3px @brand-primary;
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 4b429fc..2d744ff 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -53,13 +53,14 @@
 	{posts.content}
 </div>
 
-<div class="clearfix post-footer">
-	<!-- IF posts.user.signature -->
+<div class="post-footer">
+	{{{ if posts.user.signature }}}
 	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
-	<!-- ENDIF posts.user.signature -->
+	{{{ end }}}
 
+	<div class="clearfix">
 	{{{ if !hideReplies }}}
-	<a component="post/reply-count" href="#" class="threaded-replies no-select pull-left {{{ if !posts.replies.count }}}hidden{{{ end }}}">
+	<a component="post/reply-count" data-target-component="post/replies/container" href="#" class="threaded-replies no-select pull-left {{{ if !posts.replies.count }}}hidden{{{ end }}}">
 		<span component="post/reply-count/avatars" class="avatars {{{ if posts.replies.hasMore }}}hasMore{{{ end }}}">
 			{{{each posts.replies.users}}}
 			{buildAvatar(posts.replies.users, "xs", true, "")}
@@ -99,4 +100,6 @@
 
 		<!-- IMPORT partials/topic/post-menu.tpl -->
 	</small>
+	</div>
+	<div component="post/replies/container"></div>
 </div>
\ No newline at end of file