diff --git a/src_generic/components/EnhancedTable.tsx b/src_generic/components/EnhancedTable.tsx
index bc12886..f9282ad 100644
--- a/src_generic/components/EnhancedTable.tsx
+++ b/src_generic/components/EnhancedTable.tsx
@@ -158,7 +158,7 @@ export default function EnhancedTable({
   }, [config, onDelete, navigate, onNavigateToResource]);
 
   return (
-    <Box sx={{ height: 600, width: '100%' }}>
+    <Box sx={{ width: '100%' }}>
       <Box sx={{ display: 'flex', justifyContent: 'space-between', mb: 3, alignItems: 'center' }}>
         <Typography variant="h5">{config.pluralLabel}</Typography>
         <Button variant="contained" color="primary" onClick={onCreate}>
@@ -168,6 +168,7 @@ export default function EnhancedTable({
       <DataGrid
         rows={data || []}
         columns={columns}
+        autoHeight
         getRowId={(row) => {
             const pk = config.primaryKey;
             if (row[pk] !== undefined && row[pk] !== null) return row[pk];
@@ -183,7 +184,7 @@ export default function EnhancedTable({
             paginationModel: { page: 0, pageSize: 10 },
           },
         }}
-        pageSizeOptions={[5, 10, 25]}
+        pageSizeOptions={[10, 25, 50]}
       />
     </Box>
   );