diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index 532d18e88..409146f91 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -173,20 +173,28 @@ Blocks:
 
 
       {# Page body #}
-      <div class="page-body">
-        <div class="container-xl tab-content py-3">
-          {# TODO: Remove content-wrapper block #}
-          {% block content-wrapper %}
+      {% block page %}
+        <div class="page-body">
+          <div class="container-xl tab-content py-3">
+
+            {# Page content #}
+            {# TODO: Remove content-wrapper block #}
+            {% block content-wrapper %}
               {% block content %}{% endblock %}
-          {% endblock %}
-          {# Bottom banner #}
-          {% if config.BANNER_BOTTOM %}
-            <div class="text-center mx-3 mt-2">
-              {{ config.BANNER_BOTTOM|safe }}
-            </div>
-          {% endif %}
+            {% endblock %}
+            {# /Page content #}
+
+            {# Bottom banner #}
+            {% if config.BANNER_BOTTOM %}
+              <div class="text-center mx-3 mt-2">
+                {{ config.BANNER_BOTTOM|safe }}
+              </div>
+            {% endif %}
+            {# /Bottom banner #}
+
+          </div>
         </div>
-      </div>
+      {% endblock page %}
       {# /Page body #}
 
       {# Page footer #}
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 7dc9777af..32ba0743a 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -23,9 +23,9 @@
 
 {% block title %}{% trans "Home" %}{% endblock %}
 
-{% block content-wrapper %}
+{% block page %}
   {# Render the user's customized dashboard #}
-  <div class="grid-stack" id="dashboard">
+  <div class="grid-stack m-2" id="dashboard">
     {% for widget in dashboard %}
       {% include 'extras/dashboard/widget.html' %}
     {% endfor %}
@@ -65,7 +65,7 @@
       </div>
     </div>
   </div>
-{% endblock content-wrapper %}
+{% endblock page %}
 
 {% block modals %}
   {% include 'inc/htmx_modal.html' %}