diff --git a/package.json b/package.json
index a222c77..694349c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Persona theme for NodeBB",
   "main": "theme.less",
   "repository": {
diff --git a/templates/composer.tpl b/templates/composer.tpl
index 4a45725..146596b 100644
--- a/templates/composer.tpl
+++ b/templates/composer.tpl
@@ -85,17 +85,18 @@
 				</div>
 
 				<div class="btn-group pull-right action-bar hidden-sm hidden-xs">
-					<button class="btn btn-default" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
+					<button class="btn btn-default composer-discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
 
-					<button class="btn btn-primary" data-action="post" tabindex="6"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
+					<button class="btn btn-primary composer-submit" data-action="post" tabindex="6"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
 					<!-- IF !isEditing -->
 					<!-- IF isAdminOrMod -->
-					<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown">
+					<button type="button" class="btn btn-info dropdown-toggle" tabindex="7" data-toggle="dropdown">
 						<span class="caret"></span>
 						<span class="sr-only">Toggle Dropdown</span>
 					</button>
 					<ul class="dropdown-menu pull-right" role="menu">
-						<li><a href="#" data-action="post-lock"><i class="fa fa-fw fa-lock"></i> [[modules:composer.submit_and_lock]]</a></li>
+						<li><a href="#" data-switch-action="post"><i class="fa fa-fw fa-check"></i> [[topic:composer.submit]]</a></li>
+						<li><a href="#" data-switch-action="post-lock"><i class="fa fa-fw fa-lock"></i> [[modules:composer.submit_and_lock]]</a></li>
 					</ul>
 					<!-- ENDIF isAdminOrMod -->
 					<!-- ENDIF !isEditing -->
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 08c871c..7cb4864 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -2,7 +2,7 @@
 	<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="{topics.title}">
+		<meta itemprop="name" content="{function.stripTags, title}">
 
 		<div class="col-md-7 col-sm-9 col-xs-11 content">
 			<div class="avatar hidden-sm hidden-xs pull-left">
@@ -25,11 +25,19 @@
 
 				<!-- 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="{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="{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 -->
 			</h1>