diff --git a/src/components/AppShelf/AppShelf.tsx b/src/components/AppShelf/AppShelf.tsx
index d76413811..2da45d5ea 100644
--- a/src/components/AppShelf/AppShelf.tsx
+++ b/src/components/AppShelf/AppShelf.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { motion } from 'framer-motion';
-import { Text, AspectRatio, SimpleGrid, Card, Image, useMantineTheme } from '@mantine/core';
+import { Text, AspectRatio, Card, Image, useMantineTheme, Center, Grid } from '@mantine/core';
 import { useConfig } from '../../tools/state';
 import { serviceItem } from '../../tools/types';
 import AppShelfMenu from './AppShelfMenu';
@@ -9,22 +9,13 @@ const AppShelf = () => {
   const { config } = useConfig();
 
   return (
-    <SimpleGrid
-      cols={7}
-      spacing="xl"
-      breakpoints={[
-        { maxWidth: 2400, cols: 6, spacing: 'xl' },
-        { maxWidth: 1800, cols: 5, spacing: 'xl' },
-        { maxWidth: 1500, cols: 4, spacing: 'lg' },
-        { maxWidth: 800, cols: 3, spacing: 'md' },
-        { maxWidth: 400, cols: 3, spacing: 'sm' },
-        { maxWidth: 400, cols: 2, spacing: 'sm' },
-      ]}
-    >
+    <Grid gutter="xl" align="center">
       {config.services.map((service) => (
-        <AppShelfItem key={service.name} service={service} />
+        <Grid.Col span={6} xs={4} sm={3} md={2}>
+          <AppShelfItem key={service.name} service={service} />
+        </Grid.Col>
       ))}
-    </SimpleGrid>
+    </Grid>
   );
 };
 
@@ -68,34 +59,35 @@ export function AppShelfItem(props: any) {
             <AppShelfMenu service={service} />
           </motion.div>
         </Card.Section>
-        <Card.Section>
-          <AspectRatio
-            ratio={3 / 5}
-            m="xl"
-            style={{
-              width: 150,
-              height: 90,
-            }}
-          >
-            <motion.i
-              whileHover={{
-                cursor: 'pointer',
-                scale: 1.1,
+        <Center>
+          <Card.Section>
+            <AspectRatio
+              ratio={3 / 5}
+              m="xl"
+              style={{
+                width: 150,
+                height: 90,
               }}
             >
-              <Image
-                style={{
-                  maxWidth: 80,
+              <motion.i
+                whileHover={{
+                  cursor: 'pointer',
+                  scale: 1.1,
                 }}
-                fit="contain"
-                onClick={() => {
-                  window.open(service.url);
-                }}
-                src={service.icon}
-              />
-            </motion.i>
-          </AspectRatio>
-        </Card.Section>
+              >
+                <Image
+                  width={80}
+                  height={80}
+                  src={service.icon}
+                  fit="contain"
+                  onClick={() => {
+                    window.open(service.url);
+                  }}
+                />
+              </motion.i>
+            </AspectRatio>
+          </Card.Section>
+        </Center>
       </Card>
     </motion.div>
   );
diff --git a/src/components/SearchBar/SearchBar.tsx b/src/components/SearchBar/SearchBar.tsx
index 7a40ea4c0..7236b7d86 100644
--- a/src/components/SearchBar/SearchBar.tsx
+++ b/src/components/SearchBar/SearchBar.tsx
@@ -22,7 +22,7 @@ export default function SearchBar(props: any) {
 
   return (
     <Box
-      mb={"xl"}
+      mb="xl"
       style={{
         width: '100%',
       }}
@@ -81,7 +81,8 @@ export default function SearchBar(props: any) {
           }
         >
           <Text>
-            tip: Use the prefixes <b>!yt</b> and <b>!t</b> in front of your query to search on YouTube or for a Torrent respectively.
+            tip: Use the prefixes <b>!yt</b> and <b>!t</b> in front of your query to search on
+            YouTube or for a Torrent respectively.
           </Text>
         </Popover>
       </form>
diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx
index b89fb2fcb..697f02123 100644
--- a/src/components/layout/Footer.tsx
+++ b/src/components/layout/Footer.tsx
@@ -54,24 +54,12 @@ export function Footer({ links }: FooterCenteredProps) {
     </Anchor>
   ));
 
-  return (
-    <FooterComponent height="auto" style={{ border: 'none' }}>
-      <Group
-        sx={{
-          position: 'fixed',
-          bottom: 0,
-          right: 15,
-        }}
-        direction="row"
-        align="center"
-        mb={15}
-      >
-        <Group className={classes.links}>{items}</Group>
-        <Group spacing="xs" position="right" noWrap>
-          <ActionIcon<'a'> component="a" href="https://github.com/ajnart/homarr" size="lg">
-            <BrandGithub size={18} />
-          </ActionIcon>
-        </Group>
+  return ( 
+    <FooterComponent p={5} height="auto" style={{ border: 'none', position: 'fixed', bottom: 0, right: 0 }}>
+      <Group position="right" mr="xs" mb="xs">
+        <ActionIcon<'a'> component="a" href="https://github.com/ajnart/homarr" size="lg">
+          <BrandGithub size={18} />
+        </ActionIcon>
         <Text
           style={{
             fontSize: '0.90rem',
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index ab646803d..a6ad51a9a 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -6,9 +6,6 @@ import Navbar from './Navbar';
 
 const useStyles = createStyles((theme) => ({
   main: {
-    [theme.fn.largerThan('md')]: {
-      maxWidth: 1500,
-    },
   },
 }));
 
@@ -21,7 +18,6 @@ export default function Layout({ children, style }: any) {
       header={<Header links={[]} />}
       footer={<Footer links={[]} />}
     >
-      <Center>
         <main
           className={cx(classes.main)}
           style={{
@@ -30,7 +26,6 @@ export default function Layout({ children, style }: any) {
         >
           {children}
         </main>
-      </Center>
     </AppShell>
   );
 }
diff --git a/src/components/layout/Navbar.tsx b/src/components/layout/Navbar.tsx
index 7bb7a8410..fba3ecec1 100644
--- a/src/components/layout/Navbar.tsx
+++ b/src/components/layout/Navbar.tsx
@@ -14,7 +14,7 @@ export default function Navbar() {
         base: 'auto',
       }}
     >
-      <Group mt="sm" direction="column">
+      <Group mt="sm" direction="column" align="center">
         <ModuleWrapper module={DateModule} />
       </Group>
     </MantineNavbar>
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 8ec813ffb..8680adf07 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -53,12 +53,12 @@ export default function HomePage(props: any) {
     setConfig(initialConfig);
   }, [initialConfig]);
   return (
-    <>
-      <SearchBar />
+    <> 
+      <SearchBar style={{ width: '100%'}} />
       <Group align="start" position="apart" noWrap>
         <AppShelf />
       </Group>
-      <LoadConfigComponent />
+        <LoadConfigComponent />
     </>
   );
 }