diff --git a/files/templates/submission.html b/files/templates/submission.html
index a69487d207..11c6dba292 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -109,13 +109,11 @@
-
+
+
- {% if p.deleted_utc > 0 %}
-
- {% else %}
-
- {% endif %}
+
+
{% endif %}
@@ -124,27 +122,33 @@
{% endif %}
- {% if v and p.id in v.subscribed_idlist() %}
-
- {% elif v %}
-
+ {% if v %}
+
+
+
{% endif %}
{% if v and p.id in v.saved_idlist() %}
-
- {% elif v %}
-
+
+
{% endif %}
{% if v %}
{% if v.admin_level >=3 %}
-
+
+
{% if v==p.author %}
-
+
+
{% endif %}
-
-
+ {% if "/flagged/" in request.path %}
+
+
+ {% else %}
+
+
+ {% endif %}
{% endif %}
{% if v.admin_level >=4 and p.oauth_app %}
@@ -154,24 +158,23 @@
{% endif %}
{% if v and v.id != p.author_id and v.admin_level == 0 %}
-
-
+
+
{% endif %}
{% if v and (v.id==p.author_id or v.admin_level>=3) %}
{% endif %}
- {% if v and v.admin_level == 6 and v.id!=p.author_id %}
- {% if p.author.is_suspended %}
-
- {% else %}
-
- {% endif %}
+ {% if not v.id==p.author_id and v.admin_level == 1 %}
+
Ban user
+ Unban user
{% endif %}
+ {% if v and v.admin_level == 6 and v.id!=p.author_id %}
+
+
+ {% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 40f86ec486..78b7d5dc13 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -297,13 +297,11 @@
{% endif %}
-
+
+
- {% if p.deleted_utc %}
-
- {% else %}
-
- {% endif %}
+
+
{% endif %}
@@ -312,27 +310,33 @@
{% endif %}
- {% if v and p.id in v.subscribed_idlist() %}
-
- {% elif v %}
-
+ {% if v %}
+
+
+
{% endif %}
- {% if v and p.id in v.saved_idlist() %}
-
- {% elif v %}
-
+ {% if v %}
+
+
{% endif %}
{% if v %}
{% if v.admin_level >=3 %}
-
+
+
{% if v==p.author %}
-
+
+
{% endif %}
-
-
+ {% if "/flagged/" in request.path %}
+
+
+ {% else %}
+
+
+ {% endif %}
{% endif %}
{% if v.admin_level >=4 and p.oauth_app %}
@@ -342,10 +346,8 @@
{% endif %}
{% if v and v.id != p.author_id and not v.admin_level %}
-
-
+
+
{% endif %}
{% if v and (v.id==p.author_id or v.admin_level>=3) %}
@@ -353,16 +355,13 @@
{% endif %}
{% if not v.id==p.author_id and v.admin_level == 1 %}
- Ban user
- Unban user
+ Ban user
+ Unban user
{% endif %}
{% if v and v.admin_level == 6 and v.id!=p.author_id %}
- {% if p.author.is_suspended %}
-
- {% else %}
-
- {% endif %}
+
+
{% endif %}