diff --git a/less/categories.less b/less/categories.less
index 7b73232..30f7d15 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -4,11 +4,20 @@
 
 	> li {
 
-		margin-bottom: 20px;
+		padding-top: 10px;
+		padding-bottom: 10px;
+
+		@media (max-width: @screen-xs-max) {
+			border-top: 1px solid #eee;
+			&:last-child {
+				border-bottom: 1px solid #eee;
+			};
+		}
+
 		min-height: 53px;
 
 		.content {
-			margin-top: 7px;
+			padding-right: 0px;
 
 			.icon {
 				font-size: 17px;
@@ -31,7 +40,7 @@
 			}
 
 			h2 {
-				font-size: 20px;
+				font-size: 18px;
 				line-height: 22px;
 				margin: 0;
 				margin-left: 62px;
@@ -62,6 +71,10 @@
 			}
 		}
 
+		.mobile-stat {
+			padding-left: 0px;
+		}
+
 		.card {
 			border-left: 4px solid #ccc;
 			text-align: left;
@@ -75,14 +88,14 @@
 
 			img {
 				border-radius: 50%;
-				width: 30px;
-				height: 30px;
+				width: 24px;
+				height: 24px;
 			}
 
 			p {
 				font-size: 12px;
 				margin: 0;
-
+				line-height: 14px;
 				.emoji {
 					max-width: 12px;
 					max-height: 12px;
diff --git a/less/category.less b/less/category.less
index d5c003b..61b5668 100644
--- a/less/category.less
+++ b/less/category.less
@@ -1,4 +1,9 @@
 .category {
+
+	.topic-list {
+		margin-top: 10px;
+	}
+
 	> ul {
 		> li {
 			list-style: none;
@@ -88,8 +93,6 @@
 			font-weight: bold;
 		}
 	}
-
-
 }
 
 .category, .categories, .subcategory {
diff --git a/less/topic.less b/less/topic.less
index ce04f0d..22996f7 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -59,9 +59,7 @@
 	}
 
 	.votes {
-		position: absolute;
-		top: 1px;
-		right: 25px;
+		padding-right: 10px;
 	}
 
 	.bookmarked {
@@ -69,7 +67,7 @@
 		top: 1px;
 		padding-top: 3px;
 		border-radius: 4px;
-		right: 72px;
+		right: 0px;
 		font-size: 10px;
 		padding-bottom: 4px;
 		background: darken(@brand-info, 20%);
@@ -86,13 +84,8 @@
 	}
 
 	.stats {
-		width: 60px;
+		margin: 0px 10px 0px 10px;
 		float: left;
-		margin-top: -5px;
-	}
-
-	.topic-main-buttons a.btn {
-		margin-left: 20px;
 	}
 
 	.title {
@@ -123,19 +116,14 @@
 
 	.post-tools {
 		text-transform: lowercase;
-		a::before {
-			content: "\2022\0020";
-		}
 
 		a {
+			padding-right: 10px;
 			.pointer;
 		}
 	}
 
 	.moderator-tools {
-		position: absolute;
-		right: -5px;
-		top: 0;
 		font-size: 14px;
 
 		> a {
diff --git a/package.json b/package.json
index 99c1140..08f5ba7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.38",
+  "version": "3.0.45",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },
diff --git a/templates/category.tpl b/templates/category.tpl
index c861836..9c103c7 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -2,7 +2,7 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 	<!-- IMPORT partials/category/subcategory.tpl -->
 
-	<!-- IF children.length --><hr /><!-- ENDIF children.length -->
+	<!-- IF children.length --><hr class="hidden-xs"/><!-- ENDIF children.length -->
 
 	<div class="clearfix">
 		<!-- IF privileges.topics:create -->
@@ -20,9 +20,9 @@
 		</span>
 	</div>
 
-	<hr />
+	<hr class="hidden-xs" />
 
-	<p>{name}</p>
+	<p class="hidden-xs">{name}</p>
 
 	<!-- IF !topics.length -->
 	<div class="alert alert-warning" id="category-no-topics">
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index 56b3ce8..ee318ac 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -3,7 +3,7 @@
 	<!-- IF @first -->
 	<div component="category/posts">
 		<p>
-			<strong>{../user.username}</strong>
+			<a href="{config.relative_path}/user/{../user.userslug}"><img class="user-img" title="{../user.username}" src="{../user.picture}" /></a>
 			<a class="permalink" href="{config.relative_path}/topic/{../topic.slug}<!-- IF ../index -->/{../index}<!-- ENDIF ../index -->">
 				<small class="timeago" title="{../relativeTime}"></small>
 			</a>
diff --git a/templates/partials/post_bar.tpl b/templates/partials/post_bar.tpl
index 6f7df54..ade430d 100644
--- a/templates/partials/post_bar.tpl
+++ b/templates/partials/post_bar.tpl
@@ -1,11 +1,11 @@
 <div class="clearfix">
-	<span class="tags">
+	<div class="tags pull-left">
 		<!-- 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>
 
 	<div class="topic-main-buttons pull-right">
 		<span class="loading-indicator btn pull-left hidden" done="0">
@@ -14,8 +14,6 @@
 
 		<!-- IMPORT partials/topic/stats.tpl -->
 
-		<br class="visible-xs"/>
-
 		<!-- IMPORT partials/topic/reply-button.tpl -->
 
 		<!-- IMPORT partials/topic/watch.tpl -->
diff --git a/templates/partials/topic/post-menu.tpl b/templates/partials/topic/post-menu.tpl
index 03e5db1..890623b 100644
--- a/templates/partials/topic/post-menu.tpl
+++ b/templates/partials/topic/post-menu.tpl
@@ -1,4 +1,4 @@
-<div class="dropdown moderator-tools">
+<span class="dropdown moderator-tools">
 	<a href="#" data-toggle="dropdown"><i class="fa fa-fw fa-ellipsis-v"></i></a>
 	<ul class="dropdown-menu dropdown-menu-right" role="menu">
 
@@ -78,4 +78,4 @@
 		</li>
 		<!-- ENDIF !posts.selfPost -->
 	</ul>
-</div>
+</span>
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 1345f3f..5ffdae4 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -20,17 +20,18 @@
 
 		<!-- IMPORT partials/topic/badge.tpl -->
 
-		<div class="visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
-			[[global:posted_ago, <a class="permalink" href="{config.relative_path}/topic/{slug}/{function.getBookmarkFromIndex}"><span class="timeago" title="{posts.relativeTime}"></span></a>]]
+		<div class="visible-xs-inline-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block">
+			<a class="permalink" href="{config.relative_path}/topic/{slug}/{function.getBookmarkFromIndex}"><span class="timeago" title="{posts.relativeTime}"></span></a>
+
 			<i class="fa fa-pencil-square pointer edit-icon <!-- IF !posts.editor.username -->hidden<!-- ENDIF !posts.editor.username -->"></i>
 
-			<span class="post-tools">
-				<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
-				<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
-				<!-- IF posts.toPid -->
-				<button component="post/parent" class="btn btn-xs btn-default" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username} <i class="fa fa-caret-down"></i></button>
-				<!-- ENDIF posts.toPid -->
-			</span>
+			<small data-editor="{posts.editor.userslug}" component="post/editor" class="hidden">[[global:last_edited_by_ago, <strong>{posts.editor.username}</strong>, <span class="timeago" title="{posts.relativeEditTime}"></span>]]</small>
+
+
+			<!-- IF posts.toPid -->
+			<button component="post/parent" class="btn btn-xs btn-default hidden-xs" data-topid="{posts.toPid}"><i class="fa fa-reply"></i> @{posts.parent.username}</button>
+			<!-- ENDIF posts.toPid -->
+
 			<span>
 				<!-- IF posts.user.custom_profile_info.length -->
 				&#124;
@@ -41,7 +42,29 @@
 			</span>
 		</div>
 		<span class="badge bookmarked"><i class="fa fa-star"></i></span>
-		<div class="votes">
+
+	</small>
+</div>
+
+<br />
+
+<div class="content" component="post/content" itemprop="text">
+	{posts.content}
+</div>
+
+<div class="clearfix">
+	<!-- IF posts.user.signature -->
+	<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
+	<!-- ENDIF posts.user.signature -->
+
+
+	<small class="pull-right">
+		<span class="post-tools">
+			<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
+			<a component="post/quote" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!--ENDIF !privileges.topics:reply -->">[[topic:quote]]</a>
+		</span>
+
+		<span class="votes">
 			<!-- IF !reputation:disabled -->
 			<a component="post/upvote" href="#" class="<!-- IF posts.upvoted -->upvoted<!-- ENDIF posts.upvoted -->">
 				<i class="fa fa-chevron-up"></i>
@@ -53,20 +76,10 @@
 			</a>
 			<!-- ENDIF !downvote:disabled -->
 			<!-- ENDIF !reputation:disabled -->
-		</div>
+		</span>
 
 		<!-- IMPORT partials/topic/post-menu.tpl -->
 	</small>
 </div>
 
-<br />
-
-<div class="content" component="post/content" itemprop="text">
-	{posts.content}
-</div>
-<!-- IF posts.user.signature -->
-<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
-<!-- ENDIF posts.user.signature -->
-
-
 <hr />
diff --git a/templates/partials/topic/sort.tpl b/templates/partials/topic/sort.tpl
index 97b27e9..5b44d32 100644
--- a/templates/partials/topic/sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,4 +1,4 @@
-<!-- IF loggedIn -->
+<!-- IF config.loggedIn -->
 <div class="btn-group" component="thread/sort">
 	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button"><span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:sort_by]]</span>
 	<span class="visible-xs-inline"><i class="fa fa-fw fa-sort"></i></span> <span class="caret"></span></button>
@@ -8,4 +8,4 @@
 		<li><a href="#" class="most_votes" data-sort="most_votes"><i class="fa fa-fw"></i> [[topic:most_votes]]</a></li>
 	</ul>
 </div>
-<!-- ENDIF loggedIn -->
\ No newline at end of file
+<!-- ENDIF config.loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/topic/watch.tpl b/templates/partials/topic/watch.tpl
index 63a5712..d7b068c 100644
--- a/templates/partials/topic/watch.tpl
+++ b/templates/partials/topic/watch.tpl
@@ -1,7 +1,9 @@
+<!-- IF config.loggedIn -->
 <button component="topic/follow" class="btn btn-info <!-- IF isFollowing -->hidden<!-- ENDIF isFollowing -->">
 	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:watch]]</span> <i class="fa fa-eye"></i>
 </button>
 
 <button component="topic/unfollow" class="btn btn-warning <!-- IF !isFollowing -->hidden<!-- ENDIF !isFollowing -->">
 	<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:unwatch]]</span> <i class="fa fa-eye-slash"></i>
-</button>
\ No newline at end of file
+</button>
+<!-- ENDIF config.loggedIn -->
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 3f32852..4383bd1 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -1,10 +1,10 @@
-<ul component="category" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
+<ul component="category" class="topic-list" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}">
 	<meta itemprop="itemListOrder" content="descending">
 	<!-- BEGIN topics -->
 	<li component="category/topic" class="row clearfix {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
 		<meta itemprop="name" content="{function.stripTags, title}">
 
