diff --git a/files/templates/admins.html b/files/templates/admins.html
index be12a30b5..873e271a2 100644
--- a/files/templates/admins.html
+++ b/files/templates/admins.html
@@ -4,8 +4,7 @@
 
 {% block content %}
 
-<pre class="d-none d-md-inline-block"></pre>
-<h5 style="font-weight:bold;">Admins</h5>
+<h5 class="mt-2" style="font-weight:bold;">Admins</h5>
 <div class="overflow-x-auto mt-1">
 	<table class="table table-striped mb-5">
 		<thead class="bg-primary text-white">
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index f3118690b..5d60564c2 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -266,7 +266,7 @@ And we allow custom HTML in most places:
 		<tr>
 			<td>Line Break</td>
 			<td>
-				<pre style="color:var(--white)">
+				<pre>
 Line 1
 &lt;br&gt;
 Line 2
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index 0aa874c6b..1f763bdfa 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -1,8 +1,7 @@
 {% extends "settings2.html" %}
 {% block pagetitle %}Leaderboard{% endblock %}
 {% block content %}
-<pre class="d-none d-md-inline-block"></pre>
-<div id="leaderboard-contents" style="text-align: center; margin-bottom: 1.5rem; font-size: 1.2rem;">
+<div class="mt-2" id="leaderboard-contents" style="text-align: center; margin-bottom: 1.5rem; font-size: 1.2rem;">
 	{% for lb in leaderboards %}
 		{% if lb %}
 			<a href="#leaderboard-{{lb.html_id}}">{{lb.header_name}}</a>{% if not loop.last %} &bull;{% endif %}
diff --git a/files/templates/settings/common.html b/files/templates/settings/common.html
index b6e1c7352..368d79f2b 100644
--- a/files/templates/settings/common.html
+++ b/files/templates/settings/common.html
@@ -81,9 +81,9 @@
 			<textarea autocomplete="off" id="{{id}}-text" class="form-control rounded" placeholder="{{placeholder_text}}" rows="3" name="{{form_name}}" form="{{id}}-form" maxlength="{{maxlength}}">{% if contents %}{{contents}}{% endif %}</textarea>
 			{% if show_extras %}
 				<div class="d-flex mt-2">
-					<pre style="padding-top:0.1rem;line-height:1" class="btn btn-secondary format d-inline-block m-0 font-weight-bolder text-uppercase" onclick="getGifs('{{id}}-text')" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add GIF">GIF</pre>
+					<button style="line-height:1" type="button" class="btn btn-secondary format d-inline-block m-0 font-weight-bolder text-uppercase" onclick="getGifs('{{id}}-text')" data-bs-toggle="modal" data-bs-target="#gifModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add GIF">GIF</button>
 					&nbsp;
-					<pre style="padding-top:0.1rem" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('{{id}}-text')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></pre>
+					<button type="button" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('{{id}}-text')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></button>
 					&nbsp;
 					{% if show_file_upload %}
 						<label class="btn btn-secondary format d-inline-block m-0">
diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html
index d4d4aa323..2a7c5bcb1 100644
--- a/files/templates/userpage/banner.html
+++ b/files/templates/userpage/banner.html
@@ -154,7 +154,7 @@
 						<form class="d-none toggleable" id="message" action="/@{{u.username}}/message" onsubmit="sendMessage(event)">
 							<input type="hidden" name="formkey" value="{{v|formkey}}"> 
 							<textarea autocomplete="off" id="input-message" form="message" name="message" rows="3" minlength="1" maxlength="10000" class="form-control b2 mt-1" data-preview="message-preview" oninput="markdown(this)" required></textarea>
-							<pre class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></pre>
+							<button type="button" class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></button>
 							&nbsp;
 							<input type="submit" onclick="disable(this);remove_dialog()" value="Submit" class="btn btn-primary">
 						</form>
@@ -455,7 +455,7 @@
 					<form class="d-none toggleable" id='message-mobile' action="/@{{u.username}}/message" onsubmit="sendMessage(event)">
 						<input class="mt-1" type="hidden" name="formkey" value="{{v|formkey}}"> 
 						<textarea autocomplete="off" id="input-message-mobile" form="message-mobile" name="message" rows="3" minlength="1" maxlength="10000" class="form-control" data-preview="message-preview-mobile" oninput="markdown(this)" required></textarea>
-						<pre class="mt-1 btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message-mobile')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></pre>
+						<button type="button" class="mt-1 btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message-mobile')" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Add Emoji"></button>
 						&nbsp;
 						<input type="submit" onclick="disable(this);remove_dialog()" value="Submit" class="btn btn-primary">
 					</form>