diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 1067161cf9..defb567ad5 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -91,10 +91,27 @@
 	]);
 
 	socket.on('event:new_topic', function(data) {
-		console.log(data);
-		var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: [data] });
+		var html = templates.prepare(templates['category'].blocks['topics']).parse({ topics: [data] }),
+			topic = document.createElement('div'),
+			container = document.getElementById('topics-container'),
+			topics = document.querySelectorAll('#topics-container a'),
+			numTopics = topics.length,
+			x;
 
-		jQuery('<div></div>').appendTo("#topics-container").hide().append(html).fadeIn('slow');	
+		topic.innerHTML = html;
+		if (numTopics > 0) {
+			for(x=0;x<numTopics;x++) {
+				if (topics[x].querySelector('.icon-pushpin')) continue;
+				container.insertBefore(topic, topics[x]);
+				$(topic).hide().fadeIn('slow');
+				break;
+			}
+		} else {
+			container.insertBefore(topic, null);
+			$(topic).hide().fadeIn('slow');
+		}
+
+		// jQuery('<div></div>').appendTo("#topics-container").hide().append(html).fadeIn('slow');	
 		// set_up_posts(uniqueid);
 	});
 })();
diff --git a/src/topics.js b/src/topics.js
index 8cd14057a7..9c7107d4ea 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -374,7 +374,7 @@ marked.setOptions({
 	Topics.unlock = function(tid, uid, socket) {
 		user.getUserField(uid, 'reputation', function(rep) {
 			if (rep >= configs.privilege_thresholds.manage_thread) {
-				// Mark thread as locked
+				// Mark thread as unlocked
 				RDB.del('tid:' + tid + ':locked');
 
 				if (socket) {
@@ -407,7 +407,7 @@ marked.setOptions({
 	Topics.restore = function(tid, uid, socket) {
 		user.getUserField(uid, 'reputation', function(rep) {
 			if (rep >= configs.privilege_thresholds.manage_thread) {
-				// Mark thread as deleted
+				// Mark thread as restored
 				RDB.del('tid:' + tid + ':deleted');
 				Topics.unlock(tid, uid);
 
@@ -424,7 +424,7 @@ marked.setOptions({
 	Topics.pin = function(tid, uid, socket) {
 		user.getUserField(uid, 'reputation', function(rep) {
 			if (rep >= configs.privilege_thresholds.manage_thread) {
-				// Mark thread as deleted
+				// Mark thread as pinned
 				RDB.set('tid:' + tid + ':pinned', 1);
 
 				if (socket) {
@@ -440,7 +440,7 @@ marked.setOptions({
 	Topics.unpin = function(tid, uid, socket) {
 		user.getUserField(uid, 'reputation', function(rep) {
 			if (rep >= configs.privilege_thresholds.manage_thread) {
-				// Mark thread as deleted
+				// Mark thread as unpinned
 				RDB.del('tid:' + tid + ':pinned');
 
 				if (socket) {