diff --git a/less/topic.less b/less/topic.less
index e030223..2b94613 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -40,6 +40,28 @@
 	.topic-main-buttons a {
 		margin-left: 20px;
 	}
+
+	.title {
+		p {
+			margin-bottom: 4px;
+		}
+
+		small {
+			margin-top: 2px;
+			display: block;
+
+			color: @gray-light;
+
+			strong {
+				color: @gray-dark;
+			}
+		}
+	}
+
+	.content {
+		margin-top: 20px;
+		padding-bottom: 10px;
+	}
 }
 
 
@@ -60,16 +82,12 @@
 		padding: 0;
 
 		> li {
-			padding-bottom: 10px;
-
 			&.deleted {
 				-moz-opacity: 0.30;
 				opacity: 0.30;
 			}
 		}
-	}
 
-	.posts {
 		.post-content {
 			ul {
 				> li {
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 5cad732..e5935f2 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,5 +1,3 @@
-<hr />
-
 <div class="inline-block">
 	<span class="tags">
 	<!-- BEGIN tags -->
@@ -22,7 +20,7 @@
 </div>
 
 <div class="topic-main-buttons pull-right">
-	<span class="loading-indicator btn" done="0" style="display:none;">
+	<span class="loading-indicator btn pull-left" done="0" style="display:none;">
 		<span class="hidden-xs">[[topic:loading_more_posts]]</span> <i class="fa fa-refresh fa-spin"></i>
 	</span>
 
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index fb3ded6..ffcf6ae 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -1,4 +1,4 @@
-<div class="content clearfix">
+<div class="clearfix">
 	<div class="icon pull-left">
 		<a href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->">
 			<img src="{posts.user.picture}" align="left" itemprop="image" />
@@ -9,14 +9,22 @@
 	</div>
 
 	<h1 class="title pull-left">
-		<div class="main-post">
-			<p component="post/header" itemprop="name"><i class="fa fa-thumb-tack hide"></i> <i class="fa fa-lock hide"></i> {title}</p>
-		</div>
-
-		<!-- IF template.category -->
-		<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
-		<!-- ELSE -->
-		<small>[[global:posted_in_ago, <a href="{relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
-		<!-- ENDIF template.category -->
+		<!-- IF !posts.index -->
+		<p component="post/header" itemprop="name"><i class="fa fa-thumb-tack hide"></i> <i class="fa fa-lock hide"></i> {title}</p>
+		<!-- ENDIF !posts.index -->
+		<small>
+			<i class="fa fa-circle status {posts.user.status}" title="[[global:{posts.user.status}]]"></i>
+			<strong><a class="username-field" href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">
+				{posts.user.username}
+			</a></strong>
+			[[global:posted_ago, <span class="timeago" title="{posts.relativeTime}"></span>]]
+			<!-- IF posts.editor.username -->
+			<span>| [[global:last_edited_by_ago, <strong><a href="{relative_path}/user/{posts.editor.userslug}">{posts.editor.username}</a></strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</span>
+			<!-- ENDIF posts.editor.username -->
+		</small>
 	</h1>
-</div>
\ No newline at end of file
+</div>
+
+<div class="content" component="post/content" itemprop="text">{posts.content}</div>
+
+<hr />
\ No newline at end of file