diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index 19efa9f..c322478 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -5,16 +5,17 @@
 		</v-main>
 	</v-app>
 
-	<Z-team-modal 			ref="z-team-modal"  @update="onTeamUpdate" />
-	<Z-delete-team-modal 	ref="z-delete-team-modal" @update="onTeamUpdate" />
+	<Z-team-modal 				ref="z-team-modal"  @update="onTeamUpdate" />
+	<Z-delete-team-modal 		ref="z-delete-team-modal" @update="onTeamUpdate" />
 
-	<Z-task-modal 			ref="z-task-modal" />
-	<Z-delete-task-modal 	ref="z-delete-task-modal" @update="onTaskDeleted" />
-	<Z-complete-task-modal 	ref="z-complete-task-modal" />
-	<Z-task-add-time-modal 	ref="z-task-add-time-modal" />
-	<Z-blocker-modal 		ref="z-blocker-modal" />
+	<Z-task-modal 				ref="z-task-modal" />
+	<Z-delete-task-modal 		ref="z-delete-task-modal" @on-task-deleted="onTaskDeleted" />
+	<Z-delete-master-task-modal ref="z-delete-master-task-modal" />
+	<Z-complete-task-modal 		ref="z-complete-task-modal" />
+	<Z-task-add-time-modal 		ref="z-task-add-time-modal" />
+	<Z-blocker-modal 			ref="z-blocker-modal" />
 
-	<Z-master-task-modal 	ref="z-master-task-modal" />
+	<Z-master-task-modal 		ref="z-master-task-modal" />
 </template>
 
 <script>
@@ -25,7 +26,7 @@ import ZTaskModal 				from '@/plugins/tm@modal/task/z-task-modal.vue'
 import ZCompleteTaskModal 		from '@/plugins/tm@modal/task/z-complete-task-modal.vue'
 import ZTaskAddTimeModal 		from '@/plugins/tm@modal/task/z-task-add-time-modal.vue'
 import ZBlockerModal 			from '@/plugins/tm@modal/blocker/z-blocker-modal.vue'