-		<div class="col-md-7 col-sm-9 col-xs-12 content">
+		<div class="col-md-7 col-sm-9 col-xs-10 content">
 			<div class="avatar pull-left">
 				<!-- IF showSelect -->
 					<div class="select fa-square-o">
@@ -41,39 +41,49 @@
 				</small>
 				<!-- ENDIF !template.category -->
 
-				<span class="tag-list">
+				<span class="tag-list hidden-xs">
 					<!-- BEGIN tags -->
 					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.value}</span></a>
 					<!-- END tags -->
 					<!-- IF topics.tags.length --><small>&bull;</small><!-- ENDIF topics.tags.length -->
 				</span>
 
-				<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
-
-				<small class="clearfix"><span class="visible-xs"><span class="pull-right"><i class="fa fa-pencil"></i> {topics.postcount} &bull; <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a></span>
-				</span></small>
+				<small class="hidden-xs"><span class="timeago" title="{topics.relativeTime}"></span></small>
+				<small class="visible-xs-inline">
+				<!-- IF topics.teaser.timestamp -->
+				<span class="timeago" title="{topics.teaser.timestamp}"></span>
+				<!-- ELSE -->
+				<span class="timeago" title="{topics.relativeTime}"></span>
+				<!-- ENDIF topics.teaser.timestamp -->
+				</small>
 			</h2>
 		</div>
 
