diff --git a/templates/index.html b/templates/index.html
index bc946db1..1f459483 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -68,7 +68,7 @@
 	<hr/>
 	{body}
 	Pages: {pages:
-		<a href="{pages[link]}">{pages[num]}</a>
+		[<a href="{pages[link]}">{pages[num]}</a>]{!%last? }
 	}
 	<p class="unimportant" style="text-align:center;">Copyright &copy; 2010 <a href="http://omegadev.org/">OmegaSDG</a></p>
 </body>
diff --git a/templates/thread.html b/templates/thread.html
index bd1fca57..2fb7a487 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -11,7 +11,7 @@
 <body>
 	<h1>{board[url]} - {board[name]}</h1>
 	<div class="title">{board[title]}</div>
-	<div class="banner">Posting mode: Reply <a class="unimportant" href="{index}">[Return.]</a></div>
+	<div class="banner">Posting mode: Reply <a class="unimportant" href="{index}{board[dir]}">[Return.]</a></div>
 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">
 	<input type="hidden" name="thread" value="{id}" />
 		<table>
