diff --git a/files/classes/comment.py b/files/classes/comment.py
index b115028268..975264e7dc 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -13,8 +13,8 @@ from .flags import CommentFlag
 from random import randint
 
 site = environ.get("DOMAIN").strip()
-if site == 'pcmemes.net': cc = "splash mountain"
-else: cc = "country club"
+if site == 'pcmemes.net': cc = "SPLASH MOUNTAIN"
+else: cc = "COUNTRY CLUB"
 
 class Comment(Base):
 
@@ -305,7 +305,7 @@ class Comment(Base):
 		return data
 
 	def realbody(self, v):
-		if self.post and self.post.club and not (v and v.paid_dues): return f"<p>{cc} ONLY</p>"
+		if self.post and self.post.club and not (v and v.paid_dues) and not (v and v.id == self.author_id): return f"<p>{cc} ONLY</p>"
 
 		body = self.body_html
 
@@ -342,7 +342,7 @@ class Comment(Base):
 		return body
 
 	def plainbody(self, v):
-		if self.post and self.post.club and not (v and v.paid_dues): return f"<p>{cc} ONLY</p>"
+		if self.post and self.post.club and not (v and v.paid_dues) and not (v and v.id == self.author_id): return f"<p>{cc} ONLY</p>"
 
 		body = self.body
 
diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py
index e2310965e5..e2ec233f6d 100644
--- a/files/classes/mod_logs.py
+++ b/files/classes/mod_logs.py
@@ -6,8 +6,8 @@ from files.helpers.lazy import lazy
 from os import environ
 
 site = environ.get("DOMAIN").strip()
-if site == 'pcmemes.net': cc = "splash mountain"
-else: cc = "country club"
+if site == 'pcmemes.net': cc = "SPLASH MOUNTAIN"
+else: cc = "COUNTRY CLUB"
 
 class ModAction(Base):
 	__tablename__ = "modactions"
@@ -82,7 +82,7 @@ class ModAction(Base):
 	@lazy
 	def string(self):
 
-		output =  ACTIONTYPES[self.kind]["str"].format(self=self, cc=cc)
+		output =  ACTIONTYPES[self.kind]["str"].format(self=self)
 
 		if self.note: output += f" <i>({self.note})</i>"
 
@@ -93,7 +93,7 @@ class ModAction(Base):
 	def target_link(self):
 		if self.target_user: return f'<a href="{self.target_user.url}">{self.target_user.username}</a>'
 		elif self.target_post:
-			if self.target_post.club: return f'<a href="{self.target_post.permalink}">{cc.upper()} ONLY</a>'
+			if self.target_post.club: return f'<a href="{self.target_post.permalink}">{cc} ONLY</a>'
 			return f'<a href="{self.target_post.permalink}">{self.target_post.title.replace("<","").replace(">","")}</a>'
 		elif self.target_comment_id: return f'<a href="/comment/{self.target_comment_id}?context=9#context">comment</a>'
 
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 08abf81eb3..edd32391e3 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -1016,8 +1016,7 @@ def api_ban_comment(c_id, v):
 def api_unban_comment(c_id, v):
 
 	comment = g.db.query(Comment).filter_by(id=c_id).first()
-	if not comment:
-		abort(404)
+	if not comment: abort(404)
 	g.db.add(comment)
 
 	if comment.is_banned:
@@ -1037,26 +1036,20 @@ def api_unban_comment(c_id, v):
 
 
 @app.post("/distinguish_comment/<c_id>")
-@auth_required
+@admin_level_required(1)
 def admin_distinguish_comment(c_id, v):
 	
-	if v.admin_level == 0: abort(403)
 	
 	comment = get_comment(c_id, v=v)
 
-	if comment.author_id != v.id:
-		abort(403)
+	if comment.author_id != v.id: abort(403)
 
 	comment.distinguish_level = 0 if comment.distinguish_level else v.admin_level
 
 	g.db.add(comment)
-	html=render_template(
-				"comments.html",
-				v=v,
-				comments=[comment],
-				)
+	html = render_template("comments.html", v=v, comments=[comment])
 
-	html=str(BeautifulSoup(html, features="html.parser").find(id=f"comment-{comment.id}-only"))
+	html = str(BeautifulSoup(html, features="html.parser").find(id=f"comment-{comment.id}-only"))
 
 	g.db.commit()
 
