diff --git a/app/src/plugins/app@vendor/vue-cal/cell.vue b/app/src/plugins/app@vendor/vue-cal/cell.vue
index a3cae66..92fcd8d 100644
--- a/app/src/plugins/app@vendor/vue-cal/cell.vue
+++ b/app/src/plugins/app@vendor/vue-cal/cell.vue
@@ -262,11 +262,10 @@ export default {
         dateTo.setHours(dateFrom.getHours() + 1)
 
         const time = moment(dateFrom).format('HH:mm')
-        const date = moment(dateFrom).format('DD.MM.yyyy')
 
-			  this.$events.emit('show-menu-modal', {
-          time: time,
-          date: date
+		this.$events.emit('show-menu-modal', {
+			time: time,
+			date: tmUtils.formatDateTimeForBackend(dateFrom)
         })
 
         setTimeout(() => {
diff --git a/app/src/plugins/tm@modal/_mixins/modal.mixin.ts b/app/src/plugins/tm@modal/_mixins/modal.mixin.ts
new file mode 100644
index 0000000..4297698
--- /dev/null
+++ b/app/src/plugins/tm@modal/_mixins/modal.mixin.ts
@@ -0,0 +1,11 @@
+export default {
+	mounted() {
+		window.addEventListener('keydown', this.handleKeyDown)
+	},
+
+	methods: {
+		handleKeyDown(event) {
+			if (event.keyCode === 27) this.closeModal()
+		}
+	},
+}
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
index a5cb5e5..19298ca 100644
--- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
@@ -44,9 +44,10 @@ import VuetifyFixFocusMixin from "@/plugins/tm@modal/_mixins/vuetify-fix-focus"
 import { mapGetters } from "vuex"
 import moment from "moment"
 import AutocompleteMixin from '@/plugins/tm@_mixins/autocomplete.mixin'
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
-	mixins: [VuetifyFixFocusMixin, AutocompleteMixin],
+	mixins: [VuetifyFixFocusMixin, AutocompleteMixin, modalMixin],
 
 	emits: ["close"],
 
@@ -136,6 +137,7 @@ export default {
 				}
 
 				this.$events.emit("on-blocker-edited", this.blocker)
+				this.$events.emit("blocker-created")
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
diff --git a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
index c5e042c..35efa01 100644
--- a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
@@ -20,7 +20,10 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
+	mixins: [ modalMixin ],
 	emits: ['on-blocker-deleted'],
 
 	data() {
diff --git a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
index 404f4c9..2e2e82d 100644
--- a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
@@ -20,7 +20,10 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
+	mixins: [ modalMixin ],
 	emits: ['on-mastertask-deleted'],
 
 	data() {
diff --git a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
index cf643bf..e67c24b 100644
--- a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
@@ -28,8 +28,10 @@
 
 <script>
 import tmUtils from '@/plugins/tm@_utils/tm.utils'
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
+	mixins: [ modalMixin ],
 	data() {
 		return {
 			visible: false,
diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
index bebd636..dcbe4e2 100644
--- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
@@ -96,6 +96,7 @@ import VuetifyFixFocusMixin from '@/plugins/tm@modal/_mixins/vuetify-fix-focus'
 import moment from 'moment'
 import { QuillEditor } from '@vueup/vue-quill'
 // import tmUtils from '@/plugins/tm@_utils/tm.utils'
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 import '@vueup/vue-quill/dist/vue-quill.snow.css'
 
@@ -112,7 +113,7 @@ export default {
 	// watch: mastertask.team_id
 
 	emits: ['master-task-edited', 'close'],
-	mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin],
+	mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin, modalMixin],
 
 	components: {
 		AMastertaskDescription,
diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
index ba801d3..43d394a 100644
--- a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
+++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
@@ -8,7 +8,7 @@
 
 			<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
 				<v-btn class="button primary half outline" @click.stop="createTask()"
-					>TASK</v-btn
+					>SUB TASK</v-btn
 				>
 				<v-btn class="button primary half outline" @click.stop="createBlocker()"
 					>BLOCKER</v-btn
@@ -19,9 +19,12 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
 	emits: ['update', 'data'],
 	props: ['data'],
+	mixins: [ modalMixin ],
 
 	data() {
 		return {
@@ -30,6 +33,16 @@ export default {
 		}
 	},
 
+	mounted() {
+		this.$events.on('blocker-created', () => {
+			this.closeModal()
+		})
+
+		this.$events.on('task-created', () => {
+			this.closeModal()
+		})
+	},
+
 	methods: {
 		async showModal(data) {
 			this.localData = data
@@ -46,6 +59,9 @@ export default {
 					deadline: this.localData.date,
 					_deadline_time: this.localData.time,
 				},
+				onTaskCreated: () => {
+					this.closeModal()
+				}
 			})
 		},
 
@@ -55,6 +71,9 @@ export default {
 					starts_at_time: this.localData.time,
 					datepicker: this.localData.date,
 				},
+				onBlockerCreated: () => {
+					this.closeModal()
+				}
 			})
 		},
 	},
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-remaining-time.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-remaining-time.vue
index 2cf3b51..6dd5623 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-remaining-time.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-remaining-time.vue
@@ -11,7 +11,7 @@
 
 		<v-col cols="7">
 			<v-sheet class="py-3">
-				<p>{{ hours }} h</p>
+				<p>{{ (hours).toFixed(2) }} h</p>
 			</v-sheet>
 		</v-col>
 	</v-row>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
index 867eefe..5d69bb3 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
@@ -57,8 +57,10 @@ import useVuelidate 					from '@vuelidate/core'
 import { required, numeric, minValue } 	from '@vuelidate/validators'
 import tmUtils 							from '@/plugins/tm@_utils/tm.utils'
 import { mapGetters } 					from 'vuex'
+import modalMixin						from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
+	mixins: [ modalMixin ],
 	props: {
 		hours: {
 			type: Number,
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index 7f666d8..a0a9c69 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -49,10 +49,12 @@ import tmUtils 		from '@/plugins/tm@_utils/tm.utils'
 import errorUtils 	from '@/plugins/lib@auth/_utils/error.utils'
 import useVuelidate from '@vuelidate/core'
 import { required }	from '@vuelidate/validators'
-import Datepicker from '@vuepic/vue-datepicker'
-import moment from 'moment'
+import Datepicker 	from '@vuepic/vue-datepicker'
+import moment 		from 'moment'
+import modalMixin 	from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
+	mixins: [ modalMixin ],
 	emits: ['update-subtask'],
 
 	components: {
diff --git a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
index c11c7af..8c957f4 100644
--- a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
@@ -4,7 +4,7 @@
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete {{ subtask.is_finished ? 'znovu otvoriť' : 'dokončiť' }} task, z mastertasku <b>{{ subtask?.master_task?.name || subtask.master_task }}</b>?</h1>
 				<v-icon
-					@click.stop="visible = false"
+					@click.stop="closeModal()"
 					icon="mdi-close"
 					size="large"
 				></v-icon>
@@ -18,7 +18,10 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
+	mixins: [ modalMixin ],
 	emits: ['close', 'on-subtask-edited'],
 
 	data() {
@@ -47,6 +50,10 @@ export default {
 			} catch (error) {
 				this.$toast.error(error)
 			}
+		},
+
+		closeModal() {
+			this.visible = false
 		}
 	}
 }
diff --git a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
index 4751947..78009d8 100644
--- a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
@@ -20,7 +20,10 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
+	mixins: [ modalMixin ],
 	emits: ['on-subtask-deleted'],
 
 	data() {
diff --git a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
index 0c45aa5..d7b8623 100644
--- a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
@@ -18,8 +18,10 @@
 import 			errorUtils 				from '@/plugins/lib@auth/_utils/error.utils'
 import 			useVuelidate 			from '@vuelidate/core'
 import { required, numeric, minValue } 	from '@vuelidate/validators'
+import modalMixin 						from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
+	mixins: [ modalMixin ],
 	emits: ['close', 'on-subtask-edited'],
 
 	data() {
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index 6a5bd83..bd1f1b3 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -66,7 +66,7 @@
 				<div class="d-flex justify-space-between align-center">
 					<div>
 						<p>{{ subtask._master_task.project_code }}</p>
-						<h1>{{  subtask._master_task.name }}</h1>
+						<h1>{{ subtask._master_task.name }}</h1>
 					</div>
 
 					<v-icon @click.stop="closeModal()" icon="mdi-close" size="large" class="pb-5"></v-icon>
@@ -120,10 +120,11 @@ import AutocompleteMixin from '@/plugins/tm@_mixins/autocomplete.mixin'
 
 import ZTaskReadonlyInfo from "./_components/z-task-readonly-info.vue"
 import { mapGetters } from "vuex"
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 export default {
 	emits: ["close", "refresh"],
-	mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin],
+	mixins: [VuetifyFixFocusMixin, SelectsMixin, AutocompleteMixin, modalMixin],
 
 	components: {
 		ZTaskReadonlyInfo,
@@ -209,6 +210,11 @@ export default {
 					this.subtask = this._enrichTask(data)
 				} else {
 					this.subtask = { master_task: mastertask, employees: [{}], _deadline_time: '17:00' }
+
+					if (subtask?.deadline && subtask._deadline_time) {
+						this.subtask.deadline = subtask.deadline
+						this.subtask._deadline_time = subtask._deadline_time
+					}
 				}
 
 				this.editMode = editMode || !this.subtask.id
@@ -250,13 +256,14 @@ export default {
 					this.$store.commit('tm/update_subtask', subtask)
 					this.$events.emit("on-subtask-edited", this.subtask)
 				} else {
-					const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask)
+					const { subtasks } = await this.$axios.post_auth(`v1/mastertasks/${this.subtask.master_task_id}/subtasks`, this.subtask, this.subtask.project_code)
 					this.subtask.id = subtasks[0].id
 
 					subtasks.forEach(subtask => {
 						this.$store.commit('tm/update_subtask', subtask)
 						this.$events.emit("on-subtask-edited", this.subtask)
 					})
+					this.$events.emit("task-created")
 				}
 
 				this.closeModal()
@@ -365,9 +372,14 @@ export default {
 			deep: true
 		},
 
-		'subtask.master_task_id'(value) {
+		'subtask.master_task_id'(value, newValue) {
 			if (!value) return
 			this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
+
+			// let selectedMasterTask = null
+
+			// if (newValue) selectedMasterTask = this.mastertasks.find((mastertask) => mastertask.id === newValue)
+			// if (selectedMasterTask) this.subtask.project_code = selectedMasterTask.project_code
 		},
 
 		editMode() {
diff --git a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
index 5d57453..452a33e 100644
--- a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
@@ -17,7 +17,10 @@
 </template>
 
 <script>
+import modalMixin from '@/plugins/tm@modal/_mixins/modal.mixin'
+
 export default {
+	mixins: [ modalMixin ],
 	emits: ['update'],
 
 	data() {
diff --git a/app/src/plugins/tm@modal/team/z-team-modal.vue b/app/src/plugins/tm@modal/team/z-team-modal.vue
index c6a7d52..f80a836 100644
--- a/app/src/plugins/tm@modal/team/z-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-team-modal.vue
@@ -37,17 +37,18 @@
 </template>
 
 <script>
-import useVuelidate from '@vuelidate/core'
-import { required } from '@vuelidate/validators'
-import errorUtils from '@/plugins/lib@auth/_utils/error.utils'
-import tmUtils from '@/plugins/tm@_utils/tm.utils'
-import { mapGetters } from 'vuex'
-import AutocompleteMixin from '@/plugins/tm@_mixins/autocomplete.mixin'
+import useVuelidate 		from '@vuelidate/core'
+import { required } 		from '@vuelidate/validators'
+import errorUtils			from '@/plugins/lib@auth/_utils/error.utils'
+import tmUtils 				from '@/plugins/tm@_utils/tm.utils'
+import { mapGetters } 		from 'vuex'
+import AutocompleteMixin 	from '@/plugins/tm@_mixins/autocomplete.mixin'
+import modalMixin 			from '@/plugins/tm@modal/_mixins/modal.mixin'
 
 const atLeastOne = (value) => value.length
 
 export default {
-	mixins: [AutocompleteMixin],
+	mixins: [AutocompleteMixin, modalMixin],
 	emits: ['close', 'update'],
 
 	data() {
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index 3c306d6..078ce4b 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -15,7 +15,7 @@
 				<td>{{ subtask.project_code }}</td>
 				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
 				<td>{{ subtask.duration }} h</td>
-				<td>{{ subtask.duration - subtask.spent_time }} h</td>
+				<td>{{ (subtask.duration - subtask.spent_time).toFixed(2) }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">
 						<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="editTask(subtask, false)">