diff --git a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
index a80d18a4dc723c8ad31398acec388cddb5c86085..297aeb51425018119ac4ca7036ed56e2a47ec641 100644
--- a/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
+++ b/src/components/Dashboard/ReservationPage/Reservation/TripStage.tsx
@@ -1,9 +1,21 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import React, { FC, useState } from 'react';
-import { Button, TextField, Typography } from '@material-ui/core';
+import {
+  Button,
+  Card,
+  CardActions,
+  CardContent,
+  TextField,
+  Typography,
+} from '@material-ui/core';
 import { Control, Controller } from 'react-hook-form';
 import { InputField } from 'components/Auth/InputField/InputField';
 import { InsertReservationType } from 'types/InsertReservationType';
+import DateFnsUtils from '@date-io/date-fns';
+import {
+  MuiPickersUtilsProvider,
+  KeyboardDateTimePicker,
+} from '@material-ui/pickers';
 
 type TripStageProps = {
   control: Control<InsertReservationType>;
@@ -12,36 +24,56 @@ type TripStageProps = {
 export const TripStage: FC<TripStageProps> = ({ control }: TripStageProps) => {
   const [stage, setStage] = useState<string[]>(['']);
   const [value, setValue] = useState<string>('');
-  console.log(control);
 
   const addStage = (): void => {
     setStage([...stage, value]);
   };
 
   return (
-    <>
-      {stage.map((field, index) => (
-        <>
-          <Typography variant="h3" component="h3">
-            Stage {index}
-          </Typography>
-          <Controller
-            as={<TextField variant="outlined" fullWidth label="Location" />}
-            name={`tripStages[${index}].address`}
-            control={control}
-            defaultValue={field}
-          />
-          <InputField
-            name={`tripStages[${index}].estimatedBeAt`}
-            label="Predicted time"
-            type="date"
-            control={control}
-          />
-        </>
-      ))}
-      <Button variant="outlined" onClick={addStage} type="button">
-        Add stage
-      </Button>
-    </>
+    <MuiPickersUtilsProvider utils={DateFnsUtils}>
+      <Card>
+        {stage.map((field, index) => (
+          <CardContent>
+            <Typography variant="h3" component="h3">
+              Stage {index}
+            </Typography>
+            <Controller
+              as={<input hidden />}
+              name={`tripStages[${index}].number`}
+              control={control}
+              defaultValue={index}
+            />
+            <Controller
+              as={<TextField variant="outlined" fullWidth label="Location" />}
+              name={`tripStages[${index}].location.address`}
+              control={control}
+              defaultValue={field}
+            />
+            <Controller
+              control={control}
+              name={`tripStages[${index}].estimatedBeAt`}
+              as={({ ref, ...rest }) => (
+                <KeyboardDateTimePicker
+                  margin="normal"
+                  id="date-picker-dialog"
+                  label="Date picker dialog"
+                  defaultValue={field}
+                  format="dd/MM/yyyy"
+                  KeyboardButtonProps={{
+                    'aria-label': 'Insert trip stage',
+                  }}
+                  {...rest}
+                />
+              )}
+            />
+          </CardContent>
+        ))}
+        <CardActions>
+          <Button variant="outlined" onClick={addStage} type="button">
+            Add stage
+          </Button>
+        </CardActions>
+      </Card>
+    </MuiPickersUtilsProvider>
   );
 };
diff --git a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
index 1f34d92ea66bcdba81c79ab6a2feb05df6cf31b2..5938e3fab56c9b7b2688fc549428e5824d6ea966 100644
--- a/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
+++ b/src/components/Dashboard/ReservationPage/ReservationDialog.tsx
@@ -37,10 +37,9 @@ export const ReservationDialog: FC<ReservationDialogProps> = ({
     const filledReservation = reservation;
     getRoleObject().then((role) => {
       filledReservation.insertedBy = role.id;
+      filledReservation.senior = senior?.id;
+      setReservation(filledReservation);
     });
-    filledReservation.senior = senior?.id;
-    console.log(filledReservation);
-    setReservation(filledReservation);
     handleClose();
   };