diff --git a/src/app/[locale]/backlog/page.tsx b/src/app/[locale]/backlog/page.tsx
index 50101e87..0e3a0ef4 100644
--- a/src/app/[locale]/backlog/page.tsx
+++ b/src/app/[locale]/backlog/page.tsx
@@ -33,7 +33,7 @@ export default function BacklogViewer() {
             headerAlign: 'center',
             renderCell: ({ value }) => (
               <Tooltip title={value} aria-label={value}>
-                <div>{value}</div>
+                {value}
               </Tooltip>
             ),
             width: 270
@@ -49,7 +49,7 @@ export default function BacklogViewer() {
             headerAlign: 'center',
             renderCell: ({ value }) => (
               <Tooltip title={value || ""} aria-label={value || ""}>
-                <div>{value || ""}</div>
+                {value || ""}
               </Tooltip>
             ),
             width: 270
diff --git a/src/app/[locale]/games/dlcs/page.tsx b/src/app/[locale]/games/dlcs/page.tsx
index 43ec2301..0452338d 100644
--- a/src/app/[locale]/games/dlcs/page.tsx
+++ b/src/app/[locale]/games/dlcs/page.tsx
@@ -44,7 +44,7 @@ function GamesGalleryList() {
     }
 
     return (
-        <div>
+        <>
             {
                 data.map(game => 
                     <Accordion key={game.name}>
@@ -82,7 +82,7 @@ function GamesGalleryList() {
                     </Accordion>
                 )
             }
-        </div>
+        </>
     )
 }
 
diff --git a/src/app/[locale]/games/page.tsx b/src/app/[locale]/games/page.tsx
index 1749eb27..8fc49b76 100644
--- a/src/app/[locale]/games/page.tsx
+++ b/src/app/[locale]/games/page.tsx
@@ -19,10 +19,10 @@ import type { CardGame } from "@/redux/sharedDefintion";
 
 export default function GamesGalleryGrid() {
     return (
-        <div>
+        <>
             <GamesFilters />
             <GamesGalleryGridInner />
-        </div>
+        </>
     );
 }
 
@@ -69,11 +69,10 @@ function GamesGalleryGridInner() {
             >
                 {allGames.map(renderRow)}
             </Grid>
-            <div style={{
-                justifyContent: "center",
-                display: "flex",
-                marginTop: "15px"
-            }}>
+            <Grid 
+                container 
+                justifyContent="center"
+            >
                 <LoadingButton
                     loading={isFetching}
                     disabled={ page >= (data?.total_pages || 1) }
@@ -81,7 +80,7 @@ function GamesGalleryGridInner() {
                 >
                     <span>{t('loadMore')}</span>
                 </LoadingButton>
-            </div> 
+            </Grid>
         </>
     );
 }
diff --git a/src/app/[locale]/games/series/page.tsx b/src/app/[locale]/games/series/page.tsx
index aa409e16..e616f148 100644
--- a/src/app/[locale]/games/series/page.tsx
+++ b/src/app/[locale]/games/series/page.tsx
@@ -44,7 +44,7 @@ function GamesGalleryList() {
     }
 
     return (
-        <div>
+        <>
             {
                 data.map(serie => 
                     <Accordion key={serie.name}>
@@ -82,7 +82,7 @@ function GamesGalleryList() {
                     </Accordion>
                 )
             }
-        </div>
+        </>
     )
 }
 
diff --git a/src/app/[locale]/tests/page.tsx b/src/app/[locale]/tests/page.tsx
index ef8f3cd8..38dca0c9 100644
--- a/src/app/[locale]/tests/page.tsx
+++ b/src/app/[locale]/tests/page.tsx
@@ -25,31 +25,29 @@ export default function TestsPage() {
     }
 
     return (
-        <div>    
-            <Grid
-                container
-                spacing={1}
-                rowSpacing={1}
-            >
-                {
-                    data
-                        .items
-                        .map(game => 
-                                <Grid 
-                                    key={game.id}
-                                    size={{
-                                        xs: 12,
-                                        sm: 6,
-                                        md: 3,
-                                        // 5 items for this screen size
-                                        lg: 2.4
-                                    }}
-                                >
-                                    <CardEntry game={game}/>
-                                </Grid>
-                        )
-                }
-            </Grid>
-        </div>
+        <Grid
+            container
+            spacing={1}
+            rowSpacing={1}
+        >
+            {
+                data
+                    .items
+                    .map(game => 
+                            <Grid 
+                                key={game.id}
+                                size={{
+                                    xs: 12,
+                                    sm: 6,
+                                    md: 3,
+                                    // 5 items for this screen size
+                                    lg: 2.4
+                                }}
+                            >
+                                <CardEntry game={game}/>
+                            </Grid>
+                    )
+            }
+        </Grid>
     )
 }
\ No newline at end of file