diff --git a/less/header.less b/less/header.less
index 2a56479..33cc6d6 100644
--- a/less/header.less
+++ b/less/header.less
@@ -250,7 +250,6 @@
 
 	font-size: 16px;
 	padding: 0;
-	margin-bottom: 0;
 	background: none;
 
 	@media (max-width: @screen-sm-max) {
diff --git a/less/topic.less b/less/topic.less
index f7d7d35..60ff503 100644
--- a/less/topic.less
+++ b/less/topic.less
@@ -1,4 +1,8 @@
 .topic {
+	[component="post/header"] {
+		margin-top: 0px;
+	}
+
 	h1 {
 		line-height: 40px;
 		margin-bottom: 30px;
diff --git a/templates/recent.tpl b/templates/recent.tpl
index d8f8558..58d4b64 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -1,16 +1,44 @@
 <div class="recent">
+	<!-- IMPORT partials/breadcrumbs.tpl -->
 
-	<div class="clearfix">
+	<div class="btn-toolbar">
 		<div class="pull-left">
-		<!-- IMPORT partials/breadcrumbs.tpl -->
-		</div>
-		<div class="pull-right">
 			<!-- IF loggedIn -->
 			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
 			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 			<!-- ENDIF loggedIn -->
 		</div>
+
+		<div class="btn-group pull-right">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+				<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><i class="fa fa-fw {selectedCategory.icon}"></i><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
+				[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu" role="menu">
+				<li role="presentation" class="category">
+					<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
+				</li>
+				<!-- BEGIN categories -->
+				<li role="presentation" class="category" data-cid="{categories.cid}">
+					<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i>{categories.level}<!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
+				</li>
+				<!-- END categories -->
+			</ul>
+		</div>
+
+		<div class="btn-group pull-right">
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+			{selectedFilter.name} <span class="caret"></span>
+			</button>
+			<ul class="dropdown-menu" role="menu">
+				<!-- BEGIN filters -->
+				<li role="presentation" class="category">
+					<a role="menu-item" href="{config.relative_path}/{filters.url}{querystring}"><i class="fa fa-fw <!-- IF filters.selected -->fa-check<!-- ENDIF filters.selected -->"></i>{filters.name}</a>
+				</li>
+				<!-- END filters -->
+			</ul>
+		</div>
 	</div>
 
 	<hr class="hidden-xs"/>
@@ -20,7 +48,7 @@
 		<div class="alert alert-warning" id="category-no-topics">[[recent:no_recent_topics]]</div>
 		<!-- ENDIF !topics.length -->
 
-		<a href="{config.relative_path}/recent">
+		<a href="{config.relative_path}/{selectedFilter.url}{querystring}">
 			<div class="alert alert-warning hide" id="new-topics-alert"></div>
 		</a>
 
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 2a68c02..d67df6f 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -3,6 +3,13 @@
 	<!-- IMPORT partials/breadcrumbs.tpl -->
 
 	<div class="btn-toolbar">
+		<div class="pull-left">
+			<!-- IF loggedIn -->
+			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+			<!-- ELSE -->
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<!-- ENDIF loggedIn -->
+		</div>
 		<div class="markread btn-group pull-right<!-- IF !topics.length --> hidden<!-- ENDIF !topics.length -->">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				[[unread:mark_as_read]] <span class="caret"></span>