diff --git a/webapp/src/App.svelte b/webapp/src/App.svelte
index 3430e88..f3ec1f6 100644
--- a/webapp/src/App.svelte
+++ b/webapp/src/App.svelte
@@ -12,7 +12,7 @@ import { Toaster } from 'svelte-sonner'
 <ModeWatcher />
 <Toaster position="bottom-center" duration={2000} theme={mode.current} invert />
 
-<div class="m-auto stack min-h-dvh max-w-7xl gap-4 p-6 lg:py-8">
+<div class="m-auto stack min-h-dvh max-w-[calc(var(--container-7xl)-2*6*var(--spacing))]">
   <Main />
   <Footer />
 </div>
diff --git a/webapp/src/app.css b/webapp/src/app.css
index 7c1009d..bfa0720 100644
--- a/webapp/src/app.css
+++ b/webapp/src/app.css
@@ -119,6 +119,7 @@
   * {
     @apply border-border outline-ring/50;
   }
+
   body {
     @apply bg-background text-foreground;
   }
diff --git a/webapp/src/lib/layouts/Footer.svelte b/webapp/src/lib/layouts/Footer.svelte
index 293b049..8406e7f 100644
--- a/webapp/src/lib/layouts/Footer.svelte
+++ b/webapp/src/lib/layouts/Footer.svelte
@@ -5,7 +5,7 @@ import IconDarkMode from '~icons/material-symbols/dark-mode'
 import IconLightMode from '~icons/material-symbols/light-mode'
 </script>
 
-<footer class="row text-sm text-muted-foreground">
+<footer class="mx-6 mb-6 row text-sm text-muted-foreground xl:mx-0">
   <div class="grow">
     {new Date().getFullYear()} &copy;
     <a class="no-underline hover:underline" href="https://dayli.ly">daylily</a>
