diff --git a/app/agenda/page.tsx b/app/agenda/page.tsx
index f35a1dc..1d8eb36 100644
--- a/app/agenda/page.tsx
+++ b/app/agenda/page.tsx
@@ -701,7 +701,7 @@ export default async function CalendarPage() {
     }, 0);
 
   return (
-    <div className="w-full h-full bg-white">
+    <div className="w-full bg-white" style={{ height: 'calc(100vh - 3rem - 52px)' }}>
       <div className="w-full h-full px-4 pb-4 flex overflow-hidden">
         <CalendarClient 
           initialCalendars={calendars} 
diff --git a/components/layout/layout-wrapper.tsx b/components/layout/layout-wrapper.tsx
index 313c2c9..1ce9986 100644
--- a/components/layout/layout-wrapper.tsx
+++ b/components/layout/layout-wrapper.tsx
@@ -212,7 +212,7 @@ export function LayoutWrapper({ children, isSignInPage, isAuthenticated }: Layou
     <AuthCheck>
       {!isSignInPage && isAuthenticated && <MainNav />}
       <div 
-        className={isSignInPage ? "min-h-screen" : "flex flex-col h-screen"}
+        className={isSignInPage ? "min-h-screen" : ""}
         style={
           isSignInPage 
             ? {} // No background style for signin page - let the page component handle it
@@ -223,12 +223,14 @@ export function LayoutWrapper({ children, isSignInPage, isAuthenticated }: Layou
                 backgroundRepeat: 'no-repeat',
                 backgroundAttachment: 'fixed',
                 cursor: 'pointer',
-                transition: 'background-image 0.5s ease-in-out'
+                transition: 'background-image 0.5s ease-in-out',
+                paddingTop: '3rem', // 48px for fixed navbar
+                minHeight: '100vh'
               }
         }
         onClick={!isSignInPage ? changeBackground : undefined}
       >
-        <main className={isSignInPage ? "" : "flex-1 pt-12"}>{children}</main>
+        <main>{children}</main>
         {!isSignInPage && isAuthenticated && <Footer />}
       </div>
       <Toaster />