diff --git a/components/AppShelf/AddAppShelfItem.tsx b/components/AppShelf/AddAppShelfItem.tsx
index 1c53b7bfe..886b661dc 100644
--- a/components/AppShelf/AddAppShelfItem.tsx
+++ b/components/AppShelf/AddAppShelfItem.tsx
@@ -17,10 +17,11 @@ import { useForm } from '@mantine/hooks';
 import { motion } from 'framer-motion';
 import { useState } from 'react';
 import { Apps } from 'tabler-icons-react';
+import { useConfig } from '../../tools/state';
 import { ServiceType, ServiceTypeList } from '../../tools/types';
 
 export default function AddItemShelfItem(props: any) {
-  const { additem: addItem } = props;
+  const { config, addService } = useConfig();
   const [opened, setOpened] = useState(false);
   const theme = useMantineTheme();
   const form = useForm({
@@ -53,7 +54,7 @@ export default function AddItemShelfItem(props: any) {
         </Center>
         <form
           onSubmit={form.onSubmit(() => {
-            addItem(form.values);
+            addService(form.values);
             setOpened(false);
             form.reset();
           })}
diff --git a/components/AppShelf/AppShelf.tsx b/components/AppShelf/AppShelf.tsx
index f1b8ff006..7a0b66927 100644
--- a/components/AppShelf/AppShelf.tsx
+++ b/components/AppShelf/AppShelf.tsx
@@ -93,6 +93,7 @@ const AppShelf = (props: any) => {
           </Box>
         </motion.div>
       ))}
+      <AddItemShelfItem/>
     </SimpleGrid>
   );
 };
diff --git a/components/calendar/CalendarComponent.tsx b/components/calendar/CalendarComponent.tsx
index 716cb0879..88cc85a64 100644
--- a/components/calendar/CalendarComponent.tsx
+++ b/components/calendar/CalendarComponent.tsx
@@ -1,4 +1,14 @@
-import { Group, Indicator, Popover, Box, Container, Text, Avatar, ActionIcon } from '@mantine/core';
+import {
+  Group,
+  Indicator,
+  Popover,
+  Box,
+  Container,
+  Text,
+  Avatar,
+  ActionIcon,
+  Center,
+} from '@mantine/core';
 import { useEffect, useState } from 'react';
 import { Calendar } from '@mantine/dates';
 import dayjs from 'dayjs';
@@ -20,7 +30,6 @@ async function GetCalendars(endDate: Date) {
       fetch(`${service.url}/api/v3/calendar?end=${endDate}?apikey=${service.apiKey}`)
     )
   );
-  console.log(Calendars);
 }
 
 export default function CalendarComponent(props: any) {
@@ -28,7 +37,6 @@ export default function CalendarComponent(props: any) {
   // const [medias, setMedias] = useState();
   const dates = medias.map((media) => media.inCinemas);
   const parsedDates = dates.map((date) => dayjs(date));
-  console.log(parsedDates);
 
   // useEffect(() => {
   //   const { services } = props;
@@ -78,23 +86,25 @@ function DayComponent(props: any) {
 
   if (match > -1) {
     return (
-      <ActionIcon
+      <Box
         onClick={() => {
           setOpened(true);
-          console.log();
         }}
-        color="teal"
-        variant="light"
+        style={{ height: '100%', width: '100%' }}
       >
-        <Popover
-          position="right"
-          width={700}
-          onClose={() => setOpened(false)}
-          opened={opened}
-          target={day}
-          children={<MediaDisplay media={medias[match]} />}
-        />
-      </ActionIcon>
+        <Center>
+          <Indicator size={10} color="red">
+            <Popover
+              position="left"
+              width={700}
+              onClose={() => setOpened(false)}
+              opened={opened}
+              target={day}
+              children={<MediaDisplay media={medias[match]} />}
+            />
+          </Indicator>
+        </Center>
+      </Box>
     );
   }
   return <div>{day}</div>;
diff --git a/components/layout/Layout.tsx b/components/layout/Layout.tsx
index 7d10794d7..35594a0fb 100644
--- a/components/layout/Layout.tsx
+++ b/components/layout/Layout.tsx
@@ -1,6 +1,7 @@
-import { AppShell, Center, createStyles } from '@mantine/core';
+import { AppShell, Aside, Center, createStyles } from '@mantine/core';
 import { Header } from './Header';
 import { Footer } from './Footer';
+import CalendarComponent from '../calendar/CalendarComponent';
 
 const useStyles = createStyles((theme) => ({
   main: {
@@ -13,10 +14,27 @@ const useStyles = createStyles((theme) => ({
 export default function Layout({ children, style }: any) {
   const { classes, cx } = useStyles();
   return (
-    <AppShell header={<Header links={[]} />} footer={<Footer links={[]} />}>
+    <AppShell
+      
+      aside={
+        <Aside
+        height={'auto'}
+        width={{
+          xs: 'auto',
+          md: 'auto',
+          lg: 'auto',
+          xl: 'auto',
+        }}
+        >
+          <CalendarComponent />
+        </Aside>
+      }
+      header={<Header links={[]} />}
+      footer={<Footer links={[]} />}
+    >
       <Center>
         <main
-          className={cx(classes.main)}
+          // className={cx(classes.main)}
           style={{
             ...style,
           }}
diff --git a/pages/index.tsx b/pages/index.tsx
index ce0f1314c..d112d87c4 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -8,7 +8,7 @@ export default function HomePage() {
   return (
     <>
       <SearchBar />
-      <Group align={"start"} position="apart" noWrap>
+      <Group align={'start'} position="apart" noWrap>
         <AppShelf />
         <CalendarComponent />
       </Group>