+		<div class="mobile-stat col-xs-2 visible-xs text-right">
+			<span class="human-readable-number">{topics.postcount}</span> <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a>
+		</div>
+
 		<div class="col-md-1 hidden-sm hidden-xs stats">
 			<span class="human-readable-number" title="{topics.postcount}">{topics.postcount}</span><br />
 			<small>[[global:posts]]</small>
 		</div>
+
 		<div class="col-md-1 hidden-sm hidden-xs stats">
 			<span class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</span><br />
 			<small>[[global:views]]</small>
 		</div>
+
 		<div class="col-md-3 col-sm-3 teaser hidden-xs">
 			<div class="card" style="border-color: {topics.category.bgColor}">
 				<!-- IF topics.unreplied -->
-				<p class="hidden-xs">
+				<p>
 					[[category:no_replies]]
 				</p>
 				<!-- ELSE -->
-				<p class="hidden-xs">
-					<strong>{topics.teaser.user.username}</strong>
+				<p>
+					<a href="{config.relative_path}/user/{topics.teaser.user.userslug}"><img title="{topics.teaser.user.username}" class="user-img" src="{topics.teaser.user.picture}" /></a>
 					<a class="permalink" href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}">
-						<small class="timeago" title="{topics.teaser.timestamp}"></small>
+						<span class="timeago" title="{topics.teaser.timestamp}"></span>
 					</a>
 				</p>
 				<div class="post-content">
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 9452275..b5a82be 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -13,7 +13,7 @@
 		</div>
 	</div>
 
