diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index 10b4c949f..044e3cbab 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -22,8 +22,8 @@
 	<a href="#leaderboard-blocked">Blocked</a>
 </div>
 
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-coins">Top 25 by coins</a></h5>
-<pre></pre>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-coins">Top 25 by coins</a></h5>
+
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -48,16 +48,8 @@
 {% endif %}
 </table>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-spent">Top 25 by coins spent in shop</a></h5>
 
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-spent">Top 25 by coins spent in shop</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -83,16 +75,8 @@
 {% endif %}
 </table>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-truescore">Top 25 by truescore</a></h5>
 
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-truescore">Top 25 by truescore</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 	<thead class="bg-primary text-white">
 		<tr>
@@ -119,15 +103,8 @@
 	</tbody>
 </table>
 
-<pre>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-followers">Top 25 by followers</a></h5>
 
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-followers">Top 25 by followers</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -151,15 +128,9 @@
 	</tr>
 {% endif %}
 </table>
-<pre>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-posts">Top 25 by post count</a></h5>
 
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-posts">Top 25 by post count</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -183,15 +154,9 @@
 	</tr>
 {% endif %}
 </table>
-<pre>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-comments">Top 25 by comment count</a></h5>
 
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-comments">Top 25 by comment count</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -216,16 +181,8 @@
 {% endif %}
 </table>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-awards">Top 25 by received awards</a></h5>
 
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-awards">Top 25 by received awards</a></h5>
-<pre>
-
-
-</pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -250,16 +207,7 @@
 {% endif %}
 </table>
 
-
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-downvotes">Top 25 by received downvotes</a></h5>
-<pre>
-
-
-</pre>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-downvotes">Top 25 by received downvotes</a></h5>
 
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 	<thead class="bg-primary text-white">
@@ -287,16 +235,7 @@
 	</tbody>
 </table>
 
-
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-badges">Top 25 by badges</a></h5>
-<pre>
-
-
-</pre>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-badges">Top 25 by badges</a></h5>
 
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 	<thead class="bg-primary text-white">
@@ -327,15 +266,9 @@
 
 
 {% if users6 %}
-	<pre>
-
-
-	</pre>
-	<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-based">Top 25 by based count</a></h5>
-	<pre>
-
-
-	</pre>
+	
+	<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-based">Top 25 by based count</a></h5>
+	
 	<div class="overflow-x-auto"><table class="table table-striped mb-5">
 	<thead class="bg-primary text-white">
 		<tr>
@@ -362,16 +295,9 @@
 {% endif %}
 
 {% if users12 %}
-	<pre>
-
-
-	</pre>
-	<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-marseys">Top 25 by marseys made</a></h5>
-	<pre>
-
-
-	</pre>
-
+	
+	<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-marseys">Top 25 by marseys made</a></h5>
+	
 	<div class="overflow-x-auto"><table class="table table-striped mb-5">
 		<thead class="bg-primary text-white">
 			<tr>
@@ -400,16 +326,9 @@
 {% endif %}
 
 {% if users13 %}
-	<pre>
-
-
-	</pre>
-	<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-upgiven">Top 25 by upvotes given</a></h5>
-	<pre>
-
-
-	</pre>
-
+	
+	<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-upgiven">Top 25 by upvotes given</a></h5>
+	
 	<div class="overflow-x-auto"><table class="table table-striped mb-5">
 		<thead class="bg-primary text-white">
 			<tr>
@@ -437,8 +356,8 @@
 	</table>
 {% endif %}
 
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-winnings">Top 25 by winnings</a></h5>
-<pre></pre>
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-winnings">Top 25 by winnings</a></h5>
+
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -463,13 +382,8 @@
 {% endif %}
 </table>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-losses">Bottom 25 by winnings</a></h5>
 
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-losses">Bottom 25 by winnings</a></h5>
-<pre></pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -494,13 +408,8 @@
 {% endif %}
 </table>
 
+<h5 class="font-weight-bolder text-center pt-2 pb-3"><a id="leaderboard-blocked">Top 25 Most Blocked</a></h5>
 
-<pre>
-
-
-</pre>
-<h5 style="font-weight:bold;text-align: center"><a id="leaderboard-blocked">Top 25 Most Blocked</a></h5>
-<pre></pre>
 <div class="overflow-x-auto"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
@@ -518,11 +427,6 @@
 {% endfor %}
 </table>
 
-
-<pre>
-
-
-</pre>
 <a id="leader--top-btn" href="#leaderboard-contents" role="button"
 		style="position: fixed; bottom: 5rem; right: 2rem; font-size: 3rem;">
 	<i class="fas fa-arrow-alt-circle-up"></i>