diff --git a/less/categories.less b/less/categories.less
index 53c005b..db0d50f 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -17,8 +17,6 @@
 		min-height: 53px;
 
 		.content {
-			padding-right: 0px;
-
 			.icon {
 				font-size: 17px;
 				line-height: 17px;
@@ -36,6 +34,8 @@
 			}
 
 			h2 {
+				display: block;
+				word-wrap: break-word;
 				font-size: 18px;
 				line-height: 22px;
 				margin: 0;
@@ -74,6 +74,8 @@
 			margin-top: 2px;
 			overflow: hidden;
 			height: 53px;
+			font-size: 12px;
+			line-height: 14px;
 
 			> * {
 				padding-left: 20px;
@@ -86,9 +88,7 @@
 			}
 
 			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 3271adb..0bb8a98 100644
--- a/less/category.less
+++ b/less/category.less
@@ -41,10 +41,15 @@
 					font-size: 15px;
 					opacity: 0;
 					top: 0px;
+					left: 0px;
 
 					&:before {
 						.pointer;
 					}
+
+					@media (max-width: @screen-sm-max) {
+						padding: 7px;
+					}
 				}
 
 				.user-img, .user-icon {
@@ -59,7 +64,7 @@
 			}
 
 			&.selected {
-				.user-img, .user-icon {
+				.select .user-img, .select .user-icon {
 					opacity: 0;
 				}
 
@@ -106,7 +111,7 @@
 		color: @gray-light;
 	}
 
-	h2.title p {
+	h2.title .description {
 		font-size: 65%;
 		font-weight: normal;
 		line-height: 1;
diff --git a/less/mobile.less b/less/mobile.less
index 317ea77..1c13011 100644
--- a/less/mobile.less
+++ b/less/mobile.less
@@ -50,22 +50,6 @@
 				width: auto;
 				padding: 0;
 
-				&.unread {
-					background-color: inherit;
-
-					a:after {
-						content: "new";
-						text-transform: uppercase;
-						color: #FFF;
-						margin-left: 5px;
-						font-size: 10px;
-						background: #C91106;
-						border: 1px solid #890405;
-						padding: 2px 3px;
-						border-radius: 5px;
-					}
-				}
-
 				a {
 					color: white;
 
@@ -77,6 +61,24 @@
 			}
 		}
 
+		.menu-section .chat-list, .menu-section .notification-list-mobile {
+			.unread {
+				background-color: inherit;
+
+				a:after {
+					content: "new";
+					text-transform: uppercase;
+					color: #FFF;
+					margin-left: 5px;
+					font-size: 10px;
+					background: #C91106;
+					border: 1px solid #890405;
+					padding: 2px 3px;
+					border-radius: 5px;
+				}
+			}
+		}
+
 		.counter {
 			font-style: normal;
 
diff --git a/less/topic.less b/less/topic.less
index 3dffa73..9a08b35 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -4,6 +4,8 @@
 		margin-bottom: 30px;
 
 		.topic-title {
+			display: block;
+			word-wrap: break-word;
 			font-size: 28px;
 			color:inherit;
 			line-height: 32px;
@@ -54,19 +56,12 @@
 		}
 	}
 
-	.votes {
-		padding-right: 10px;
-	}
-
 	.bookmarked {
 		position: absolute;
 		top: 1px;
-		padding-top: 3px;
-		border-radius: 4px;
 		right: 0px;
-		font-size: 10px;
-		padding-bottom: 4px;
-		background: darken(@brand-info, 20%);
+		font-size: 16px;
+		color: darken(@brand-info, 20%);
 		opacity: 0;
 		.transition(0.75s ease-in-out opacity);
 	}
@@ -120,6 +115,7 @@
 	}
 
 	.moderator-tools {
+		margin-left: 10px;
 		font-size: 14px;
 
 		> a {
@@ -250,27 +246,15 @@
 			}
 
 			> blockquote {
-				> *:not(:first-child) {
-					display: none;
-				}
-
 				> blockquote {
-					display: block!important;
-					> *:not(:first-child) {
+					> *:not(.blockquote) {
 						display: none;
 					}
 				}
-			}
 
-			> blockquote.uncollapsed {
-				> *:not(:first-child) {
-					display: block;
-				}
-
-				> blockquote {
-					display: block!important;
-					> *:not(:first-child) {
-						display: block;
+				> blockquote.uncollapsed {
+					> *:not(.blockquote) {
+							display: block;
 					}
 				}
 			}
diff --git a/modules/taskbar.less b/modules/taskbar.less
index bebaa4e..1fa4479 100644
--- a/modules/taskbar.less
+++ b/modules/taskbar.less
@@ -4,6 +4,8 @@
 	display: none;
 	z-index: 10001;
 
+	left: auto;
+
 	margin-top: 0;
 	.transition(.15s ease-in opacity);
 
diff --git a/package.json b/package.json
index 08f5ba7..1cbf86b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "3.0.45",
+  "version": "3.0.56",
   "nbbpm": {
     "compatibility": "^0.8.2"
   },
diff --git a/templates/account/edit.tpl b/templates/account/edit.tpl
index 19f6445..7ea1a2f 100644
--- a/templates/account/edit.tpl
+++ b/templates/account/edit.tpl
@@ -14,20 +14,31 @@
 						<!-- ENDIF picture -->
 					</div>
 				</div>
-				<a id="changePictureBtn" href="#" class="btn btn-primary">[[user:change_picture]]</a>
+				<a id="changePictureBtn" href="#" class="btn btn-default">[[user:change_picture]]</a>
 				<br/><br/>
-				<!-- IF config.allowAccountDelete -->
-				<!-- IF isSelf -->
-				<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete_account]]</a><br/><br/>
-				<!-- ENDIF isSelf -->
-				<!-- ENDIF config.allowAccountDelete -->
+
+				<!-- IF !username:disableEdit -->
+				<a href="{config.relative_path}/user/{userslug}/edit/username" class="btn btn-default">[[user:change_username]]</a><br/><br/>
+				<!-- ENDIF !username:disableEdit -->
+
+				<a href="{config.relative_path}/user/{userslug}/edit/email" class="btn btn-default">[[user:change_email]]</a><br/><br/>
+
+				<a href="{config.relative_path}/user/{userslug}/edit/password" class="btn btn-default">[[user:change_password]]</a><br/><br/>
+
 				<!-- IF config.requireEmailConfirmation -->
 				<!-- IF email -->
 				<!-- IF isSelf -->
-				<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm_email]]</a>
+				<a id="confirm-email" href="#" class="btn btn-warning <!-- IF email:confirmed -->hide<!-- ENDIF email:confirmed -->">[[user:confirm_email]]</a><br/><br/>
 				<!-- ENDIF isSelf -->
 				<!-- ENDIF email -->
 				<!-- ENDIF config.requireEmailConfirmation -->
+
+				<!-- IF config.allowAccountDelete -->
+				<!-- IF isSelf -->
+				<a id="deleteAccountBtn" href="#" class="btn btn-danger">[[user:delete_account]]</a><br/><br/>
+				<!-- ENDIF isSelf -->
+				<!-- ENDIF config.allowAccountDelete -->
+
 			</div>
 		</div>
 
@@ -35,23 +46,6 @@
 			<div>
 				<form class='form-horizontal'>
 
-					<!-- IF !username:disableEdit -->
-					<div class="control-group">
-						<label class="control-label" for="inputUsername">[[user:username]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputUsername" placeholder="[[user:username]]" value="{username}">
-						</div>
-					</div>
-					<!-- ENDIF !username:disableEdit -->
-
-					<div class="control-group">
-						<label class="control-label" for="inputEmail">[[user:email]]</label>
-						<div class="controls">
-							<input class="form-control" type="text" id="inputEmail" placeholder="[[user:email]]" value="{email}">
-						</div>
-
-					</div>
-
 					<div class="control-group">
 						<label class="control-label" for="inputFullname">[[user:fullname]]</label>
 						<div class="controls">
@@ -108,43 +102,6 @@
 		</div>
 
 		<div class="col-md-5">
-			<form class='form-horizontal'>
-				<!-- IF isSelf -->
-				<div class="control-group">
-					<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
-					<div class="controls">
-						<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword-->>
-					</div>
-				</div>
-				<!-- ENDIF isSelf -->
-
-				<div class="control-group">
-					<label class="control-label" for="inputNewPassword">[[user:password]]</label>
-					<div class="input-group">
-						<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
-						<span class="input-group-addon">
-							<span id="password-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
-						</span>
-					</div>
-				</div>
-
-				<div class="control-group">
-					<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
-					<div class="input-group">
-						<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
-						<span class="input-group-addon">
-							<span id="password-confirm-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
-						</span>
-					</div>
-				</div>
-				<br/>
-				<div class="form-actions">
-					<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
-				</div>
-			</form>
-
-			<hr />
-
 			<!-- IF sso.length -->
 			<label class="control-label">[[user:sso.title]]</label>
 			<div class="list-group">
diff --git a/templates/account/edit/email.tpl b/templates/account/edit/email.tpl
new file mode 100644
index 0000000..7a60267
--- /dev/null
+++ b/templates/account/edit/email.tpl
@@ -0,0 +1,31 @@
+<!-- IMPORT partials/account_menu.tpl -->
+
+<div class="col-md-5">
+	<form class="form-horizontal">
+
+		<div class="control-group">
+			<label class="control-label" for="inputNewEmail">[[user:email]]</label>
+			<div class="controls">
+				<input class="form-control" type="text" id="inputNewEmail" placeholder="[[user:email]]" value="{email}">
+			</div>
+		</div>
+
+		<!-- disables autocomplete on FF --><input type="password" style="display:none">
+
+		<!-- IF isSelf -->
+		<div class="control-group">
+			<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
+			<div class="controls">
+				<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
+			</div>
+		</div>
+		<!-- ENDIF isSelf -->
+
+		<input type="hidden" name="uid" id="inputUID" value="{uid}" />
+
+		<br/>
+		<div class="form-actions">
+			<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
+		</div>
+	</form>
+</div>
diff --git a/templates/account/edit/password.tpl b/templates/account/edit/password.tpl
new file mode 100644
index 0000000..67ef637
--- /dev/null
+++ b/templates/account/edit/password.tpl
@@ -0,0 +1,40 @@
+<!-- IMPORT partials/account_menu.tpl -->
+
+<div class="col-md-5">
+	<form class='form-horizontal'>
+		<!-- disables autocomplete on FF --><input type="password" style="display:none">
+
+		<!-- IF isSelf -->
+		<div class="control-group">
+			<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
+			<div class="controls">
+				<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
+			</div>
+		</div>
+		<!-- ENDIF isSelf -->
+
+		<div class="control-group">
+			<label class="control-label" for="inputNewPassword">[[user:password]]</label>
+			<div class="input-group">
+				<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
+				<span class="input-group-addon">
+					<span id="password-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
+				</span>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
+			<div class="input-group">
+				<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
+				<span class="input-group-addon">
+					<span id="password-confirm-notify"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
+				</span>
+			</div>
+		</div>
+		<br/>
+		<div class="form-actions">
+			<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/templates/account/edit/username.tpl b/templates/account/edit/username.tpl
new file mode 100644
index 0000000..304c70a
--- /dev/null
+++ b/templates/account/edit/username.tpl
@@ -0,0 +1,31 @@
+<!-- IMPORT partials/account_menu.tpl -->
+
+<div class="col-md-5">
+	<form class="form-horizontal">
+
+		<div class="control-group">
+			<label class="control-label" for="inputNewUsername">[[user:username]]</label>
+			<div class="controls">
+				<input class="form-control" type="text" id="inputNewUsername" placeholder="[[user:username]]" value="{username}">
+			</div>
+		</div>
+
+		<!-- disables autocomplete on FF --><input type="password" style="display:none">
+
+		<!-- IF isSelf -->
+		<div class="control-group">
+			<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
+			<div class="controls">
+				<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
+			</div>
+		</div>
+		<!-- ENDIF isSelf -->
+
+		<input type="hidden" name="uid" id="inputUID" value="{uid}" />
+
+		<br/>
+		<div class="form-actions">
+			<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 06dbb8e..e7f3843 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -30,7 +30,7 @@
  							<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>
 
-                            				<!-- 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>
diff --git a/templates/footer.tpl b/templates/footer.tpl
index ff8493d..02e16bf 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,4 +1,4 @@
-		</div><!--END container -->
+		</div><!-- END container -->
 	</main>
 
 	<div class="hide">
diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index ade72fd..134f86d 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -36,44 +36,7 @@
 				<h3 class="panel-title"><i class="fa fa-users"></i> [[groups:details.members]]</h3>
 			</div>
 			<div class="panel-body">
-				<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/><br/>
-				<table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
-					<!-- BEGIN members -->
-					<tr data-uid="{group.members.uid}">
-						<td>
-							<!-- IF group.members.picture -->
-							<a href="{config.relative_path}/user/{group.members.userslug}"><img src="{group.members.picture}" /></a>
-							<!-- ELSE -->
-							<div class="user-icon" style="background-color: {group.members.icon:bgColor};">{group.members.icon:text}</div>
-							<!-- ENDIF group.members.picture -->
-						</td>
-						<td class="member-name">
-							<a href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a> <i title="[[groups:owner]]" class="fa fa-star text-warning <!-- IF !group.members.isOwner -->invisible<!-- ENDIF !group.members.isOwner -->"></i>
-						</td>
-						<!-- IF group.isOwner -->
-						<td>
-							<div class="btn-group pull-right">
-								<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-									[[global:more]] <span class="caret"></span>
-								</button>
-								<ul class="dropdown-menu" role="menu">
-									<li>
-										<a href="#" data-ajaxify="false" data-action="toggleOwnership">
-											[[groups:details.grant]]
-										</a>
-									</li>
-									<li>
-										<a href="#" data-ajaxify="false" data-action="kick">
-											[[groups:details.kick]]
-										</a>
-									</li>
-								</ul>
-							</div>
-						</td>
-						<!-- ENDIF group.isOwner -->
-					</tr>
-					<!-- END members -->
-				</table>
+				<!-- IMPORT partials/groups/memberlist.tpl -->
 			</div>
 		</div>
 		<!-- IF group.isOwner -->
@@ -214,12 +177,12 @@
 					<hr />
 					<div class="checkbox">
 						<label>
-							<input name="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled-->> <strong>[[groups:details.userTitleEnabled]]</strong>
+							<input name="userTitleEnabled" type="checkbox"<!-- IF group.userTitleEnabled --> checked<!-- ENDIF group.userTitleEnabled -->> <strong>[[groups:details.userTitleEnabled]]</strong>
 						</label>
 					</div>
 					<div class="checkbox">
 						<label>
-							<input name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private-->> <strong>[[groups:details.private]]</strong>
+							<input name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>[[groups:details.private]]</strong>
 							<p class="help-block">
 								[[groups:details.private_help]]
 							</p>
@@ -227,7 +190,7 @@
 					</div>
 					<div class="checkbox">
 						<label>
-							<input name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden-->> <strong>[[groups:details.hidden]]</strong>
+							<input name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->> <strong>[[groups:details.hidden]]</strong>
 							<p class="help-block">
 								[[groups:details.hidden_help]]
 							</p>
diff --git a/templates/header.tpl b/templates/header.tpl
index c0da56e..ca40794 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -2,14 +2,10 @@
 <html lang="{function.localeToHTML, defaultLang}">
 <head>
 	<title>{browserTitle}</title>
-	<!-- BEGIN metaTags -->
-	{function.buildMetaTag}
-	<!-- END metaTags -->
+	<!-- BEGIN metaTags -->{function.buildMetaTag}<!-- END metaTags -->
 	<link rel="stylesheet" type="text/css" href="{relative_path}/stylesheet.css?{config.cache-buster}" />
 	<!-- IF bootswatchCSS --><link id="bootswatchCSS" href="{bootswatchCSS}" rel="stylesheet" media="screen"><!-- ENDIF bootswatchCSS -->
-	<!-- BEGIN linkTags -->
-	{function.buildLinkTag}
-	<!-- END linkTags -->
+	<!-- BEGIN linkTags -->{function.buildLinkTag}<!-- END linkTags -->
 
 	<!--[if lt IE 9]>
   		<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/2.3.0/es5-shim.min.js"></script>
@@ -37,7 +33,7 @@
 	<!-- ENDIF useCustomCSS -->
 </head>
 
-<body>
+<body class="{bodyClass}">
 	<nav id="menu" class="hidden">
 		<section class="menu-profile">
 			<!-- IF user.picture -->
@@ -64,7 +60,7 @@
 				[[global:header.notifications]]
 				<span class="counter" component="notifications/icon" data-content="0"></span>
 			</h3>
-			<ul class="menu-section-list" component="notifications/list"></ul>
+			<ul class="menu-section-list notification-list-mobile" component="notifications/list"></ul>
 		</section>
 
 		<section class="menu-section" data-section="chats">
@@ -83,5 +79,5 @@
 				<!-- IMPORT partials/menu.tpl -->
 			</div>
 		</nav>
-		<div class="container" id="content" component="header">
+		<div class="container" id="content">
 		<!-- IMPORT partials/noscript/warning.tpl -->
\ No newline at end of file
diff --git a/templates/notifications.tpl b/templates/notifications.tpl
index e46f253..0598f73 100644
--- a/templates/notifications.tpl
+++ b/templates/notifications.tpl
@@ -19,7 +19,7 @@
 		[[notifications:no_notifs]]
 	</div>
 
-	<ul class="notifications-list">
+	<ul class="notifications-list" data-nextstart="{nextStart}">
 	<!-- BEGIN notifications -->
 		<li data-nid="{notifications.nid}" class="{notifications.readClass}" component="notifications/item">
 			<!-- IF notifications.image -->
diff --git a/templates/partials/categories/item.tpl b/templates/partials/categories/item.tpl
index e6d33d2..06f25e6 100644
--- a/templates/partials/categories/item.tpl
+++ b/templates/partials/categories/item.tpl
@@ -1,15 +1,22 @@
 <li component="categories/category" data-cid="{../cid}" data-numRecentReplies="1" class="row clearfix">
 	<meta itemprop="name" content="{../name}">
 
-	<div class="col-md-7 col-sm-9 col-xs-11 content">
+	<div class="col-md-7 col-sm-9 col-xs-12 content">
 		<div class="icon pull-left" style="{function.generateCategoryBackground}">
 			<i class="fa fa-fw {../icon}"></i>
 		</div>
 
 		<h2 class="title">
 			<!-- IMPORT partials/categories/link.tpl --><br />
+			<span class="description">
 			{../descriptionParsed}
+			</span>
 		</h2>
+		<span class="visible-xs pull-right">
+			<a class="permalink" href="{../teaser.url}">
+				<small class="timeago" title="{../teaser.timestampISO}"></small>
+			</a>
+		</span>
 	</div>
 
 	<!-- IF !../link -->
@@ -21,7 +28,7 @@
 		<span class="{../unread-class} human-readable-number" title="{../totalPostCount}">{../totalPostCount}</span><br />
 		<small>[[global:posts]]</small>
 	</div>
-	<div class="col-md-3 col-sm-3 col-xs-1 teaser hidden-xs">
+	<div class="col-md-3 col-sm-3 teaser hidden-xs">
 		<!-- IMPORT partials/categories/lastpost.tpl -->
 	</div>
 	<!-- ENDIF !../link -->
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index 5ad50aa..14519ab 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -11,7 +11,7 @@
 				<!-- ENDIF ../user.picture -->
 			</a>
 			<a class="permalink" href="{config.relative_path}/topic/{../topic.slug}<!-- IF ../index -->/{../index}<!-- ENDIF ../index -->">
-				<small class="timeago" title="{../relativeTime}"></small>
+				<small class="timeago" title="{../timestamp}"></small>
 			</a>
 		</p>
 		<div class="post-content">
diff --git a/templates/partials/groups/memberlist.tpl b/templates/partials/groups/memberlist.tpl
new file mode 100644
index 0000000..99a1ccd
--- /dev/null
+++ b/templates/partials/groups/memberlist.tpl
@@ -0,0 +1,40 @@
+<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/><br/>
+<table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
+	<!-- BEGIN members -->
+	<tr data-uid="{group.members.uid}">
+		<td>
+			<a href="{config.relative_path}/user/{group.members.userslug}">
+				<!-- IF group.members.picture -->
+				<img src="{group.members.picture}" />
+				<!-- ELSE -->
+				<div class="user-icon" style="background-color: {group.members.icon:bgColor};">{group.members.icon:text}</div>
+				<!-- ENDIF group.members.picture -->
+			</a>
+		</td>
+		<td class="member-name">
+			<a href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a> <i title="[[groups:owner]]" class="fa fa-star text-warning <!-- IF !group.members.isOwner -->invisible<!-- ENDIF !group.members.isOwner -->"></i>
+		</td>
+		<!-- IF group.isOwner -->
+		<td>
+			<div class="btn-group pull-right">
+				<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+					[[global:more]] <span class="caret"></span>
+				</button>
+				<ul class="dropdown-menu" role="menu">
+					<li>
+						<a href="#" data-ajaxify="false" data-action="toggleOwnership">
+							[[groups:details.grant]]
+						</a>
+					</li>
+					<li>
+						<a href="#" data-ajaxify="false" data-action="kick">
+							[[groups:details.kick]]
+						</a>
+					</li>
+				</ul>
+			</div>
+		</td>
+		<!-- ENDIF group.isOwner -->
+	</tr>
+	<!-- END members -->
+</table>
\ No newline at end of file
diff --git a/templates/partials/modals/flag_post_modal.tpl b/templates/partials/modals/flag_post_modal.tpl
new file mode 100644
index 0000000..b0b0b0f
--- /dev/null
+++ b/templates/partials/modals/flag_post_modal.tpl
@@ -0,0 +1,25 @@
+<div class="modal" tabindex="-1" role="dialog" aria-labelledby="Flag post" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h3>[[topic:flag]]</h3>
+			</div>
+			<div class="modal-body">
+				<div class="form-group">
+					<button class="btn btn-default form-control flag-reason">[[topic:spam]]</button>
+				</div>
+				<div class="form-group">
+					<button class="btn btn-default form-control flag-reason">[[topic:offensive]]</button>
+				</div>
+				<div class="form-group">
+					<textarea class="form-control" id="flag-reason-custom" placeholder="[[topic:custom-flag-reason]]"></textarea>
+				</div>
+			</div>
+
+			<div class="modal-footer">
+				<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[topic:flag]]</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 5ffdae4..0a90be2 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -41,7 +41,7 @@
 				<!-- ENDIF posts.user.custom_profile_info.length -->
 			</span>
 		</div>
-		<span class="badge bookmarked"><i class="fa fa-star"></i></span>
+		<span class="bookmarked"><i class="fa fa-bookmark-o"></i></span>
 
 	</small>
 </div>
@@ -60,16 +60,18 @@
 
 	<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>
+			<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>
 
+		<!-- IF !reputation:disabled -->
 		<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>
 			</a>
+
 			<span component="post/vote-count" data-votes="{posts.votes}">{posts.votes}</span>
+
 			<!-- IF !downvote:disabled -->
 			<a component="post/downvote" href="#" class="<!-- IF posts.downvoted -->downvoted<!-- ENDIF posts.downvoted -->">
 				<i class="fa fa-chevron-down"></i>
diff --git a/templates/partials/users_list_menu.tpl b/templates/partials/users_list_menu.tpl
new file mode 100644
index 0000000..deb036d
--- /dev/null
+++ b/templates/partials/users_list_menu.tpl
@@ -0,0 +1,14 @@
+<ul class="nav nav-pills">
+	<li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
+	<li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
+	<!-- IF !reputation:disabled -->
+	<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
+	<!-- ENDIF !reputation:disabled -->
+	<li><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
+	<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
+	<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
+	<!-- ENDIF function.displayUserSearch -->
+	<!-- IF inviteOnly -->
+	<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
+	<!-- ENDIF inviteOnly -->
+</ul>
\ No newline at end of file
diff --git a/templates/tags.tpl b/templates/tags.tpl
index 1235fee..b3a2784 100644
--- a/templates/tags.tpl
+++ b/templates/tags.tpl
@@ -2,7 +2,14 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<!-- IF tags.length -->
-	<input class="form-control" type="text" id="tag-search" placeholder="[[global:search]]"/>
+	<div class="row">
+		<div class="col-lg-12">
+			<div class="input-group">
+				<input type="text" class="form-control" placeholder="[[global:search]]" id="tag-search">
+				<span id="search-button" class="input-group-addon search-button"><i class="fa fa-search"></i></span>
+			</div>
+		</div>
+	</div>
 	<!-- ENDIF tags.length -->
 
 	<!-- IF !tags.length -->
diff --git a/templates/topic.tpl b/templates/topic.tpl
index c035c01..a283a58 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,9 +1,10 @@
-<div class="topic">
+<div class="row">
+<div class="topic col-lg-12">
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<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>
+		<i class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
 
 
 		<span class="browsing-users hidden hidden-xs hidden-sm pull-right">
@@ -33,7 +34,6 @@
 				<div class="post-bar" data-index="{posts.index}">
 					<!-- IMPORT partials/post_bar.tpl -->
 				</div>
-
 				<!-- ENDIF !posts.index -->
 			</li>
 
@@ -61,7 +61,7 @@
 	</div>
 
 </div>
-
+</div>
 <!-- IF !config.usePagination -->
 <noscript>
 	<!-- IMPORT partials/paginator.tpl -->
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 4d7d285..c0a2200 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -21,7 +21,7 @@
 				<li class="divider"></li>
 				<!-- BEGIN categories -->
 				<li role="presentation" class="category" data-cid="{categories.cid}">
-					<a role="menu-item" href="#"><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF icon --> {categories.name}</a>
+					<a role="menu-item" href="#"><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
 				</li>
 				<!-- END categories -->
 			</ul>
diff --git a/templates/users.tpl b/templates/users.tpl
index 3cc0165..af62f10 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -2,22 +2,11 @@
 
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<ul class="nav nav-pills">
-		<li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
-		<li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
-		<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
-		<li><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
-		<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
-		<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
-		<!-- ENDIF function.displayUserSearch -->
-		<!-- IF inviteOnly -->
-		<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
-		<!-- ENDIF inviteOnly -->
-	</ul>
+	<!-- IMPORT partials/users_list_menu.tpl -->
 
 	<br />
 
-	<div class="search {search_display} well">
+	<div class="search {search_display}">
 		<div class="input-group">
 			<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
 			<span class="input-group-addon">
diff --git a/templates/usersMap.tpl b/templates/usersMap.tpl
index 716e60d..d19cc6d 100644
--- a/templates/usersMap.tpl
+++ b/templates/usersMap.tpl
@@ -2,18 +2,7 @@
 
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<ul class="nav nav-pills">
-		<li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
-		<li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
-		<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
-		<li class='active'><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
-		<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
-		<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
-		<!-- ENDIF function.displayUserSearch -->
-		<!-- IF inviteOnly -->
-		<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
-		<!-- ENDIF inviteOnly -->
-	</ul>
+	<!-- IMPORT partials/users_list_menu.tpl -->
 
 	<br />