diff --git a/webapp/src/lib/layouts/Main.svelte b/webapp/src/lib/layouts/Main.svelte
index 3c595fb..4b53cb2 100644
--- a/webapp/src/lib/layouts/Main.svelte
+++ b/webapp/src/lib/layouts/Main.svelte
@@ -30,13 +30,7 @@ onMount(async () => {
   <h1 class="sr-only">Write to Inkclip</h1>
 
   <ConnectSection />
-
-  <Separator decorative />
-
   <EditSection />
-
-  <Separator decorative />
-
   <WriteSection />
 
   <PermissionRequestDialog open={midiCtx.perm === 'prompt'} />
diff --git a/webapp/src/lib/layouts/connect/ConnectSection.svelte b/webapp/src/lib/layouts/connect/ConnectSection.svelte
index 924b7f6..e027ed2 100644
--- a/webapp/src/lib/layouts/connect/ConnectSection.svelte
+++ b/webapp/src/lib/layouts/connect/ConnectSection.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 import MoreInfo from '$lib/components/MoreInfo.svelte'
+import { Separator } from '$lib/components/ui/separator'
 import { getDeviceContext } from '$lib/contexts/device.svelte'
 import { assert } from '$lib/utils'
 import IconCheckCircle from '~icons/material-symbols/check-circle'
@@ -33,28 +34,29 @@ $effect(() => {
 })
 </script>
 
-<section
-  class="flex flex-col gap-2 lg:flex-row lg:items-center"
-  aria-labelledby="connect-section-label"
->
-  <div class="grow">
-    <h2 class="text-xl/8 font-semibold" id="connect-section-label">Connect to a device</h2>
+<section aria-labelledby="connect-section-label">
+  <div class="mx-6 mt-6 mb-4 stack gap-2 lg:row xl:mx-0">
+    <div class="grow">
+      <h2 class="text-xl/8 font-semibold" id="connect-section-label">Connect to a device</h2>
 
-    <div class="stack-h gap-1 text-sm" aria-live="polite">
-      {#if deviceCtx.device === null}
-        <IconPending class="mt-0.5 shrink-0" aria-hidden /> Not connected to any device yet. Plug in your
-        device to connect.
-      {:else}
-        <MoreInfo class="mt-0.5 shrink-0">
-          {#snippet icon()}
-            <IconCheckCircle aria-hidden />
-          {/snippet}
-          The serial ID of this device is <code>{serial}</code>.
-        </MoreInfo>
-        Successfully conected to device.
-      {/if}
+      <div class="stack-h gap-1 text-sm" aria-live="polite">
+        {#if deviceCtx.device === null}
+          <IconPending class="mt-0.5 shrink-0" aria-hidden /> Not connected to any device yet. Plug in
+          your device to connect.
+        {:else}
+          <MoreInfo class="shrink-0">
+            {#snippet icon()}
+              <IconCheckCircle aria-hidden />
+            {/snippet}
+            The serial ID of this device is <code>{serial}</code>.
+          </MoreInfo>
+          Successfully connected to device.
+        {/if}
+      </div>
     </div>
+
+    <!-- <ConnectButton /> -->
   </div>
 
-  <!-- <ConnectButton /> -->
+  <Separator decorative />
 </section>
diff --git a/webapp/src/lib/layouts/edit/EditSection.svelte b/webapp/src/lib/layouts/edit/EditSection.svelte
index 6664b92..a126e1f 100644
--- a/webapp/src/lib/layouts/edit/EditSection.svelte
+++ b/webapp/src/lib/layouts/edit/EditSection.svelte
@@ -8,7 +8,7 @@ const mediaLg = new MediaQuery('min-width: 1024px')
 const separatorOrientation = $derived(mediaLg.current ? 'vertical' : 'horizontal')
 </script>
 
-<div class="flex grow flex-col gap-4 lg:flex-row">
+<div class="mx-6 flex grow flex-col gap-4 lg:flex-row xl:mx-0">
   <PreviewSection />
 
   <Separator decorative orientation={separatorOrientation} />
diff --git a/webapp/src/lib/layouts/write/WriteSection.svelte b/webapp/src/lib/layouts/write/WriteSection.svelte
index b478640..748ed3a 100644
--- a/webapp/src/lib/layouts/write/WriteSection.svelte
+++ b/webapp/src/lib/layouts/write/WriteSection.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+import { Separator } from '$lib/components/ui/separator'
 import { getImageContext } from '$lib/contexts/image.svelte'
 import IconArrowUploadProgress from '~icons/material-symbols/arrow-upload-progress'
 import IconPending from '~icons/material-symbols/pending'
@@ -10,22 +11,36 @@ const imageCtx = getImageContext()
 let inProgress = $state(false)
 </script>
 
-<section class="flex flex-col gap-2 lg:flex-row" aria-labelledby="write-section-label">
-  <div class="grow">
-    <h2 class="text-xl/8 font-semibold" id="write-section-label">Write pattern to device</h2>
+<section aria-labelledby="write-section-label">
+  <Separator decorative />
 
-    <div class="stack-h gap-1 text-sm" aria-live="polite">
-      {#if imageCtx.image === null}
-        <IconPending class="mt-0.5 shrink-0" aria-hidden /> Select an image file in order to write it
-        onto your device.
-      {:else if !inProgress}
-        <IconArrowUploadProgress class="mt-0.5 shrink-0" aria-hidden /> Write the pattern onto your device
-        if you have finished editing the image.
-      {:else}
-        <IconWarning class="mt-0.5 shrink-0" aria-hidden /> Refresh in progress. Do not disconnect device.
-      {/if}
+  <div class="mx-6 mt-4 mb-6 stack gap-2 lg:row xl:mx-0">
+    <div class="grow">
+      <h2 class="text-xl/8 font-semibold" id="write-section-label">Write pattern to device</h2>
+
+      <div class="stack-h gap-1 text-sm" aria-live="polite">
+        {#if imageCtx.image === null}
+          <IconPending class="mt-0.5 shrink-0" aria-hidden /> Select an image file in order to write it
+          onto your device.
+        {:else if !inProgress}
+          <IconArrowUploadProgress class="mt-0.5 shrink-0" aria-hidden /> Write the pattern onto your
+          device if you have finished editing the image.
+        {:else}
+          <IconWarning class="mt-0.5 shrink-0" aria-hidden /> Refresh in progress. Do not disconnect device.
+        {/if}
+      </div>
     </div>
-  </div>
 
-  <WriteButton onprogress={v => (inProgress = v)} />
+    <WriteButton onprogress={v => (inProgress = v)} />
+  </div>
 </section>
+
+<style>
+/* @media (display-mode: standalone) { */
+section {
+  position: sticky;
+  bottom: 0;
+  background: var(--color-background);
+}
+/* } */
+</style>