@@ -109,6 +109,7 @@ format="LLLL"
           disablePast
           id="EditCarDateTime"
           name="date"
+          cancelLabel={t('generic.cancel')}
         />
         <TextField
           className={classes.textField}

@@ -89,6 +89,7 @@ 
 const useStyles = makeStyles(theme => ({
   slider: {
     padding: theme.spacing(1),
+    marginTop: theme.mixins.toolbar.minHeight,
   },
   slide: {
     height: `calc(100vh - ${theme.mixins.toolbar.minHeight}px - ${theme.spacing(

@@ -42,6 +42,7 @@ format="DD.MM.YYYY"
           disablePast
           id="NewEventDate"
           name="date"
+          cancelLabel={t('generic.cancel')}
         />
         <TextField
           className={classes.textField}

@@ -24,7 +24,7 @@ <div className={classes.section}>
             <Typography variant="h6">{t('event.fields.name')}</Typography>
             <TextField
               light
-              value={editingEvent.name ?? event.name}
+              value={editingEvent.name}
               onChange={e =>
                 setEditingEvent({...editingEvent, name: e.target.value})
               }
@@ -36,11 +36,9 @@ )}
         <Typography variant="h6">{t('event.fields.starts_on')}</Typography>
         {isEditing ? (
           <DatePicker
-            value={
-              editingEvent.date ? moment(editingEvent.date) : moment(event.date)
-            }
+            value={editingEvent.date ? moment(editingEvent.date) : null}
             onChange={date =>
-              setEditingEvent({...editingEvent, date: date.toISOString()})
+              setEditingEvent({...editingEvent, date: date?.toISOString()})
             }
             className={classes.textField}
             fullWidth
@@ -49,6 +47,7 @@ disablePast
             id={`${idPrefix}Date`}
             name="date"
             TextFieldComponent={p => <TextField light {...p} />}
+            cancelLabel={t('generic.cancel')}
           />
         ) : (
           <Typography variant="body1" id={`${idPrefix}Date`}>
@@ -63,7 +62,7 @@ <TextField
             light
             multiline
             rows={4}
-            value={editingEvent.address ?? event.address}
+            value={editingEvent.address}
             onChange={e =>
               setEditingEvent({...editingEvent, address: e.target.value})
             }

@@ -20,7 +20,14 @@ 
   // Fetch event data if not already done
   useEffect(() => {
     if (!strapi.stores.events?.find(({id}) => eventId === id))
-      strapi.services.events.findOne(eventId);
+      (async () => {
+        const fetchedEvent = await strapi.services.events.findOne(eventId);
+        setEditingEvent({
+          name: fetchedEvent.name,
+          date: fetchedEvent.date,
+          address: fetchedEvent.address,
+        });
+      })();
   }, [eventId, strapi.stores.events, strapi.services.events]);
 
   // Fetch event cars on load

@@ -164,6 +164,8 @@ overflow: 'hidden',
     height: detailsOpen ? '100vh' : theme.mixins.toolbar.minHeight,
     transition: 'height 0.3s ease',
     zIndex: theme.zIndex.appBar,
+    position: 'fixed',
+    top: 0,
   }),
   name: {
     flexGrow: 1,