diff --git a/app/src/plugins/app/_theme/_components/buttons.sass b/app/src/plugins/app/_theme/_components/buttons.sass
new file mode 100644
index 0000000..520b72a
--- /dev/null
+++ b/app/src/plugins/app/_theme/_components/buttons.sass
@@ -0,0 +1,22 @@
+.button.primary
+	background: #7f39fb !important
+	border-radius: 4px !important
+	color: #fff !important
+	height: 50px
+	width: 100%
+	flex: 0 0 auto
+
+.button.secondary
+	color: #6200EE
+	border: 1px solid #E0E0E0
+	border-radius: 4px
+	height: 50px
+	width: 203px
+
+.button.cancel
+	border: thin solid rgba(var(--v-border-color), var(--v-border-opacity)) !important
+	color: #7f39fb !important
+
+.btn-size
+	height: 35px !important
+	width: 30px !important
\ 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 d8b85f2..129e241 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
@@ -233,7 +233,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p :class="masterTask.worked_time > masterTask.duration ? 'text-red-darken-4': 'text-black'">{{ (masterTask.worked_time).toFixed(2) }} h</p>
+									<p :class="masterTask.time_worked > masterTask.duration ? 'text-red-darken-4': 'text-black'">{{ (masterTask.time_worked).toFixed(2) }} h</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -251,7 +251,7 @@
 							</v-col>
 							<v-col cols="7">
 								<v-sheet class="ma-2">
-									<p :class="masterTask.worked_time > masterTask.duration ? 'text-red-darken-4': 'text-black'">{{ (masterTask.duration - masterTask.worked_time).toFixed(2) }} h</p>
+									<p :class="masterTask.time_worked > masterTask.duration ? 'text-red-darken-4': 'text-black'">{{ (masterTask.duration - masterTask.time_worked).toFixed(2) }} h</p>
 								</v-sheet>
 							</v-col>
 						</v-row>
@@ -371,7 +371,18 @@ export default {
 
 			try {
 				this.teams 		= await this.$axios.get_auth_data('v1/teams')
-				this.employees 	= await this.$axios.get_auth_data('v1/employees')
+				const employees = await this.$axios.get_auth_data('v1/employees')
+				this.employees 	= tmUtils.enrichEmployeesByFullName(employees)
+
+				if (masterTask?.id) {
+					this.masterTask = await this.$axios.get_auth_data(`v1/mastertasks/${masterTask.id}`)
+					console.log(this.masterTask)
+					this.teamSelect = this.masterTask.team.id
+				} else {
+					this.masterTask = {team: {}, employees: []}
+				}
+
+				this.editMode = (editMode || !this.masterTask.id)
 			} catch (error) {
 				this.$toast.error(error)
 			}
@@ -404,7 +415,11 @@ export default {
 
 			try {
 				if (this.masterTask.id)
+<<<<<<< requests
 					await this._update()
+=======
+					await this.$axios.patch_auth(`v1/mastertasks/${this.masterTask.id}`, this.masterTask)
+>>>>>>> local
 
 				else
 					await this._create()
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 98608b1..b1d4280 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -435,8 +435,7 @@ export default {
 					this.close()
 				} else await this._create()
 
-				this.close()
-				this.$router.push({ name: 'Dashboard - Tasks' })
+				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
 			}
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 a14eab9..709cd44 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
@@ -44,4 +44,4 @@ export default {
 		}
 	}
 }
-</script>
+</script>
\ No newline at end of file