diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 6ef28a0ed1..48e040544b 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -39,7 +39,8 @@
 
 									<span class="topic-title">
 										<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
-										{topics.title}</span>
+										{topics.title}
+									</span>
 								</h3>
 							</a>
 							<small>
diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
index 97a2c062dc..3542bde8a2 100644
--- a/public/templates/recent.tpl
+++ b/public/templates/recent.tpl
@@ -28,27 +28,41 @@
 			<li class="category-item {topics.deleted-class}">
 				<div class="row">
 					<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
-						<div class="latest-post visible-lg visible-md">
-							<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
-								<div class="pull-right">
-									<img class="img-rounded" style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
-									<p>{topics.teaser_text}</p>
-									<p class="meta">
-										<strong>{topics.teaser_username}</strong> posted <span class="timeago" title="{topics.teaser_timestamp}"></span>
-									</p>
-								</div>
-							</a>
-						</div>
+
 						<a href="../../topic/{topics.slug}">
-							<div>
-								<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
-								<small>
-									<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
-									Posted <span class="timeago" title="{topics.relativeTime}"></span> by
-									<strong>{topics.username}</strong>.
-								</small>
-							</div>
+							<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
 						</a>
+						<small>
+							<span class="topic-stats">
+								<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
+							</span>
+							<span class="topic-stats">
+								<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
+							</span>
+
+							<span class="pull-right hidden-xs">
+								<a href="/user/{topics.userslug}">
+									<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
+								</a>
+
+								<a href="../../topic/{topics.slug}">
+									<span>
+										posted <span class="timeago" title="{topics.relativeTime}"></span>
+									</span>
+								</a>
+								|
+								<a href="/user/{topics.teaser_userslug}">
+									<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
+								</a>
+								<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
+									<span>
+									 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
+									</span>
+								</a>
+							</span>
+						</small>
+
+
 					</div>
 				</div>
 			</li>
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
index e15726b376..0f232b22cd 100644
--- a/public/templates/unread.tpl
+++ b/public/templates/unread.tpl
@@ -23,27 +23,38 @@
 				<li class="category-item {topics.deleted-class}">
 					<div class="row">
 						<div class="col-md-12 topic-row">
-							<div class="latest-post visible-lg visible-md">
-								<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
-									<div class="pull-right">
-										<img class="img-rounded" style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
-										<p>{topics.teaser_text}</p>
-										<p class="meta">
-											<strong>{topics.teaser_username}</strong> posted <span class="timeago" title="{topics.teaser_timestamp}"></span>
-										</p>
-									</div>
-								</a>
-							</div>
 							<a href="../../topic/{topics.slug}">
-								<div>
-									<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
-									<small>
-										<strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong>
-										Posted <span class="timeago" title="{topics.relativeTime}"></span> by
-										<strong>{topics.username}</strong>.
-									</small>
-								</div>
+								<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
 							</a>
+							<small>
+								<span class="topic-stats">
+									<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
+								</span>
+								<span class="topic-stats">
+									<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
+								</span>
+
+								<span class="pull-right hidden-xs">
+									<a href="/user/{topics.userslug}">
+										<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
+									</a>
+
+									<a href="../../topic/{topics.slug}">
+										<span>
+											posted <span class="timeago" title="{topics.relativeTime}"></span>
+										</span>
+									</a>
+									|
+									<a href="/user/{topics.teaser_userslug}">
+										<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
+									</a>
+									<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
+										<span>
+										 	replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
+										</span>
+									</a>
+								</span>
+							</small>
 						</div>
 					</div>
 				</li>