diff --git a/files/routes/users.py b/files/routes/users.py
index 2f9aa8b5cf..7bd6491772 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -646,17 +646,13 @@ def u_username_comments(username, v=None):
 			if request.headers.get("Authorization"): return {"error": "That userpage is private"}
 			else: return render_template("userpage_private.html", time=int(time.time()), u=u, v=v)
 
-	if hasattr(u, 'is_blocking') and u.is_blocking and (not v or v.admin_level < 2):
+	if v and hasattr(u, 'is_blocking') and u.is_blocking:
 		if request.headers.get("Authorization"): return {"error": f"You are blocking @{u.username}."}
-		else: return render_template("userpage_blocking.html",
-													u=u,
-													v=v)
+		else: return render_template("userpage_blocking.html", u=u, v=v)
 
-	if hasattr(u, 'is_blocked') and u.is_blocked and (not v or v.admin_level < 2):
+	if v and v.admin_level < 2 and hasattr(u, 'is_blocked') and u.is_blocked:
 		if request.headers.get("Authorization"): return {"error": "This person is blocking you."}
-		else: return render_template("userpage_blocked.html",
-													u=u,
-													v=v)
+		else: return render_template("userpage_blocked.html", u=u, v=v)
 
 
 	page = int(request.values.get("page", "1"))
diff --git a/files/templates/admin/image_posts.html b/files/templates/admin/image_posts.html
index a8aa147562..c248b3667d 100644
--- a/files/templates/admin/image_posts.html
+++ b/files/templates/admin/image_posts.html
@@ -12,28 +12,27 @@
 
 {% block fixedMobileBarJS %}
 <script>
-window.onload = function() {
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
+	window.addEventListener("load",function(event) {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+			if (prevScrollpos > currentScrollPos) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			} 
+			else if (currentScrollPos <= 125) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			}
+			else {
+				document.getElementById("fixed-bar-mobile").style.top = "-48px";
+				document.getElementById("dropdownMenuSortBy").classList.remove('show');
+				document.getElementById("dropdownMenuFrom").classList.remove('show');
+				document.getElementById("navbar").classList.add("shadow");
+			}
+			prevScrollpos = currentScrollPos;
 		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-
-};
+	});
 </script>
 {% endblock %}
 
diff --git a/files/templates/admin/reported_posts.html b/files/templates/admin/reported_posts.html
index a748c65bcc..08c3a0c531 100644
--- a/files/templates/admin/reported_posts.html
+++ b/files/templates/admin/reported_posts.html
@@ -40,28 +40,27 @@
 
 {% block fixedMobileBarJS %}
 <script>
-window.onload = function() {
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
+	window.addEventListener("load",function(event) {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+			if (prevScrollpos > currentScrollPos) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			} 
+			else if (currentScrollPos <= 125) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			}
+			else {
+				document.getElementById("fixed-bar-mobile").style.top = "-48px";
+				document.getElementById("dropdownMenuSortBy").classList.remove('show');
+				document.getElementById("dropdownMenuFrom").classList.remove('show');
+				document.getElementById("navbar").classList.add("shadow");
+			}
+			prevScrollpos = currentScrollPos;
 		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-
-};
+	});
 </script>
 {% endblock %}
 
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index cc66fec5e0..019abbb7eb 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,11 +15,11 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 		{% endif %}
 
 </head>
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index 9b0739a227..6c0e2e8d9e 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -1,30 +1,27 @@
 
 <script>
