diff --git a/files/templates/comments.html b/files/templates/comments.html
index 4b7d60f6b..5f4b269ee 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -387,9 +387,9 @@
{%- endif %}
-
-
+
+
{% endif %}
{% if v and (c.parent_post or c.wall_user_id) %}
@@ -400,9 +400,9 @@
{% endif %}
{% if c.author_id == v.id %}
-
-
+
+
{% endif %}
{% endif %}
@@ -415,15 +415,16 @@
{% endif %}
{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-
+
+
{% endif %}
{% if v.id != c.author_id and not c.ghost %}
-
-
+
+
{% if (c.is_notif and c.author_id != AUTOJANNY_ID) or request.path == '/notifications/messages' %}
@@ -432,21 +433,21 @@
{% endif %}
{% if c.parent_post %}
-{% set url = "" %}
+ {% set url = "" %}
-{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
- {% set url = "sticky_comment" %}
-{% elif v.id == c.post.author_id %}
- {% set url = "pin_comment" %}
-{% elif c.post.sub and v.mods(c.post.sub) %}
- {% set url = "pin_comment_mod" %}
-{% endif %}
+ {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
+ {% set url = "sticky_comment" %}
+ {% elif v.id == c.post.author_id %}
+ {% set url = "pin_comment" %}
+ {% elif c.post.sub and v.mods(c.post.sub) %}
+ {% set url = "pin_comment_mod" %}
+ {% endif %}
-{% if url != "" %}
-
+ {% if url != "" %}
+
-
-{% endif %}
+
+ {% endif %}
{% endif %}
@@ -469,20 +470,20 @@
{% endif %}
{% if FEATURES['NSFW_MARKING'] and (c.parent_post or c.wall_user_id) and (c.author_id==v.id or v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (c.post.sub and v.mods(c.post.sub))) %}
-
+
{% endif %}
{% if v.admin_level >= PERMS['USER_BAN'] and v.id != c.author_id %}
-
-
+
+
{% endif %}
{% if v.admin_level >= PERMS['USER_CHUD'] and v.id != c.author_id %}
-
-
+
+
{% endif %}
@@ -592,25 +593,23 @@
{%- endif %}
-
{% if c.author_id == v.id %}
-
-
+
{% else %}
{% if c.body %}
{% endif %}
{% if not c.ghost %}
-
-
+
+
{% if (c.is_notif and c.author_id != AUTOJANNY_ID) or request.path == '/notifications/messages' %}
@@ -621,6 +620,7 @@
{% if FEATURES['NSFW_MARKING'] and (c.author_id == v.id or (c.post.sub and v.mods(c.post.sub))) %}
+
{% endif %}
@@ -696,15 +696,13 @@
{% endif %}
{% if v.id != c.author_id and v.admin_level >= PERMS['USER_BAN'] %}
-
-
+
{% endif %}
{% if v.id != c.author_id and v.admin_level >= PERMS['USER_CHUD'] %}
-
-
+
{% endif %}
{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
diff --git a/files/templates/hats.html b/files/templates/hats.html
index 9292b4896..31fe1f531 100644
--- a/files/templates/hats.html
+++ b/files/templates/hats.html
@@ -86,9 +86,9 @@
{% endif %}
-
-
+
+
diff --git a/files/templates/home.html b/files/templates/home.html
index 92d690c31..412814788 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -57,8 +57,8 @@
{% if sub %}
{% if v %}
{% if sub.stealth %}
-
+
{% else %}
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index 945e721ec..aa8c3ffcc 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -29,9 +29,8 @@
{% endif %}
-
-
-
+
+
{% endif %}
{% if v %}
@@ -61,12 +60,12 @@
{% endif %}
{% if v.id != p.author_id and not p.ghost %}
-
+
{% endif %}
{% if v.id != p.author_id and p.sub %}
-
+
{% endif %}
{% if p.sub and v.mods(p.sub) %}
@@ -84,14 +83,14 @@
{% endif %}
{% if v.admin_level >= PERMS['USER_BAN'] and v.id != p.author_id %}
-
-
+
+
{% endif %}
{% if v.admin_level >= PERMS['USER_CHUD'] and v.id != p.author_id %}
-
-
+
+
{% endif %}
{% endif %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 0bdf855ec..4095d13e9 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -37,17 +37,16 @@
{% endif %}
{% if v.id==p.author_id %}
-
-
+
{% else %}
{% if not p.ghost %}
-
+
{% endif %}
{% if p.sub %}
-
+
{% endif %}
{% endif %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index f3d7323ec..d9c7a2770 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -22,13 +22,14 @@
{% endif %}
{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-
+
-
+
{% endif %}
{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
+
{% endif %}
@@ -41,14 +42,14 @@
{% endif %}
{% if v.id != p.author_id and v.admin_level >= PERMS['USER_BAN'] %}
-
-
+
+
{% endif %}
{% if v.id != p.author_id and v.admin_level >= PERMS['USER_CHUD'] %}
-
-
+
+
{% endif %}
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index f4dc9ff86..98a738e67 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -52,8 +52,6 @@
{% endif %}
{% if v.admin_level >= PERMS['USER_BAN'] %}
-
-
+
+
{% endif %}
{% if v.admin_level >= PERMS['USER_SHADOWBAN'] %}
-
-
+
+
{% endif %}
{% if v.admin_level >= PERMS['USER_CHUD'] %}
-
-
+
+
{% endif %}
@@ -117,9 +117,9 @@
{% endif %}
{% if v.admin_level >= PERMS['USER_BLACKLIST'] %}
-
-
+
+
{% endif %}
{% if v.admin_level >= PERMS['USER_RESET_PASSWORD'] %}
diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html
index 3016e385f..c6772b32a 100644
--- a/files/templates/userpage/banner.html
+++ b/files/templates/userpage/banner.html
@@ -162,9 +162,9 @@
{% if v and v.id != u.id %}
+
-
{% if FEATURES['USERS_SUICIDE'] -%}
@@ -456,9 +456,8 @@
{% endif %}
{% if v and v.id != u.id %}
-
-
+
{% if FEATURES['USERS_SUICIDE'] -%}