diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
index 2790daf..b93e297 100644
--- a/src/components/Layout.tsx
+++ b/src/components/Layout.tsx
@@ -122,9 +122,9 @@ export const Layout: React.FC<LayoutProps> = ({ children }) => {
       </Box>
 
       {/* Main Content */}
-      <Container maxW="95%" py={8}>
+      <Box px={4} py={8} w="100%">
         {children}
-      </Container>
+      </Box>
     </Box>
   )
 }
diff --git a/src/pages/tasks/TaskFormPage.tsx b/src/pages/tasks/TaskFormPage.tsx
index 6ac4cb4..9cbdd36 100644
--- a/src/pages/tasks/TaskFormPage.tsx
+++ b/src/pages/tasks/TaskFormPage.tsx
@@ -117,7 +117,7 @@ export const TaskFormPage: React.FC = () => {
   const isLoading = isCreating || isUpdating
 
   return (
-    <Box>
+    <Box w="100%">
       <Heading mb={6}>{isEdit ? t('challenge.admin.tasks.edit.title') : t('challenge.admin.tasks.create.title')}</Heading>
 
       <Box
@@ -129,6 +129,7 @@ export const TaskFormPage: React.FC = () => {
         boxShadow="sm"
         borderWidth="1px"
         borderColor="gray.200"
+        w="100%"
       >
         <VStack gap={6} align="stretch">
           {/* Title */}