diff --git a/files/templates/submission.html b/files/templates/submission.html
index e5e087ce1..f9d011a70 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -639,6 +639,26 @@
 
 	</div>
 
+	</div>
+
+	{% endblock %}
+
+<!-- Sidebar -->
+{% block sidebar %}
+	{% include "/sidebars/SubmissionSidebar.html" %}
+{% endblock %}
+
+{% block modals %}
+	{% if v and v.id==p.author_id %}
+		{% include "delete_post_modal.html" %}
+	{% endif %}
+
+	{% if v %}
+		{% include "report_post_modal.html" %}
+	{% endif %}
+{% endblock %}
+
+{% block scripts %}
 	<script>
 		(() => {
 			const date = new Date({{p.created_utc*1000}});
@@ -669,20 +689,4 @@
 				{%endif%}
 			})()
 		</script>
-
-		{% if v and v.id==p.author_id %}
-		{% include "delete_post_modal.html" %}
-		{% endif %}
-
-		{% if v %}
-		{% include "report_post_modal.html" %}
-		{% endif %}
-
-	</div>
-
-	{% endblock %}
-
-<!-- Sidebar -->
-{% block sidebar %}
-	{% include "/sidebars/SubmissionSidebar.html" %}
 {% endblock %}
\ No newline at end of file