diff --git a/js/auto-reload.js b/js/auto-reload.js
index d1922dfe..bccc0ec2 100644
--- a/js/auto-reload.js
+++ b/js/auto-reload.js
@@ -36,7 +36,7 @@ $(document).ready(function(){
     var countdown_interval;
 
     // Add an update link
-    $("footer").prev().after("<span id='updater'><a href='#' id='update_thread' style='padding-left:10px'>["+_("Update")+"]</a> (<input type='checkbox' id='auto_update_status' checked> "+_("Auto")+") <span id='update_secs'></span></span>");
+    $(".threadlinks span:last-child").after("<span id='updater'><a href='#' id='update_thread' style='padding-left:10px'>"+_("Update")+"</a> ] (<input type='checkbox' id='auto_update_status' checked> "+_("Auto")+") <span id='update_secs'></span></span>");
 
     // Grab the settings
     var settings = new script_settings('auto-reload');
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 1a5b5208..804d5d08 100755
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -417,7 +417,7 @@ box-shadow: 0 0 40px #000000;
 	background-color: #D6DAF0;
 	border-bottom: 1px solid #B7C5D9;
 }
-.bar.top > :not(script) {
+.bar > :not(script) {
 	display: table-cell;
 	vertical-align: middle;
 }
diff --git a/templates/thread.html b/templates/thread.html
index aa7852a9..6de24aef 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -44,9 +44,6 @@
 	{{ body }}
 	{% include 'report_delete.html' %}
 	</form>
-	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-        <a href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
-
 	{{ config.ad.bottom }}
 
 	<footer>
@@ -57,6 +54,13 @@
 		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
+	<div class="bar bottom">
+		<div class="threadlinks">
+			<span class="threadlink">[ <a href="{{ return }}">{% trans %}Return{% endtrans %}</a> /</span>
+        		<span class="threadlink"><a href="#" style="padding-left: 10px"> {% trans %}Go to top{% endtrans %}</a> /</span>
+		</div>
+		<div class=pages></div>
+	</div>
 	<script type="text/javascript">{% raw %}
 		ready();
 	{% endraw %}</script>