-// import ZDeleteMasterTaskModal 	from '@/plugins/tm@modal/master-task/z-delete-task-modal.vue'
+import ZDeleteMasterTaskModal 	from '@/plugins/tm@modal/master-task/z-delete-master-task-modal.vue'
 import ZMasterTaskModal 		from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
 
 export default {
@@ -37,7 +38,8 @@ export default {
 		ZMasterTaskModal,
 		ZCompleteTaskModal,
 		ZTaskAddTimeModal,
-		ZBlockerModal
+		ZBlockerModal,
+		ZDeleteMasterTaskModal
 	},
 
 	mounted() {
@@ -53,6 +55,10 @@ export default {
 			this.$refs['z-delete-task-modal'].showModal(task)
 		})
 
+		this.$events.on('show-delete-master-task-modal', ({masterTask}) => {
+			this.$refs['z-delete-master-task-modal'].showModal(masterTask)
+		})
+
 		this.$events.on('show-task-modal', ({task, editMode}) => {
 			this.$refs['z-task-modal'].showModal(task, editMode)
 		})
@@ -77,11 +83,15 @@ export default {
 
 	methods: {
 		onTeamUpdate(team) {
-			this.$events.emit('on-team-deleted', team)
+			this.$events.emit('on-team-update', team)
 		},
 
 		onTaskDeleted(task) {
 			this.$events.emit('on-task-deleted', task)
+		},
+
+		onMasterTaskDeleted(masterTask){
+			this.$events.emit('on-master-task-deleted', masterTask)
 		}
 	}
 }
diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue
index 2b521d1..c19aa29 100644
--- a/app/src/plugins/app/_layout/app/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-header.vue
@@ -49,29 +49,14 @@
 				</v-menu>
 			</div>
 		</div>
-
-		<!-- <Z-master-task-modal 	ref="z-master-task-modal" />
-		<Z-sub-task-modal 		ref="z-sub-task-modal" />
-		<Z-blocker-modal 		ref="z-blocker-modal" />
-		<Z-team-modal 			ref="z-team-modal" /> -->
+		
 	</v-app-bar>
 </template>
 
 <script>
 import { mapGetters } 	from 'vuex'
-// import ZTeamModal 		from '@/plugins/tm@modal/team/z-team-modal.vue'
-// import ZBlockerModal 	from  '@/plugins/tm@modal/blocker/z-blocker-modal.vue'
-// import ZMasterTaskModal from '@/plugins/tm@modal/master-task/z-master-task-modal.vue'
-// import ZSubTaskModal	from '@/plugins/tm@modal/sub-task/z-sub-task-modal.vue'
 
 export default {
-	// components: {
-	// 	ZTeamModal,
-	// 	ZBlockerModal,
-	// 	ZMasterTaskModal,
-	// 	ZSubTaskModal
-	// },
-
 	data() {
 		return {
 			search: ''
diff --git a/app/src/plugins/app/_theme/_components/modals.sass b/app/src/plugins/app/_theme/_components/modals.sass
index d69980c..d198792 100644
--- a/app/src/plugins/app/_theme/_components/modals.sass
+++ b/app/src/plugins/app/_theme/_components/modals.sass
@@ -1,19 +1,16 @@
 .modal-header
 	flex: 0 0 auto
 
-	.trash-icon
-		padding: 10px
-		background: rgba(0, 0, 0, 0.04)
-		margin-left: 12px
-		border-radius: 50%
-		cursor: pointer
-
-	.pencil-icon
+	.icon
 		padding: 10px
 		background: rgba(0, 0, 0, 0.04)
 		border-radius: 50%
-		cursor: pointer
 
+		&:hover
+			cursor: pointer
+
+		&.trash
+			margin-left: 12px
 
 .modal-input
 	width: 100% !important
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
new file mode 100644
index 0000000..14fbffb
--- /dev/null
+++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
@@ -0,0 +1,54 @@
+<template>
+	<v-dialog v-model="visible" max-width="650">
+		<v-card>
+			<div class="d-flex justify-space-between align-center">
+				<h1>Ste si istý, že chcete zmazať <b>{{ masterTask.name }}</b>?</h1>
+
+				<v-icon
+					@click.stop="closeModal()"
+					icon="mdi-close"
+					size="large"
+					class="mb-15"
+				></v-icon>
+			</div>
+			<v-card-actions class="mt-10 d-flex justify-start align-center">
+				<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()">ÁNO</v-btn>
+				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
+			</v-card-actions>
+		</v-card>
+	</v-dialog>
+</template>
+
+<script>
+export default {
+	emits: ['on-master-task-deleted'],
+
+	data() {
+		return {
+			visible: false,
+			masterTask: null
+		}
+	},
+
+	methods: {
+		async showModal(masterTask) {
+			this.masterTask = masterTask
+			this.visible = true
+		},
+
+		closeModal() {
+			this.visible = false
+		},
+
+		async deleteMasterTask() {
+			try {
+				await this.$axios.delete(`v1/mastertasks/${this.masterTask.id}`)
+				this.$emit('on-master-task-deleted', this.masterTask)
+				this.closeModal()
+			} catch (error) {
+				this.$toast.error(error)
+			}
+		}
+	}
+}
+</script>
\ No newline at end of file
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 af6d06c..fb9bf27 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
@@ -133,8 +133,8 @@
 				<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
 					<h1>{{ masterTask.name }}</h1>
 					<div class="d-flex justify-start">
-						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
-						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="_delete()"/>
+						<img class="icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
+						<img class="icon trash" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" /> 
 					</div>
 				</div>
 
@@ -177,9 +177,9 @@
 								</v-sheet>
 							</v-col>
 						</v-row>
-						<v-row no-gutters class="align-center">
+						<v-row no-gutters>
 							<v-col cols="5">
-								<v-sheet class="pa-2 ma-2">
+								<v-sheet class="pa-2 ma-2 pt-0">
 									<div class="d-flex align-center">
 										<v-icon
 											icon="mdi-account-multiple-outline"
@@ -190,9 +190,9 @@
 								</v-sheet>
 							</v-col>
 							<v-col cols="7">
-								<v-sheet class="ma-2 d-flex scroll-employees">
-									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">{{ masterTask.team }}</p>
-									<div class="d-flex align-center flex-shrink-0 mx-3" v-for="(employee, index) in masterTask.employees" :key="employee.id">
+								<v-sheet class="d-flex flex-wrap flex-column">
+									<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">Tu bude vypisany nazov Timu</p>
+									<div class="d-flex align-center flex-shrink-0 mt-2 task-badge px-4 py-2 rounded-pill" v-for="(employee, index) in masterTask.employees" :key="employee.id">
 										<p class="employee-selected-avatar d-flex justify-center align-center">
 											{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
 										</p>
@@ -273,14 +273,14 @@
 						</div>
 						<v-table class="mt-7 mb-5">
 							<tbody class="px-5 py-5">
-								<!-- Kravarik: natiahnut toto z masterTask.tasks -->
-								<tr v-for="(employee, index) in masterTask.employees" :key="employee.id">
-									<td class="w-25">{{ masterTask.name }}</td>
+								<tr v-for="task in masterTask.subtasks" :key="task.id">
+									<td class="w-25">{{ task.master_task }}</td>
 									<td class="d-flex align-center">
 										<p class="employee-selected-avatar d-flex justify-center align-center">
-											{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
+											<!-- {{ task.name.charAt(0) + employee.surname.charAt(0) }} -->IN 
 										</p>
-										<p class="ml-2" v-html="`${masterTask.employees[index].name} ${masterTask.employees[index].surname}`" />
+										<!-- <p class="ml-2" v-html="`${masterTask.task[index].name} ${masterTask.task[index].surname}`" /> -->
+										<p>Meno zamestnanca</p>
 									</td>
 									<td class="task-action">
 										<div class="d-flex justify-start">
@@ -293,7 +293,7 @@
 							</tbody>
 						</v-table>
 						<div class="d-flex align-center ">
-							<v-btn class="subtask-btn w-100"><v-icon class="mx-1" icon="mdi-plus" />Pridať Subtask</v-btn>
+							<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať Subtask</v-btn>
 						</div>
 					</div>
 				</v-card-actions>
@@ -358,6 +358,12 @@ export default {
 		}
 	},
 
+	mounted() {
+		this.$events.on('on-master-task-deleted', (masterTask) => {
+			if (masterTask?.id == this.masterTask?.id) this.closeModal()
+		})
+	},
+
 	methods: {
 		itemSelected(x) {
 			console.log(x)
@@ -385,7 +391,6 @@ export default {
 			} catch (error) {
 				this.$toast.error(error)
 			}
-			console.log(this.masterTask)
 		},
 
 		async save() {
@@ -410,15 +415,8 @@ export default {
 			this.$emit('close', this.masterTask)
 		},
 
-		async _delete() {
-			// Kravarik: Tu sa ma volat delete-master-task-modal, ak taka funkcionalita vlastne je
-
-			// try {
-			// 	await this.$axios.delete(`v1/master-tasks/${this.masterTask.id}`)
-			// 	this.closeModal()
-			// } catch (error) {
-			// 	this.$toast.error(error)
-			// }
+		openDeleteMasterTaskModal(masterTask) {
+			this.$events.emit('show-delete-master-task-modal', { masterTask })
 		},
 
 		employeeSelected(selectedOption) {
@@ -429,7 +427,11 @@ export default {
 
 		filesUploaded(files) {
 			this.masterTask.files = files
-		}
+		},
+
+		addTask() {
+			this.$events.emit('show-task-modal', {})
+		},
 	},
 
 	computed: {
@@ -502,9 +504,6 @@ export default {
 .scrolling
 	overflow: hidden !important
 
-.scroll-employees
-	overflow-x: scroll
-
 .border-bottom
 	border-bottom: 1px solid rgba(0,0,0,.1)
 
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 56c1962..5ca82b4 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
@@ -8,6 +8,7 @@
 					@click.stop="closeModal()"
 					icon="mdi-close"
 					size="large"
+					class="mb-15"
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center">
@@ -20,7 +21,7 @@
 
 <script>
 export default {
-	emits: ['deleted'],
+	emits: ['on-task-deleted'],
 
 	data() {
 		return {
@@ -42,7 +43,7 @@ export default {
 		async deleteTask() {
 			try {
 				await this.$axios.delete(`v1/tasks/${this.task.id}`)
-				this.$emit('deleted', this.task)
+				this.$emit('on-task-deleted', this.task)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
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 6f6eaf0..04cea04 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -103,13 +103,13 @@
 					<h1>{{ task.title }}</h1>
 					<div class="d-flex justify-start">
 						<img
-							class="pencil-icon"
+							class="icon"
 							:src="require('@/plugins/tm@overview/_img/pencil-icon.svg')"
 							alt="pencil-icon"
 							@click.stop="editMode = !editMode"
 						/>
 						<img
-							class="trash-icon"
+							class="icon trash"
 							:src="require('@/plugins/tm@overview/_img/trash-icon.svg')"
 							alt="trash-icon"
 							@click.stop="openDeleteTaskModal(task)"
@@ -232,7 +232,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p>{{ task.duration / 3600 }} h</p>
+									<p>{{ (task.duration / 3600000).toFixed(2) }} h</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -275,7 +275,7 @@
 							<v-col cols="7">
 								<v-sheet class="ma-2">
 									<p>
-										{{ (task.duration - task.spent_time) / 3600 }} h
+										{{ ((task.duration / 3600000) - (task.spent_time)).toFixed(2) }} h
 									</p>
 								</v-sheet>
 							</v-col>
@@ -396,9 +396,10 @@ export default {
 				if (task?.id) {
 					const t = await this.$axios.get_auth_data(`v1/tasks/${task.id}`)
 
-					this.employeeIdSelect 	= t.employee.id
+					this.employeeIdSelect 		= t.employee.id
 					this.masterTaskIdSelect 	= t.master_task.id
 					this.task 					= t
+					this.task.spent_time = ((t.spent_time) / 3600000).toFixed(2)
 				} else {
 					this.task = {master_task: {}}
 				}
diff --git a/app/src/plugins/tm@overview/teams/teams.vue b/app/src/plugins/tm@overview/teams/teams.vue
index 692ae86..85f3f4e 100644
--- a/app/src/plugins/tm@overview/teams/teams.vue
+++ b/app/src/plugins/tm@overview/teams/teams.vue
@@ -23,7 +23,7 @@ export default {
 	},
 
 	mounted() {
-		this.$events.on('on-team-deleted', () => this._loadData())
+		this.$events.on('on-team-update', () => this._loadData())
 	},
 
 	methods: {