More button fixes

templates/index.html

@@ -57,34 +57,38 @@
 	
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
-	<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 %}
-	{% if config.board_search %}
-	<!-- Start Search Form -->
-        	<form style="display:inline" action="/search.php">
-                	<p style="margin: 10px;">
-                    		<input type="text" name="search" placeholder="{{ board.uri }} search">
-                    		<input type="hidden" name="board" value="{{ board.uri }}">
-                    		<input type="submit" value="Search">
-                	</p>
-        	</form>
-    	<!-- End Search Form -->
-    	{% endif %}
+	<span id="index-links-top" class="index-links">
+		<a id="index-bottom" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a>
+		{% if config.catalog_link %}
+			<a id="index-catalog-top" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+		{% endif %}
+		{% if config.board_search %}
+		<!-- Start Search Form -->
+		    	<form style="display:inline" action="/search.php">
+		            	<p style="margin: 10px;">
+		                		<input type="text" name="search" placeholder="{{ board.uri }} search">
+		                		<input type="hidden" name="board" value="{{ board.uri }}">
+		                		<input type="submit" value="Search">
+		            	</p>
+		    	</form>
+			<!-- End Search Form -->
+			{% endif %}
+	</span>
 	<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 %}
 	<hr />
 	{{ body }}
-	{% include 'report_delete.html' %}
-	</form>
-	
-	<div id="thread-interactions-alt">
-		<span id="thread-links-alt">
-			<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
-					{% if config.catalog_link %}
-				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-					{% endif %}
+	<div>
+		<span id="index-links-bottom" class="index-links">
+			<a id="index-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
+			{% if config.catalog_link %}
+				<a id="index-catalog-bottom" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+		    {% endif %}
 		</span>
 	</div>
+	{% include 'report_delete.html' %}
+	</form>
 	
 	<div class="pages">
 		{{ btn.prev }} {% for page in pages %}

templates/thread.html

@@ -68,11 +68,11 @@
 		{{ body }}
 		<div id="thread-interactions">
 			<span id="thread-links-bottom" class="thread-links">
-				<a id="thread-return-bottom" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
 				<a id="thread-goto-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
 						{% if config.catalog_link %}
 					<a id="thread-catalog-bottom" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
 				{% endif %}
+				<a id="thread-return-bottom" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
 			</span>
 			
 			<span id="thread-quick-reply">