-	<hr />
+	<hr class="hidden-xs"/>
 
 	<div class="category">
 		<!-- IF !topics.length -->
diff --git a/templates/register.tpl b/templates/register.tpl
index d77306c..9524f05 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -8,7 +8,7 @@
 				[[error:registration-error]]
 				<p>{error}</p>
 			</div>
-			<form class="form-horizontal" role="form" action="{config.relative_path}/register" method="post">
+			<form component="register/local" class="form-horizontal" role="form" action="{config.relative_path}/register" method="post">
 				<div class="form-group">
 					<label for="email" class="col-lg-4 control-label">[[register:email_address]]</label>
 					<div class="col-lg-8">
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 0c95544..c035c01 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,7 +1,7 @@
 <div class="topic">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<h1 component="post/header" itemprop="name">
+	<h1 component="post/header" class="hidden-xs" itemprop="name">
 
 		<i class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
 
@@ -17,6 +17,8 @@
 
 	<div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted -->">[[topic:deleted_message]]</div>
 
+	<hr class="visible-xs" />
+
 	<ul component="topic" class="posts" data-tid="{tid}">
 		<!-- BEGIN posts -->
 			<li component="post" class="<!-- IF posts.deleted -->deleted<!-- ENDIF posts.deleted -->" <!-- IMPORT partials/data/topic.tpl -->>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 5ac1f99..4d7d285 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -45,7 +45,7 @@
 		</div>
 	</div>
 
-	<hr />
+	<hr class="hidden-xs"/>
 
 	<div class="category">
 		<div id="category-no-topics" class="alert alert-warning <!-- IF topics.length -->hidden<!-- ENDIF topics.length -->">[[unread:no_unread_topics]]</div>