diff --git a/assets/css/src/grid.css b/assets/css/src/grid.css
index 97db30b..56f959f 100644
--- a/assets/css/src/grid.css
+++ b/assets/css/src/grid.css
@@ -5,5 +5,25 @@ body.full-width #desktop-nav .empty {
   height: calc(var(--unit--vertical) / 2);
 }
 body.full-width .content {
-  position: sticky;
+  position: absolute;
+  left: 0;
+  width: 100vw;
+  padding: 0 var(--unit--horizontal) var(--unit--vertical)
+    var(--unit--horizontal);
+  box-sizing: border-box;
+}
+
+.grid {
+  display: grid;
+  grid-template-columns: repeat(39, 1fr);
+  column-gap: var(--unit--horizontal);
+  margin-bottom: calc(var(--unit--vertical) * 2);
+}
+
+.grid .column {
+  grid-column: span var(--span);
+}
+
+.grid[data-columns="1"] .column {
+  grid-column: 11 / span 20;
 }
diff --git a/assets/css/src/html.css b/assets/css/src/html.css
index 026eacd..c683b8b 100644
--- a/assets/css/src/html.css
+++ b/assets/css/src/html.css
@@ -14,11 +14,9 @@ main {
 }
 
 hr {
-  height: calc(var(--unit--vertical) / 2);
+  height: 1px;
   border: none;
   background-color: var(--color-primary);
-  width: calc(var(--unit--horizontal) * 4);
-  margin: calc(var(--unit--vertical) * 2) calc(var(--unit--horizontal));
 }
 
 nav hr {
@@ -66,7 +64,7 @@ html {
   }
 
   body.full-width {
-    --padding-body: calc(var(--unit--horizontal) * 7);
+    --padding-body: calc(var(--unit--horizontal) * 10);
   }
 
   body,
diff --git a/site/blueprints/pages/grid.yml b/site/blueprints/pages/grid.yml
index 77e3429..53206c5 100644
--- a/site/blueprints/pages/grid.yml
+++ b/site/blueprints/pages/grid.yml
@@ -26,6 +26,7 @@ tabs:
               - 1/2, 1/2
               - 1/3, 1/3, 1/3
             fieldsets:
+              - heading
               - text
               - image
               - line
diff --git a/site/templates/grid.php b/site/templates/grid.php
index 57098bb..6b99dda 100644
--- a/site/templates/grid.php
+++ b/site/templates/grid.php
@@ -14,9 +14,9 @@
     <?php endsnippet() ?>
     <div class="content">
       <?php foreach ($page->body()->toLayouts() as $layout): ?>
-      <section class="grid" id="<?= $layout->id() ?>">
+      <section class="grid" id="<?= $layout->id() ?>" data-columns="<?= $layout->columns()->count() ?>">
         <?php foreach ($layout->columns() as $column): ?>
-        <div class="column" style="--span:<?= $column->span() ?>">
+        <div class="column" style="--span:<?= $column->span(38) ?>">
           <div class="blocks">
             <?= $column->blocks() ?>
           </div>