diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 0a6a5f34f8..d5cb9186e9 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -29,7 +29,7 @@
 	<div class="{topic_row_size}">
 		<ul id="topics-container">
 		<!-- BEGIN topics -->
-		<a href="../../topic/{topics.slug}"><li class="category-item {topics.deleted-class}">
+		<a href="../../topic/{topics.slug}#{topics.teaser_pid}"><li class="category-item {topics.deleted-class}">
 			<div class="row">
 				<div class="col-md-12 topic-row">
 					<div class="latest-post visible-lg visible-md">
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index e4934d0a3c..9e754d56c9 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -31,7 +31,9 @@
 		            <span class="icon-bar"></span>
 		            <span class="icon-bar"></span>
 		        </button>
-		        <a class="navbar-brand" href="/">{title}</a>
+		        <a href="/">
+		        	<h1 class="navbar-brand forum-title">{title}</h1>
+		    	</a>
 		    </div>
 
 			<div class="navbar-collapse collapse navbar-ex1-collapse">
diff --git a/public/themes/vanilla/header.less b/public/themes/vanilla/header.less
index 834a288005..ae5ac387f3 100644
--- a/public/themes/vanilla/header.less
+++ b/public/themes/vanilla/header.less
@@ -22,6 +22,12 @@
 		}
 	}
 
+	.forum-title {
+		padding-top: 15px;
+		padding-bottom: 15px;
+		margin: 0px;
+	}
+
 	.pagination-block {
 		position: absolute;
 		background: rgb(34, 34, 34);
diff --git a/src/topics.js b/src/topics.js
index e6380882a5..54d303bdbf 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -313,6 +313,7 @@ schema = require('./schema.js'),
 					topicData.teaser_text = topicInfo.teaserInfo.text || '',
 					topicData.teaser_username = topicInfo.teaserInfo.username || '';
 					topicData.teaser_userpicture = topicInfo.teaserInfo.picture || '';
+					topicData.teaser_pid = topicInfo.teaserInfo.pid;
 
 					topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : '';
 
@@ -575,7 +576,7 @@ schema = require('./schema.js'),
 	Topics.getTeaser = function(tid, callback) {
 		threadTools.getLatestUndeletedPid(tid, function(err, pid) {
 			if (!err) {
-				posts.getPostFields(pid, ['content', 'uid', 'timestamp'], function(postData) {
+				posts.getPostFields(pid, ['pid', 'content', 'uid', 'timestamp'], function(postData) {
 
 					user.getUserFields(postData.uid, ['username', 'picture'], function(err, userData) {
 						if (err)
@@ -584,6 +585,7 @@ schema = require('./schema.js'),
 						var stripped = postData.content,
 							timestamp = postData.timestamp,
 							returnObj = {
+								"pid": postData.pid,
 								"username": userData.username,
 								"picture": userData.picture,
 								"timestamp": timestamp