diff --git a/drama/templates/comments.html b/drama/templates/comments.html
index ec50c297ac..42f5d55b1a 100644
--- a/drama/templates/comments.html
+++ b/drama/templates/comments.html
@@ -439,8 +439,9 @@
{% endif %}
- {% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
-
Toggle +18
+ {% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
+
+
{% endif %}
{% if v %}
@@ -448,8 +449,8 @@
{{'Undistinguish' if c.distinguish_level else 'Distinguish'}}
{% endif %}
{% if v.admin_level>=3 %}
- Remove
Approve
+ Remove
{% endif %}
{% if v.admin_level >=4 and c.oauth_app %}
API App
@@ -461,11 +462,11 @@
{% endif %}
{% endif %}
-
- {% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %}
-
-
+
+ {% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %}
+ Toggle +18
{% endif %}
+
{% if v and (c.post and v.admin_level == 6) %}
{% if c.author_id != v.id %}
{% if c.author.is_banned %}
diff --git a/drama/templates/submission.html b/drama/templates/submission.html
index e8c09c3769..9c565c6b1c 100644
--- a/drama/templates/submission.html
+++ b/drama/templates/submission.html
@@ -132,10 +132,6 @@
{% endif %}
- {% if v and (v.id==p.author_id or v.admin_level>=3) %}
-
- {% endif %}
-
{% if v %}
{% if v.admin_level >=3 %}
@@ -159,13 +155,17 @@
{% endif %}
-
- {% if v and v.admin_level == 6 and v.id!=p.author_id %}
- {% if p.author.is_banned %}
-
- {% else %}
-
+
+ {% 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_banned %}
+
+ {% else %}
+
+ {% endif %}
{% endif %}
@@ -381,11 +381,11 @@
{% if v.admin_level >=3 and v.id!=p.author_id %}
{% if p.author.is_banned %}
- Unban user
+ Unban user
{% else %}
- Ban user
+ Ban user
{% endif %}
{% endif %}
{% endif %}
diff --git a/drama/templates/submission_listing.html b/drama/templates/submission_listing.html
index 187cd3b32d..3433d4657e 100644
--- a/drama/templates/submission_listing.html
+++ b/drama/templates/submission_listing.html
@@ -325,14 +325,6 @@
{% if v %}
{% if v.admin_level >=3 %}
- {% if v.id!=p.author_id %}
- {% if p.author.is_banned %}
-
- {% else %}
-
- {% endif %}
- {% endif %}
-
{% if v==p.author %}