diff --git a/frontend/src/views/CreateTimerecord.vue b/frontend/src/views/CreateTimerecord.vue
index f19283e..05e336b 100644
--- a/frontend/src/views/CreateTimerecord.vue
+++ b/frontend/src/views/CreateTimerecord.vue
@@ -33,7 +33,7 @@
             ref="menu"
             v-model="menu"
             :close-on-content-click="false"
-            :return-value.sync="newstartdate"
+            :nudge-right="40"           
             transition="scale-transition"
             offset-y
             min-width="290px"
@@ -47,10 +47,8 @@
                 v-on="on"
               ></v-text-field>
             </template>
-            <v-date-picker v-model="newstartdate" no-title scrollable>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="menu = false">Cancel</v-btn>
-              <v-btn text color="primary" @click="$refs.menu.save(newstartdate)">OK</v-btn>
+            <v-date-picker v-model="newstartdate" @input="menu = false" no-title scrollable>
+            
             </v-date-picker>
           </v-menu>
         </v-col>
@@ -59,7 +57,7 @@
             ref="menu2"
             v-model="menu2"
             :close-on-content-click="false"
-            :return-value.sync="newenddate"
+           :nudge-right="40"
             transition="scale-transition"
             offset-y
             min-width="290px"
@@ -73,10 +71,8 @@
                 v-on="on"
               ></v-text-field>
             </template>
-            <v-date-picker v-model="newenddate" no-title scrollable>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="menu2 = false">Cancel</v-btn>
-              <v-btn text color="primary" @click="$refs.menu2.save(newenddate)">OK</v-btn>
+            <v-date-picker v-model="newenddate" @input="menu2 = false" no-title scrollable>
+             
             </v-date-picker>
           </v-menu>
         </v-col>
@@ -107,6 +103,7 @@
               v-if="menutime"
               v-model="timestart"
               full-width
+              format="24hr"
               @click:minute="$refs.menutime.save(timestart)"
             ></v-time-picker>
           </v-menu>
@@ -136,6 +133,7 @@
               v-if="menutime2"
               v-model="timeend"
               full-width
+              format="24hr"
               @click:minute="$refs.menutime2.save(timeend)"
             ></v-time-picker>
           </v-menu>
diff --git a/frontend/src/views/EditTimerecord.vue b/frontend/src/views/EditTimerecord.vue
index d5c3453..dce0ca2 100644
--- a/frontend/src/views/EditTimerecord.vue
+++ b/frontend/src/views/EditTimerecord.vue
@@ -20,7 +20,7 @@
             ref="menu"
             v-model="menu"
             :close-on-content-click="false"
-            :return-value.sync="newstartdate"
+           :nudge-right="40"
             transition="scale-transition"
             offset-y
             min-width="290px"
@@ -34,10 +34,8 @@
                 v-on="on"
               ></v-text-field>
             </template>
-            <v-date-picker v-model="newstartdate" no-title scrollable>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="menu = false">Cancel</v-btn>
-              <v-btn text color="primary" @click="$refs.menu.save(newstartdate)">OK</v-btn>
+            <v-date-picker v-model="newstartdate" @input="menu = false" no-title scrollable>
+           
             </v-date-picker>
           </v-menu>
         </v-col>
@@ -46,7 +44,7 @@
             ref="menu2"
             v-model="menu2"
             :close-on-content-click="false"
-            :return-value.sync="newenddate"
+            :nudge-right="40"
             transition="scale-transition"
             offset-y
             min-width="290px"
@@ -60,10 +58,8 @@
                 v-on="on"
               ></v-text-field>
             </template>
-            <v-date-picker v-model="newenddate" no-title scrollable>
-              <v-spacer></v-spacer>
-              <v-btn text color="primary" @click="menu2 = false">Cancel</v-btn>
-              <v-btn text color="primary" @click="$refs.menu2.save(newenddate)">OK</v-btn>
+            <v-date-picker v-model="newenddate" @input="menu2 = false" no-title scrollable>
+             
             </v-date-picker>
           </v-menu>
         </v-col>
@@ -94,6 +90,7 @@
               v-if="menutime"
               v-model="timestart"
               full-width
+              format="24hr"
               @click:minute="$refs.menutime.save(timestart)"
             ></v-time-picker>
           </v-menu>
@@ -123,6 +120,7 @@
               v-if="menutime2"
               v-model="timeend"
               full-width
+              format="24hr"
               @click:minute="$refs.menutime2.save(timeend)"
             ></v-time-picker>
           </v-menu>