diff --git a/front/src/components/Calendar.svelte b/front/src/components/Calendar.svelte
index 47659c5..4cee1c8 100644
--- a/front/src/components/Calendar.svelte
+++ b/front/src/components/Calendar.svelte
@@ -1,12 +1,39 @@
-<script>
+<script lang="ts">
+    import { createEventDispatcher } from "svelte";
+
     import { ArrowArcLeft, ArrowArcRight } from "phosphor-svelte";
 
-    const weekLabels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
-    const monthLabels = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "July", "Aug", "Sep", "Oct", "Nov", "Dec"];
+    const dispatcher = createEventDispatcher();
+    const weekLabels = [
+        "Mon",
+        "Tue",
+        "Wed",
+        "Thu",
+        "Fri",
+        "Sat",
+        "Sun",
+    ];
+    const monthLabels = [
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December",
+    ];
+
+    const today = new Date();
 
     let date = new Date();
     let year = date.getFullYear();
     let month = date.getMonth();
+    let selectedDate: Date;
 
     $: firstDayOffset = new Date(year, month, 0).getDay();
     $: monthLength = new Date(year, month + 1, 0).getDate();
@@ -14,18 +41,20 @@
 
     function last() {
         month -= 1;
-
-        if (month < 0 || month > 11) {
-            date = new Date(year, month, new Date().getDate());
-            year = date.getFullYear();
-            month = date.getMonth();
-        } else {
-            date = new Date();
-        }
+        updateDate();
     }
+
     function next() {
         month += 1;
+        updateDate();
+    }
 
+    function selected(day: number) {
+        selectedDate = new Date(year, month, day);
+        dispatcher("selected", { date: selectedDate });
+    }
+
+    function updateDate() {
         if (month < 0 || month > 11) {
             date = new Date(year, month, new Date().getDate());
             year = date.getFullYear();
@@ -42,28 +71,34 @@
 
 <div class="calendar">
     <div class="calendar-header">
-        <p>{monthLabels[month]}&nbsp;{year}</p>
+        <p>{monthLabels[month]}&nbsp;<span>{year}</span></p>
         <button on:click={last}><ArrowArcLeft weight="fill" /></button>
         <button on:click={next}><ArrowArcRight weight="fill" /></button>
     </div>
     <div class="calendar-weeks">
-        {#each weekLabels as weekname}
-            <span>{weekname}</span>
+        {#each weekLabels as label}
+            <span>{label}</span>
         {/each}
     </div>
     <div class="calendar-days">
         {#each {length:firstDayOffset} as _}
             <div />
         {/each}
-        {#each {length:monthLength} as _, i}
+        {#each {length:monthLength} as _, dayNum}
             <div
                     class:today={
-                        i === date.getDate()
-                        && month === new Date().getMonth()
-                        && year === new Date().getFullYear()
+                        dayNum+1 === today.getDate()
+                        && month === today.getMonth()
+                        && year === today.getFullYear()
+                    }
+                    class:selected={
+                        selectedDate
+                        && dayNum+1 === selectedDate.getDate()
+                        && month === selectedDate.getMonth()
+                        && year === selectedDate.getFullYear()
                     }
             >
-                <button>{i+1}</button>
+                <button on:click={() => { selected(dayNum+1) }}>{dayNum+1}</button>
             </div>
         {/each}
         {#each {length:lastDayOffset} as _}
diff --git a/front/src/pages/PageBooking.svelte b/front/src/pages/PageBooking.svelte
index e03014c..0f2bd9e 100644
--- a/front/src/pages/PageBooking.svelte
+++ b/front/src/pages/PageBooking.svelte
@@ -91,7 +91,11 @@
 
     <div class="spacer" />
 
-    <Calendar />
+    <Calendar
+            on:selected={(event) => {
+                console.log(event.detail.date)
+            }}
+    />
 
     <div class="spacer" />
 
diff --git a/front/src/styles/_calendar.scss b/front/src/styles/_calendar.scss
index 9e01d18..55243fa 100644
--- a/front/src/styles/_calendar.scss
+++ b/front/src/styles/_calendar.scss
@@ -30,10 +30,17 @@
         padding-left: $spacing-normal;
         flex-grow: 1;
         font-size: $font-size-h4;
+
+        > span {
+            font-weight: $font-weight-bolder;
+        }
     }
 
     > button {
-        padding: $spacing-normal;
+        padding: 0 $spacing-normal;
+
+        height: 50px;
+
         display: flex;
         justify-content: center;
         align-items: center;
@@ -99,6 +106,17 @@
 
         &.today {
             > button {
+                font-weight: $font-weight-black;
+                text-decoration: underline;
+                //background-color: $color-primary;
+                //color: $color-on-primary;
+            }
+        }
+
+        &.selected {
+            > button {
+                //background-color: $color-dark;
+                //color: $color-on-dark;
                 background-color: $color-primary;
                 color: $color-on-primary;
             }