diff --git a/templates/base.html.twig b/templates/base.html.twig
index 5621327..33fb3f2 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -20,7 +20,7 @@
             </div>
             <div class="col-span-6 md:col-span-5 h-screen overflow-y-scroll">
                 <twig:Header />
-                <h2 class="px-4 my-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
+                <h2 class="px-4 mt-4 mb-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
                 {% block body %}{% endblock %}
             </div>
         </div>
diff --git a/templates/downloads/index.html.twig b/templates/downloads/index.html.twig
index 8556c54..4a0f8b1 100644
--- a/templates/downloads/index.html.twig
+++ b/templates/downloads/index.html.twig
@@ -4,13 +4,13 @@
 {% block h2 %}Downloads{% endblock %}
 
 {% block body %}
-    <div class="p-4">
+    <div class="px-4 py-2">
         <twig:Card title="Active Downloads">
             <twig:DownloadList type="active" :isWidget="false" :perPage="10"></twig:DownloadList>
         </twig:Card>
     </div>
 
-    <div class="p-4">
+    <div class="px-4 py-2">
         <twig:Card title="Recent Downloads">
             <twig:DownloadList type="complete" :isWidget="false" :perPage="10"></twig:DownloadList>
         </twig:Card>
diff --git a/templates/index/index.html.twig b/templates/index/index.html.twig
index cef3c8c..34d3d22 100644
--- a/templates/index/index.html.twig
+++ b/templates/index/index.html.twig
@@ -1,10 +1,10 @@
 {% extends 'base.html.twig' %}
 
 {% block title %}Dashboard &mdash; Torsearch{% endblock %}
+{% block h2 %}Dashboard{% endblock %}
 
 {% block body %}
     <div class="p-4 flex flex-col grow gap-4 z-30">
-        <h2 class="mb-2 text-3xl font-bold text-gray-50">Dashboard</h2>
         <div class="flex flex-col md:flex-row gap-4">
             <twig:Card title="Active Downloads" class="w-full">
                 <twig:DownloadList :type="'active'" />
diff --git a/templates/monitor/index.html.twig b/templates/monitor/index.html.twig
index 417f244..cc82233 100644
--- a/templates/monitor/index.html.twig
+++ b/templates/monitor/index.html.twig
@@ -4,16 +4,14 @@
 {% block h2 %}Monitors{% endblock %}
 
 {% block body %}
-    <div class="flex flex-row">
-
-        <div class="p-2 flex flex-col gap-4">
-            <twig:Card title="Active Monitors">
-                <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
-            </twig:Card>
-            <twig:Card title="Complete Monitors">
-                <twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
-            </twig:Card>
-        </div>
-
+    <div class="px-4 py-2">
+        <twig:Card title="Active Monitors">
+            <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
+        </twig:Card>
+    </div>
+    <div class="px-4 py-2">
+        <twig:Card title="Complete Monitors">
+            <twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
+        </twig:Card>
     </div>
 {% endblock %}