diff --git a/files/templates/submission.html b/files/templates/submission.html
index 13d76e745..9d212ca6b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -506,61 +506,58 @@
-
-{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %}
-{{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}"
-
-
-
-
-{% if comment_info.edited_utc %}{% endif %}
-
-
-
-
-{% if p.is_video %}
-
-{% elif p.is_audio %}
-
-{% endif %}
-
-
-
-
-
-
-
-
-
-
-{% else %}
-{{p.plaintitle(v)}} - {{SITE_NAME}}
-
-
-{% if p.author %}{% endif %}
-
-{% if p.edited_utc %}{% endif %}
-{% if p.author %}{% endif %}
-{% if not v_forbid_deleted -%}
-
-
-
-
-{%- endif %}
-
-
-
-{% if not v_forbid_deleted -%}
-{% if p.author %}{% endif %}
-
-
-{%- endif %}
-
+{% if not v_forbid_deleted -%}
+
+ {% if p.is_video %}
+
+ {% elif p.is_audio %}
+
+ {% endif %}
+
{% endif %}
+
+
+{% if comment_info and not comment_info.is_banned and not comment_info.deleted_utc %}
+ {{'@'+comment_info.author_name}} comments on "{{p.plaintitle(v)}} - {{SITE_NAME}}"
+
+
+
+
+
+
+
+
+ {% if comment_info.edited_utc %}
+
+ {% endif %}
+
+
+
+
+
+{% else %}
+ {{p.plaintitle(v)}} - {{SITE_NAME}}
+
+
+
+
+
+
+
+
+ {% if p.edited_utc %}
+
+ {% endif %}
+
+
+
+
+
+{%- endif %}
{% endblock %}
{% block pagetype %}thread{% endblock %}