Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pnpm-lock.yaml

src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx

@@ -10,7 +10,7 @@ export function WebsiteLayout({ websiteId, children }: { websiteId: string; chil
   return (
     <WebsiteProvider websiteId={websiteId}>
       <Grid columns="auto 1fr" width="100%" height="100%">
-        <Column height="100%" border="right" backgroundColor>
+        <Column height="100%" border="right" backgroundColor marginRight="2">
           <WebsiteNav websiteId={websiteId} />
         </Column>
         <PageBody gap>

src/app/(main)/websites/[websiteId]/WebsitePage.tsx

@@ -26,7 +26,7 @@ export function WebsitePage({ websiteId }: { websiteId: string }) {
   };
 
   return (
-    <Column gap marginLeft="2">
+    <Column gap>
       <WebsiteControls websiteId={websiteId} />
       <WebsiteMetricsBar websiteId={websiteId} showChange={true} />
       <Panel minHeight="520px">