diff --git a/js/thread-watcher.js b/js/thread-watcher.js
index 70f1c160..c3136779 100644
--- a/js/thread-watcher.js
+++ b/js/thread-watcher.js
@@ -149,10 +149,10 @@ $(document).ready(function(){
 	}
 
 	//Append the watchlist toggle button.
-	$('.boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
-	$('.compact-boardlist').append('<span>[ <a class="watchlist-toggle" href="#">'+_('watchlist')+'</a> ]</span>');
-	//Append a watch thread button after every OP.
-	$('.op>.intro').append('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
+	$('.boardlist').append('<a class="watchlist-toggle" style="float:right;" href="#">['+_('Watchlist')+']</a>');
+	$('.compact-boardlist').append('<a class="watchlist-toggle" style="float:right;" href="#">['+_('Watchlist')+']</a>');
+	//Append a watch thread button after every OP post number.
+	$('.op>.intro>.post_no:odd').after('<a class="watchThread" href="#">['+_('Watch Thread')+']</a>');
 
 	//Draw the watchlist, hidden.
 	watchlist.render();