2 files changed, 33 insertions, 19 deletions
diff --git a/templates/report_delete.html b/templates/report_delete.html
index 2fcb7259..e246da9e 100644
--- a/templates/report_delete.html
+++ b/templates/report_delete.html
@@ -1,13 +1,16 @@
-{% if config.allow_delete %}
-<div class="delete">
-	{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
-	 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
+<div id="post-moderation-fields">
+	{% if config.allow_delete %}
+	<div id="delete-fields">
+		{% trans %}Delete Post{% endtrans %} [<input title="Delete file only" type="checkbox" name="file" id="delete_file" />
+		 <label for="delete_file">{% trans %}File{% endtrans %}</label>] <label for="password">{% trans %}Password{% endtrans %}</label> 
 		<input id="password" type="password" name="password" size="12" maxlength="18" />
 		<input type="submit" name="delete" value="{% trans %}Delete{% endtrans %}" />
-</div>
-{% endif %}
-<div class="delete" style="clear:both">
-	<label for="reason">{% trans %}Reason{% endtrans %}</label> 
+	</div>
+	{% endif %}
+	
+	<div id="report-fields">
+		<label for="reason">{% trans %}Reason{% endtrans %}</label> 
 		<input id="reason" type="text" name="reason" size="20" maxlength="30" />
 		<input type="submit" name="report" value="{% trans %}Report{% endtrans %}" />
-</div>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/templates/thread.html b/templates/thread.html
index 2ca81e2e..1cbb6d20 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -24,6 +24,7 @@
 	<title>{{ board.url }} - {{ meta_subject }}</title>
 </head>
 <body class="8chan vichan {% if mod %}is-moderator{% else %}is-not-moderator{% endif %}" data-stylesheet="{% if config.default_stylesheet.1 != '' %}{{ config.default_stylesheet.1 }}{% else %}default{% endif %}">
+	<a name="top"></a> 
 	{{ boardlist.top }}
 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}
 	{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
@@ -56,18 +57,28 @@
 	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
 	<hr />
 	<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 %}
-	{{ body }}
-	{% include 'report_delete.html' %}
+		<input type="hidden" name="board" value="{{ board.uri }}" />
+		{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
+		
+		{{ body }}
+		
+		<div id="thread-interactions">
+			<span id="thread-links">
+				<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+				<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
+				<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
+			</span>
+			
+			<span id="thread-quick-reply">
+				<a id="link-quick-reply" href="#">[{% trans %}Post a Reply{% endtrans %}]</a>
+			</span>
+			
+			{% include 'report_delete.html' %}
+		</div>
+		
+		<div class="clearfix"></div>
 	</form>
 	
-	<span id="thread-links">
-		<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-		<a id="thread-top" href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
-		<a id="thread-catalog" style="padding-left: 10px" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
-	</span>
-
 	{{ boardlist.bottom }}
 
 	{{ config.ad.bottom }}