diff --git a/components/calendar/CalendarComponent.tsx b/components/calendar/CalendarComponent.tsx
index 78135e511..0efa18064 100644
--- a/components/calendar/CalendarComponent.tsx
+++ b/components/calendar/CalendarComponent.tsx
@@ -89,7 +89,13 @@ function DayComponent(props: any) {
         {/* TODO: #6 Make the color of the indicator dependant on the type of medias avilable */}
         <>
           {radarrFiltered.length > 0 && (
-            <Indicator size={8} offset={10} position="bottom-center" color="yellow" children={null} />
+            <Indicator
+              size={8}
+              offset={10}
+              position="bottom-center"
+              color="yellow"
+              children={null}
+            />
           )}
           {sonarrFiltered.length > 0 && (
             <Indicator size={8} offset={-12} position="top-end" color="blue" children={null} />
@@ -99,11 +105,14 @@ function DayComponent(props: any) {
             width={700}
             onClose={() => setOpened(false)}
             opened={opened}
-            target={day}
+            // TODO: Fix this !! WTF ?
+            target={`‏ ${day}`}
           >
             <ScrollArea style={{ height: 400 }}>
               {sonarrFiltered.length > 0 && <SonarrMediaDisplay media={sonarrFiltered[0]} />}
-              {(radarrFiltered.length > 0 && sonarrFiltered.length > 0) && <Divider variant="dashed" my="xl" />}
+              {radarrFiltered.length > 0 && sonarrFiltered.length > 0 && (
+                <Divider variant="dashed" my="xl" />
+              )}
               {radarrFiltered.length > 0 && <RadarrMediaDisplay media={radarrFiltered[0]} />}
             </ScrollArea>
           </Popover>
diff --git a/components/calendar/MediaDisplay.tsx b/components/calendar/MediaDisplay.tsx
index 6f3be4186..5c6a5c2bc 100644
--- a/components/calendar/MediaDisplay.tsx
+++ b/components/calendar/MediaDisplay.tsx
@@ -17,14 +17,7 @@ export function RadarrMediaDisplay(props: any) {
   // Return a movie poster containting the title and the description
   return (
     <Group noWrap align="self-start">
-      <Image
-        fit="cover"
-        src={poster.url}
-        alt={media.title}
-        style={{
-          maxWidth: 300,
-        }}
-      />
+      <Image fit="cover" src={poster.url} alt={media.title} width={300} height={400} />
       <Stack
         justify="space-between"
         sx={(theme) => ({
@@ -60,13 +53,7 @@ export function SonarrMediaDisplay(props: any) {
   // Return a movie poster containting the title and the description
   return (
     <Group noWrap align="self-start">
-      <Image
-        src={poster.url}
-        fit="cover"
-        width={300}
-        height={400}
-        alt={media.series.title}
-      />
+      <Image src={poster.url} fit="cover" width={300} height={400} alt={media.series.title} />
       <Stack
         justify="space-between"
         sx={(theme) => ({