diff --git a/contrib/static/site.css b/contrib/static/site.css
index 35cc3c5..963f02a 100644
--- a/contrib/static/site.css
+++ b/contrib/static/site.css
@@ -155,6 +155,10 @@ a, a:visited {
     margin-top: 5em;
 }
 
+.navLinks {
+     padding-bottom: 50px;
+}
+
 .ukko_thread_header {
     float: left;
     clear: both;
@@ -194,7 +198,7 @@ input, textarea {
 
 .post {
     margin-bottom: 5px;
-    min-width: 460px;
+    min-width: 500px;
 }
 
 .postheader {
diff --git a/contrib/templates/default/thread.mustache b/contrib/templates/default/thread.mustache
index bdb0939..b1c010b 100644
--- a/contrib/templates/default/thread.mustache
+++ b/contrib/templates/default/thread.mustache
@@ -43,7 +43,8 @@
         <br/>
       {{/ thread.Replies}}
     </div>
-    <br/>
+    <hr/>
+    <div class="navLinks">[<a href="{{thread.BoardURL}}" accesskey="a">Return</a>] [<a href="#thread_{{thread.OP.PostHash}}">Top</a>] </div>
       <script type="text/javascript">
           var e = document.getElementById("nntpchan_banner");
           nntpchan_inject_banners(e, "{{thread.Prefix}}");
@@ -51,4 +52,4 @@
       </script>
 
     </body>
-</html>
\ No newline at end of file
+</html>