diff --git a/app/layout.tsx b/app/layout.tsx
index 60efe2c7..7783cb75 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -74,38 +74,40 @@ export default function RootLayout({
       // Suppress hydration errors due to next-themes behavior
       suppressHydrationWarning
     >
-      <body>
+      <body className={clsx(
+        // Center on large screens
+        '3xl:flex flex-col items-center',
+      )}>
         <AppStateProvider>
           <ThemeProvider attribute="class" defaultTheme={DEFAULT_THEME}>
             <SwrConfigClient>
-              <main className={clsx(
+              <div className={clsx(
                 'mx-3 mb-3',
                 'lg:mx-6 lg:mb-6',
-                // Center on large screens
-                // 1280px width defined in components/SiteGrid.tsx
-                '3xl:mx-auto 3xl:w-[1280px]',
               )}>
                 <Nav siteDomainOrTitle={SITE_DOMAIN_OR_TITLE} />
-                <ShareModals />
-                <RecipeModal />
-                <div className={clsx(
-                  'min-h-[16rem] sm:min-h-[30rem]',
-                  'mb-12',
-                  'space-y-5',
-                )}>
-                  <AdminUploadPanel
-                    shouldResize={!PRESERVE_ORIGINAL_UPLOADS}
-                    onLastUpload={async () => {
-                      'use server';
-                      // Update upload count in admin nav
-                      revalidatePath('/admin', 'layout');
-                    }}
-                  />
-                  <AdminBatchEditPanel />
-                  {children}
-                </div>
+                <main>
+                  <ShareModals />
+                  <RecipeModal />
+                  <div className={clsx(
+                    'min-h-[16rem] sm:min-h-[30rem]',
+                    'mb-12',
+                    'space-y-5',
+                  )}>
+                    <AdminUploadPanel
+                      shouldResize={!PRESERVE_ORIGINAL_UPLOADS}
+                      onLastUpload={async () => {
+                        'use server';
+                        // Update upload count in admin nav
+                        revalidatePath('/admin', 'layout');
+                      }}
+                    />
+                    <AdminBatchEditPanel />
+                    {children}
+                  </div>
+                </main>
                 <Footer />
-              </main>
+              </div>
               <CommandK />
             </SwrConfigClient>
             <Analytics debug={false} />
diff --git a/src/app/Nav.tsx b/src/app/Nav.tsx
index 4da1f96c..a50c469d 100644
--- a/src/app/Nav.tsx
+++ b/src/app/Nav.tsx
@@ -61,7 +61,7 @@ export default function Nav({
           type={!isPathAdmin(pathname) ? 'bottom' : 'none'}
           distanceOffset={10}
           items={showNav
-            ? [<div
+            ? [<nav
               key="nav"
               className={clsx(
                 'flex items-center w-full',
@@ -89,7 +89,7 @@ export default function Nav({
                     {SITE_DESCRIPTION}
                   </div>}
               </div>
-            </div>]
+            </nav>]
             : []}
         />
       }