-window.onload = function() {
-		const banModal = function(link, id, name) {
-			document.getElementById("banModalTitle").innerHTML = `Ban @${name}`;
-			document.getElementById("ban-modal-link").value = link;
-			document.getElementById("banUserButton").innerHTML = `Ban @${name}`;
+	const banModal = function(link, id, name) {
+		document.getElementById("banModalTitle").innerHTML = `Ban @${name}`;
+		document.getElementById("ban-modal-link").value = link;
+		document.getElementById("banUserButton").innerHTML = `Ban @${name}`;
 
-			document.getElementById("banUserButton").onclick = function() {
-				let fd = new FormData(document.getElementById("banModalForm"));
-				fd.append("formkey", formkey());
+		document.getElementById("banUserButton").onclick = function() {
+			let fd = new FormData(document.getElementById("banModalForm"));
+			fd.append("formkey", formkey());
 
-				let xhr = new XMLHttpRequest();
-				xhr.open("POST", `/ban_user/${id}?form`, true);
-				xhr.withCredentials = true;
+			let xhr = new XMLHttpRequest();
+			xhr.open("POST", `/ban_user/${id}?form`, true);
+			xhr.withCredentials = true;
 
-				xhr.onload = function(){
-					var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
-					myToast.show();
-					document.getElementById('toast-post-success-text').innerHTML = `@${name} banned`;
-				}
-
-				xhr.send(fd);
+			xhr.onload = function(){
+				var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
+				myToast.show();
+				document.getElementById('toast-post-success-text').innerHTML = `@${name} banned`;
 			}
-		};
 
-};
+			xhr.send(fd);
+		}
+	};
 </script>
 
 <div class="modal fade" id="banModal" tabindex="-1" role="dialog" aria-labelledby="banModalTitle" aria-hidden="true">
diff --git a/files/templates/embeds/twitter.html b/files/templates/embeds/twitter.html
index cd8eecdced..b557a764c3 100644
--- a/files/templates/embeds/twitter.html
+++ b/files/templates/embeds/twitter.html
@@ -2,8 +2,7 @@
 <script defer src="/assets/js/twitter.js" charset="utf-8">
 </script>
 <script>
-window.onload = function() {
-	document.getElementById('twitter-widget-0').setAttribute('sandbox','')
-
-};
+	window.addEventListener("load",function(event) {
+		document.getElementById('twitter-widget-0').setAttribute('sandbox','')
+	};
 </script>
\ No newline at end of file
diff --git a/files/templates/embeds/twitterlight.html b/files/templates/embeds/twitterlight.html
index 9214bf2623..13233b4d5f 100644
--- a/files/templates/embeds/twitterlight.html
+++ b/files/templates/embeds/twitterlight.html
@@ -2,8 +2,7 @@
 <script defer src="https://platform.twitter.com/widgets.js" charset="utf-8">
 </script>
 <script>
-window.onload = function() {
-	document.getElementById('twitter-widget-0').setAttribute('sandbox','')
-
-};
+	window.addEventListener("load",function(event) {
+		document.getElementById('twitter-widget-0').setAttribute('sandbox','')
+	});
 </script>
\ No newline at end of file
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index e1276d40cb..9dc726543b 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -84,7 +84,7 @@
 	</div>
 </div>
 
-<script defer src="/assets/js/emoji_modal.js?v=123"></script>
+<script defer src="/assets/js/emoji_modal.js?v=124"></script>
 
 <style>
 	a.emojitab {
diff --git a/files/templates/followers.html b/files/templates/followers.html
index 65d2074a8a..caa9b71845 100644
--- a/files/templates/followers.html
+++ b/files/templates/followers.html
@@ -1,14 +1,13 @@
 {% extends "default.html" %}
 {% block content %}
 <script>
-window.onload = function() {
-	function removeFollower(event, username) {
-		post_toast('/remove_follow/' + username); 
-		let table = document.getElementById("followers-table");
-		table.removeChild(event.target.parentElement.parentElement);
-	}
-
-};
+	window.addEventListener("load",function(event) {
+		function removeFollower(event, username) {
+			post_toast('/remove_follow/' + username); 
+			let table = document.getElementById("followers-table");
+			table.removeChild(event.target.parentElement.parentElement);
+		}
+	});
 </script>
 <pre>
 
diff --git a/files/templates/following.html b/files/templates/following.html
index 125ff995d6..81781de7f3 100644
--- a/files/templates/following.html
+++ b/files/templates/following.html
@@ -1,14 +1,13 @@
 {% extends "default.html" %}
 {% block content %}
 <script>
-window.onload = function() {
-	function removeFollower(event, username) {
-		post_toast('/unfollow/' + username); 
-		let table = document.getElementById("followers-table");
-		table.removeChild(event.target.parentElement.parentElement);
-	}
-
-};
+	window.addEventListener("load",function(event) {
+		function removeFollower(event, username) {
+			post_toast('/unfollow/' + username); 
+			let table = document.getElementById("followers-table");
+			table.removeChild(event.target.parentElement.parentElement);
+		}
+	});
 </script>
 <pre>
 
diff --git a/files/templates/log.html b/files/templates/log.html
index 5433d082f5..eb11f72d9d 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,11 +6,11 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+	<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 	{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 {% else %}
 	<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-	<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+	<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 {% endif %}
 
 <div class="row justify-content-around">
diff --git a/files/templates/login.html b/files/templates/login.html
index 9cec011dfc..07ac140aba 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -114,7 +114,7 @@
 		</div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 </body>
 
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 2de28f201c..1a42640b8a 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -12,7 +12,7 @@
 		<title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 7bf00f4edb..affd9cfed1 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -36,10 +36,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 	{% else %}
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 	{% endif %}
 
 		<link href="/assets/css/fa.css?v=52" rel="stylesheet"> 
@@ -168,7 +168,7 @@
 {% block scripts %}
 {% endblock %}
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 <script>
 	function formkey() {return '{{v.formkey}}';}
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index edcac69bc1..d726650f92 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -6,42 +6,41 @@
 
 
 <script>
-window.onload = function() {
-	block_user=function() {
+	window.addEventListener("load",function(event) {
+		block_user=function() {
 
-		var exileForm = document.getElementById("exile-form");
+			var exileForm = document.getElementById("exile-form");
 
-		var usernameField = document.getElementById("exile-username");
+			var usernameField = document.getElementById("exile-username");
 
-		var isValidUsername = usernameField.checkValidity();
+			var isValidUsername = usernameField.checkValidity();
 
-		username = usernameField.value;
+			username = usernameField.value;
 
-		if (isValidUsername) {
+			if (isValidUsername) {
 
-			var xhr = new XMLHttpRequest();
-			xhr.open("post", "/settings/block");
-			xhr.withCredentials=true;
-			f=new FormData();
-			f.append("username", username);
-			f.append("formkey", formkey());
-			xhr.onload=function(){
-				if (xhr.status<300) {
-					location.reload(true);
-				}
-				else {
-					var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
-					myToast.hide();
-					var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
-					myToast.show();
-					document.getElementById("toast-error-message").textContent = "Error. Please try again later.";
+				var xhr = new XMLHttpRequest();
+				xhr.open("post", "/settings/block");
+				xhr.withCredentials=true;
+				f=new FormData();
+				f.append("username", username);
+				f.append("formkey", formkey());
+				xhr.onload=function(){
+					if (xhr.status<300) {
+						location.reload(true);
+					}
+					else {
+						var myToast = new bootstrap.Toast(document.getElementById('toast-post-success'));
+						myToast.hide();
+						var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
+						myToast.show();
+						document.getElementById("toast-error-message").textContent = "Error. Please try again later.";
+					}
 				}
+				xhr.send(f)
 			}
-			xhr.send(f)
 		}
-	}
-
-};
+	});
 </script>
 
 <div class="row">
diff --git a/files/templates/settings_css.html b/files/templates/settings_css.html
index 8731cbaaa2..760b14214f 100644
--- a/files/templates/settings_css.html
+++ b/files/templates/settings_css.html
@@ -38,15 +38,15 @@
 </div>
 {% if v.agendaposter %}
 <script>
-window.onload = function() {
-	const flip = (e) => {
-		e.preventDefault();
-		document.getElementsByTagName("body")[0].setAttribute("style", "-moz-transform: scale(-1, -1);-o-transform: scale(-1, -1);-webkit-transform: scale(-1, -1);transform: scale(-1, -1);");
-	};
+	window.addEventListener("load",function(event) {
+		const flip = (e) => {
+			e.preventDefault();
+			document.getElementsByTagName("body")[0].setAttribute("style", "-moz-transform: scale(-1, -1);-o-transform: scale(-1, -1);-webkit-transform: scale(-1, -1);transform: scale(-1, -1);");
+		};
 
-	document.getElementById("submit-btn").onclick = flip;
+		document.getElementById("submit-btn").onclick = flip;
 
-};
+	});
 </script>
 {% endif %}
 </div>
diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html
index b0a4b487cc..5d1fd41690 100644
--- a/files/templates/settings_security.html
+++ b/files/templates/settings_security.html
@@ -5,16 +5,14 @@
 {% block content %}
 
 <script>
-window.addEventListener('DOMContentLoaded', function() {
-	document.getElementById('new_email').addEventListener('input', function () {
-		document.getElementById("email-password").classList.remove("d-none");
-		document.getElementById("email-password-label").classList.remove("d-none");
-		document.getElementById("emailpasswordRequired").classList.remove("d-none");
+	window.addEventListener("load",function(event) {
+		document.getElementById('new_email').addEventListener('input', function () {
+			document.getElementById("email-password").classList.remove("d-none");
+			document.getElementById("email-password-label").classList.remove("d-none");
+			document.getElementById("emailpasswordRequired").classList.remove("d-none");
+		});
 	});
-
-});
-
-const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal'))
+	const twoStepModal = new bootstrap.Modal(document.getElementById('2faModal'))
 </script>
 
 		<div class="row">
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index e7b05cc0c7..c84ad296b8 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -28,7 +28,7 @@
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
@@ -146,7 +146,7 @@
 		</div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 <script defer src="/assets/js/signup.js?v=63"></script>
 
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index 06194c7d4e..7e2007bcc0 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -29,7 +29,7 @@
 		<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
 
 		<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-		<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
+		<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 
 </head>
 
@@ -96,7 +96,7 @@
 		</div>
 </div>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 
 </body>
 
diff --git a/files/templates/submission_banned.html b/files/templates/submission_banned.html
index 7f591e9e44..03cc544acf 100644
--- a/files/templates/submission_banned.html
+++ b/files/templates/submission_banned.html
@@ -25,7 +25,7 @@
 <input type="submit" value="{% if p.stickied %}Un-sticky{% else %}Pin{% endif %}">
 </form>
 {% endif %}
-{% if v.admin_level > 1 and v.id==p.author_id %}
+{% if v.admin_level > 0 and v.id==p.author_id %}
 <form action="/distinguish/{{p.id}}" method="post">
 <input type="hidden" name="formkey", value="{{v.formkey}}">
 <input type="submit" value="{% if p.distinguish_level %}Un-distinguish{% else %}Distinguish{% endif %}">
diff --git a/files/templates/submit.html b/files/templates/submit.html
index e01bf1cc4b..78b0b20753 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -23,11 +23,11 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=131"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
+			<link rel="stylesheet" href="/assets/css/main.css?v=132"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=124">
 			{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=124">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
-			<link rel="stylesheet" href="/assets/css/main.css?v=131">
+			<link rel="stylesheet" href="/assets/css/main.css?v=132">
 			<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=124">
 		{% endif %}
 		{% endblock %}
@@ -173,7 +173,7 @@
 		</div>
 		{% endblock %}
 
-		<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
+		<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
 		<script defer src="https://cdn.jsdelivr.net/npm/marked@3.0.8/lib/marked.min.js"></script>
 
 		<script defer src="/assets/js/submit.js?v=72"></script>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 4d25e2aedd..bced9f259e 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -35,7 +35,6 @@
 
 {% if v %}
 	<script>
-window.onload = function() {
 		const TRANSFER_TAX = {% if v.patron or u.patron %}0{% else %}0.03{% endif %};
 
 		function updateTax(mobile=false) {
@@ -67,45 +66,39 @@ window.onload = function() {
 
 			setTimeout(_ => t.disabled = false, 2000);
 		}
-	
-};
-</script>
+	</script>
 {% endif %}
 
 {% if u.song %}
 	<script>
-window.onload = function() {
-		var audio = new Audio('/songs/{{u.id}}');
-		audio.loop=true;
-		
-		{% if not u.unmutable %}
-			function pause() {
-				audio.pause();
-				document.getElementById("pause1").classList.toggle("d-none");
-				document.getElementById("play1").classList.toggle("d-none");
-				document.getElementById("pause2").classList.toggle("d-none");
-				document.getElementById("play2").classList.toggle("d-none");
-			}
+		window.addEventListener("load",function(event) {
+			var audio = new Audio('/songs/{{u.id}}');
+			audio.loop=true;
+			
+			{% if not u.unmutable %}
+				function pause() {
+					audio.pause();
+					document.getElementById("pause1").classList.toggle("d-none");
+					document.getElementById("play1").classList.toggle("d-none");
+					document.getElementById("pause2").classList.toggle("d-none");
+					document.getElementById("play2").classList.toggle("d-none");
+				}
 
-			function play() {
-				audio.play();
-				document.getElementById("pause1").classList.toggle("d-none");
-				document.getElementById("play1").classList.toggle("d-none");
-				document.getElementById("pause2").classList.toggle("d-none");
-				document.getElementById("play2").classList.toggle("d-none");
-			}
-		{% endif %}
+				function play() {
+					audio.play();
+					document.getElementById("pause1").classList.toggle("d-none");
+					document.getElementById("play1").classList.toggle("d-none");
+					document.getElementById("pause2").classList.toggle("d-none");
+					document.getElementById("play2").classList.toggle("d-none");
+				}
+			{% endif %}
 
-		window.addEventListener( 'load', function() {
 			audio.play();
 			document.getElementById('userpage').addEventListener('click', () => {
 				if (audio.paused) audio.play(); 
 			}, {once : true});
-
 		});
-	
-};
-</script>
+	</script>
 {% endif %}
 
 <div class="row d-none d-md-block">
diff --git a/files/templates/userpage_blocked.html b/files/templates/userpage_blocked.html
index 54e6f85ef3..57edf0954f 100644
--- a/files/templates/userpage_blocked.html
+++ b/files/templates/userpage_blocked.html
@@ -4,28 +4,27 @@
 
 {% block fixedMobileBarJS %}
 <script>
-window.onload = function() {
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
+	window.addEventListener("load",function(event) {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+			if (prevScrollpos > currentScrollPos) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			} 
+			else if (currentScrollPos <= 125) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			}
+			else {
+				document.getElementById("fixed-bar-mobile").style.top = "-48px";
+				document.getElementById("dropdownMenuSortBy").classList.remove('show');
+				document.getElementById("dropdownMenuFrom").classList.remove('show');
+				document.getElementById("navbar").classList.add("shadow");
+			}
+			prevScrollpos = currentScrollPos;
 		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-
-};
+	});
 </script>
 {% endblock %}
 
diff --git a/files/templates/userpage_blocking.html b/files/templates/userpage_blocking.html
index 51cf27d307..3355d36c14 100644
--- a/files/templates/userpage_blocking.html
+++ b/files/templates/userpage_blocking.html
@@ -4,28 +4,27 @@
 
 {% block fixedMobileBarJS %}
 <script>
-window.onload = function() {
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
+	window.addEventListener("load",function(event) {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+			if (prevScrollpos > currentScrollPos) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			} 
+			else if (currentScrollPos <= 125) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			}
+			else {
+				document.getElementById("fixed-bar-mobile").style.top = "-48px";
+				document.getElementById("dropdownMenuSortBy").classList.remove('show');
+				document.getElementById("dropdownMenuFrom").classList.remove('show');
+				document.getElementById("navbar").classList.add("shadow");
+			}
+			prevScrollpos = currentScrollPos;
 		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-
-};
+	});
 </script>
 {% endblock %}
 
diff --git a/files/templates/userpage_reserved.html b/files/templates/userpage_reserved.html
index fd2f335d09..b30d552060 100644
--- a/files/templates/userpage_reserved.html
+++ b/files/templates/userpage_reserved.html
@@ -4,28 +4,27 @@
 
 {% block fixedMobileBarJS %}
 <script>
-window.onload = function() {
-	var prevScrollpos = window.pageYOffset;
-	window.onscroll = function () {
-		var currentScrollPos = window.pageYOffset;
-		if (prevScrollpos > currentScrollPos) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
-		} 
-		else if (currentScrollPos <= 125) {
-			document.getElementById("fixed-bar-mobile").style.top = "48px";
-			document.getElementById("navbar").classList.remove("shadow");
+	window.addEventListener("load",function(event) {
+		var prevScrollpos = window.pageYOffset;
+		window.onscroll = function () {
+			var currentScrollPos = window.pageYOffset;
+			if (prevScrollpos > currentScrollPos) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			} 
+			else if (currentScrollPos <= 125) {
+				document.getElementById("fixed-bar-mobile").style.top = "48px";
+				document.getElementById("navbar").classList.remove("shadow");
+			}
+			else {
+				document.getElementById("fixed-bar-mobile").style.top = "-48px";
+				document.getElementById("dropdownMenuSortBy").classList.remove('show');
+				document.getElementById("dropdownMenuFrom").classList.remove('show');
+				document.getElementById("navbar").classList.add("shadow");
+			}
+			prevScrollpos = currentScrollPos;
 		}
-		else {
-			document.getElementById("fixed-bar-mobile").style.top = "-48px";
-			document.getElementById("dropdownMenuSortBy").classList.remove('show');
-			document.getElementById("dropdownMenuFrom").classList.remove('show');
-			document.getElementById("navbar").classList.add("shadow");
-		}
-		prevScrollpos = currentScrollPos;
-	}
-
-};
+	});
 </script>
 {% endblock %}