diff --git a/frontend-modern/src/App.tsx b/frontend-modern/src/App.tsx
index 645e44b04..e5f060de7 100644
--- a/frontend-modern/src/App.tsx
+++ b/frontend-modern/src/App.tsx
@@ -546,23 +546,21 @@ function App() {
                   <SecurityWarning />
                   <DemoBanner />
                   <UpdateBanner />
-                  <div class="min-h-screen bg-gray-100 dark:bg-gray-900 text-gray-800 dark:text-gray-200 p-2 font-sans">
-                    <div class="container w-[98%] max-w-[1920px] mx-auto">
-                      <AppLayout
-                        connected={connected}
-                        reconnecting={reconnecting}
-                        dataUpdated={dataUpdated}
-                        lastUpdateText={lastUpdateText}
-                        versionInfo={versionInfo}
-                        hasAuth={hasAuth}
-                        needsAuth={needsAuth}
-                        proxyAuthInfo={proxyAuthInfo}
-                        handleLogout={handleLogout}
-                        state={state}
-                      >
-                        {props.children}
-                      </AppLayout>
-                    </div>
+                  <div class="min-h-screen bg-gray-100 dark:bg-gray-900 text-gray-800 dark:text-gray-200 font-sans py-4 sm:py-6">
+                    <AppLayout
+                      connected={connected}
+                      reconnecting={reconnecting}
+                      dataUpdated={dataUpdated}
+                      lastUpdateText={lastUpdateText}
+                      versionInfo={versionInfo}
+                      hasAuth={hasAuth}
+                      needsAuth={needsAuth}
+                      proxyAuthInfo={proxyAuthInfo}
+                      handleLogout={handleLogout}
+                      state={state}
+                    >
+                      {props.children}
+                    </AppLayout>
                   </div>
                   <ToastContainer />
                   <NotificationContainer />
@@ -599,7 +597,6 @@ function App() {
   );
 }
 
-// Layout component that wraps all routes
 function AppLayout(props: {
   connected: () => boolean;
   reconnecting: () => boolean;
@@ -766,7 +763,7 @@ function AppLayout(props: {
   };
 
   return (
-    <>
+    <div class="pulse-shell">
       {/* Header */}
       <div class="header flex flex-row justify-between items-center mb-2">
         <div class="hidden md:block md:flex-1"></div>
@@ -989,7 +986,7 @@ function AppLayout(props: {
         id="main"
         class="tab-content block bg-white dark:bg-gray-800 rounded-b rounded-tr shadow mb-2"
       >
-        <div class="p-3">
+        <div class="pulse-panel">
           {props.children}
         </div>
       </main>
@@ -1012,7 +1009,7 @@ function AppLayout(props: {
           <span>Last refresh: {props.lastUpdateText()}</span>
         </Show>
       </footer>
-    </>
+    </div>
   );
 }
 
diff --git a/frontend-modern/src/index.css b/frontend-modern/src/index.css
index fa0d35011..547670809 100644
--- a/frontend-modern/src/index.css
+++ b/frontend-modern/src/index.css
@@ -118,6 +118,18 @@
 }
 
 @layer components {
+  .pulse-shell {
+    width: min(96vw, 110rem);
+    max-width: 100%;
+    margin-inline: auto;
+    padding-inline: clamp(1.25rem, 3vw, 3.25rem);
+    transition: padding-inline 0.3s ease;
+  }
+
+  .pulse-panel {
+    padding: clamp(0.75rem, 1.6vw, 1.5rem);
+  }
+
   /* Card styles */
   .card {
     @apply bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700;