diff --git a/templates/index.html b/templates/index.html
index 9efa5f38..2a297f0d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -60,14 +60,8 @@
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
 	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-	<div id="thread-interactions-alt">
-		<span id="thread-links-alt">
-			<a id="thread-top" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a>
-					{% if config.catalog_link %}
-				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-					{% endif %}
-		</span>
-	</div>
+	<a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %}
+	<hr />
 	{{ body }}
 	<div id="thread-interactions-alt">
 		<span id="thread-links-alt">
diff --git a/templates/thread.html b/templates/thread.html
index 1862a2d5..fed51848 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -55,19 +55,9 @@
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 		<input type="hidden" name="board" value="{{ board.uri }}" />
 		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
-		
-		<div id="thread-interactions-alt">
-			<span id="thread-links-alt">
-				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-				<a id="thread-top" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a>
-                		{% if config.catalog_link %}
-					<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-		                {% endif %}
-			</span>
-		</div>
-		
+		<a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %} &nbsp; <a id="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+		<hr />
 		{{ body }}
-		
 		<div id="thread-interactions">
 			<span id="thread-links">
 				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>