diff --git a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
index 6a91a75..4e2eab5 100644
--- a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
+++ b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
@@ -2,7 +2,6 @@ import { setHours, setMinutes } from 'date-fns'
 import moment 					from 'moment'
 import timelineUtils 			from '@/plugins/tm@dashboard/tasks/_utils/timeline.utils'
 
-
 export default {
 	computed: {
 		calendarData() {
diff --git a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
index 3b05b2c..187e9ef 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-tasks-table.vue
@@ -3,12 +3,12 @@
 		<tbody class="px-5 py-5">
 			<tr v-for="subtask in enrichedtasks" :key="subtask.id">
 				<td v-if="subtask?.title" class="w-25">{{ subtask.title }}</td>
-				<td v-else>{{ subtask?.master_task }}</td>
+				<td class="w-50" v-else>{{ subtask?.master_task }}</td>
 				<td class="d-flex align-center">
 					<p class="employee-selected-avatar d-flex justify-center align-center">
 						{{ subtask._employeeInitials }}
 					</p>
-					<p class="ml-2">{{ subtask._employeeFullName }}</p>
+					<p class="ml-2 line-clamp">{{ subtask._employeeFullName }}</p>
 				</td>
 				<td>
 					<p class="text-light-green" v-if="subtask.is_finished">Ukončený</p>
@@ -78,4 +78,11 @@ v-table, tbody
 
 td:not(:last-child)
 	border-right: thin solid rgba(var(--v-border-color), var(--v-border-opacity))
+
+.line-clamp
+	display: -webkit-box
+	-webkit-line-clamp: 2
+	-webkit-box-orient: vertical
+	overflow: hidden
+	text-overflow: ellipsis
 </style>
\ 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 4f20654..3356f41 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
@@ -25,7 +25,7 @@
 
 					<v-select v-model="mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{error: v$.mastertask.employees.$errors.length}" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name"></v-select>
 
-					<template v-if="mastertask.id">
+					<template v-if="!mastertask.id">
 						<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" class="modal-input" :class="{error: employee.invalid}" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
 							<p class="employee-select-avatar d-flex justify-center align-center">
 								{{ employee?.name.charAt(0) + employee?.surname.charAt(0) }}