diff --git a/package.json b/package.json
index 0fc8856..4bf77b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "1.0.9",
+  "version": "1.0.16",
   "nbbpm": {
     "compatibility": "^0.7.1"
   },
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index e109cd4..1f32d37 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -25,17 +25,17 @@
 							<!-- ENDIF !config.disableChat -->
  							<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
  							<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
-							<!-- ENDIF !isSelf -->
-
-							<!-- IF isAdmin -->
+                            
+                            				<!-- IF isAdmin -->
 							<br/><br/>
 
 							<a id="banAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF banned -->hide<!-- ENDIF banned -->">[[user:ban_account]]</a>
 							<a id="unbanAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF !banned -->hide<!-- ENDIF !banned -->">[[user:unban_account]]</a>
 							<a id="deleteAccountBtn" href="#" class="btn btn-danger btn-sm">[[user:delete_account]]</a><br/><br/>
 							<!-- ENDIF isAdmin -->
-						</div>
+							<!-- ENDIF !isSelf -->
 
+						</div>
 
 						<div id="banLabel" class="text-center <!-- IF !banned -->hide<!-- ENDIF !banned -->">
 							<span class="label label-danger">[[user:banned]]</span>
@@ -167,4 +167,4 @@
 </div>
 
 <!-- IMPORT partials/variables/account.tpl -->
-<!-- IMPORT partials/variables/account/profile.tpl -->
\ No newline at end of file
+<!-- IMPORT partials/variables/account/profile.tpl -->
diff --git a/templates/category.tpl b/templates/category.tpl
index 577ca2b..1bd6be6 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -38,5 +38,11 @@
 </div>
 
 <!-- IMPORT partials/move_thread_modal.tpl -->
-<!-- IMPORT partials/noscript/paginator.tpl -->
+
+<!-- IF !config.usePagination -->
+<noscript>
+	<!-- IMPORT partials/paginator.tpl -->
+</noscript>
+<!-- ENDIF !config.usePagination -->
+
 <!-- IMPORT partials/variables/category.tpl -->
\ No newline at end of file
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index ee7e86f..22d3fcb 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -6,7 +6,7 @@
 					<span class="icon-bar"></span>
 				</button>
 
-				<a href="{relative_path}/">
+				<a href="<!-- IF brand:logo:url -->{brand:logo:url}<!-- ELSE -->{relative_path}/<!-- ENDIF brand:logo:url -->">
 					<img class="{brand:logo:display} forum-logo" src="{brand:logo}" />
 				</a>
 				<!-- IF showSiteTitle -->
@@ -183,7 +183,7 @@
 					<!-- BEGIN navigation -->
 					<!-- IF function.displayMenuItem, @index -->
 					<li class="{navigation.class}">
-						<a href="{relative_path}{navigation.route}" title="{navigation.title}" id="{navigation.id}" target="{navigation.properties.target}">
+						<a href="{relative_path}{navigation.route}" title="{navigation.title}" id="{navigation.id}"<!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
 							<!-- IF navigation.iconClass -->
 							<i class="fa fa-fw {navigation.iconClass}"></i>
 							<!-- ENDIF navigation.iconClass -->
diff --git a/templates/partials/noscript/paginator.tpl b/templates/partials/noscript/paginator.tpl
deleted file mode 100644
index 62ebbdf..0000000
--- a/templates/partials/noscript/paginator.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-	<noscript>
-		<div class="text-center">
-			<ul class="pagination">
-				<!-- BEGIN pages -->
-				<li <!-- IF pages.active -->class="active"<!-- ENDIF pages.active -->><a href="?page={pages.page}">{pages.page}</a></li>
-				<!-- END pages -->
-			</ul>
-		</div>
-	</noscript>
\ No newline at end of file
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 06b7902..8d4810d 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -23,29 +23,20 @@
 				<i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->"></i>
 				<a href="{config.relative_path}/topic/{topics.slug}" itemprop="url">{topics.title}</a><br />
 
+				<!-- IF !template.category -->
+				<small>
+					<a href="{config.relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a> &bull;
+				</small>
+				<!-- ENDIF !template.category -->
+
 				<span class="tag-list">
 					<!-- BEGIN tags -->
-					<span class="tag">{topics.tags.value}</span>
+					<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag">{topics.tags.value}</span></a>
 					<!-- END tags -->
+					<!-- IF topics.tags.length --><small>&bull;</small><!-- ENDIF topics.tags.length -->
 				</span>
 
-				<!-- IF template.category -->
-				<small>
-					<!-- IF topics.user.userslug -->
-					[[global:posted_ago_by, <span class="timeago" title="{topics.relativeTime}"></span>, <strong>{topics.user.username}</strong>]]
-					<!-- ELSE -->
-					[[global:posted_ago_by_guest, <span class="timeago" title="{topics.relativeTime}"></span>]]
-					<!-- ENDIF topics.user.userslug -->
-				</small>
-				<!-- ELSE -->
-				<small>
-					<!-- IF topics.user.userslug -->
-					[[global:posted_in_ago_by, <a href="{config.relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>, <span class="timeago" title="{topics.relativeTime}"></span>, <strong>{topics.user.username}</strong>]]
-					<!-- ELSE -->
-					[[global:posted_in_ago_by_guest, <a href="{config.relative_path}/category/{topics.category.slug}"><i class="fa {topics.category.icon}"></i> {topics.category.name}</a>, <span class="timeago" title="{topics.relativeTime}"></span>]]
-					<!-- ENDIF topics.user.userslug -->
-				</small>
-				<!-- ENDIF template.category -->
+				<small>[[global:posted_ago, <span class="timeago" title="{topics.relativeTime}"></span>]]</small>
 			</h1>
 		</div>
 
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 9980462..f40eb38 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -57,5 +57,10 @@
 	<!-- IMPORT partials/move_post_modal.tpl -->
 </div>
 
-<!-- IMPORT partials/noscript/paginator.tpl -->
+<!-- IF !config.usePagination -->
+<noscript>
+	<!-- IMPORT partials/paginator.tpl -->
+</noscript>
+<!-- ENDIF !config.usePagination -->
+
 <!-- IMPORT partials/variables/topic.tpl -->
\ No newline at end of file
diff --git a/templates/usersMap.tpl b/templates/usersMap.tpl
index eab93e0..8035e3c 100644
--- a/templates/usersMap.tpl
+++ b/templates/usersMap.tpl
@@ -23,7 +23,7 @@
 		<li>
 			<a href="{config.relative_path}{rooms.link}">[[users:{rooms.room}]]</a><br/>
 			<!-- BEGIN rooms.users -->
-				<a href="{rooms.users.userslug}"><img class="user-img" src="{rooms.users.picture}" title="{rooms.users.username}"/></a>
+				<a href="{config.relative_path}/user/{rooms.users.userslug}"><img class="user-img" src="{rooms.users.picture}" title="{rooms.users.username}"/></a>
 			<!-- END rooms.users -->
 		</li>
 		<!-- ENDIF rooms.total -->