diff --git a/app/src/plugins/lib@search/search/_components/a-search-result-mastertasks.vue b/app/src/plugins/lib@search/search/_components/a-search-result-mastertasks.vue
index 50b0c53..8ed4543 100644
--- a/app/src/plugins/lib@search/search/_components/a-search-result-mastertasks.vue
+++ b/app/src/plugins/lib@search/search/_components/a-search-result-mastertasks.vue
@@ -7,8 +7,9 @@
 					<td>{{ mastertask.name }}</td>
 					<td class="task-action">
 						<div class="d-flex justify-start">
-							<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="openEditMasterTaskModal(mastertask)">
-							<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(mastertask)">
+							<img class="pencil-icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="openEditMasterTaskModal(mastertask, true)">
+							<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="eye-icon" @click.stop="openEditMasterTaskModal(mastertask, false)">
+							<img class="trash-icon  ml-2" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(mastertask)">
 						</div>
 					</td>
 				</tr>
@@ -36,8 +37,8 @@ export default {
 			this.$events.emit('show-delete-master-task-modal', { mastertask })
 		},
 
-		openEditMasterTaskModal(mastertask) {
-			this.$events.emit('show-mastertask-modal', { mastertask, editMode: false })
+		openEditMasterTaskModal(mastertask, editMode) {
+			this.$events.emit('show-mastertask-modal', { mastertask, editMode })
 		},
 	}
 }
diff --git a/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue b/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
index 57babad..a6de3cf 100644
--- a/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
+++ b/app/src/plugins/lib@search/search/_components/a-search-result-subtasks.vue
@@ -15,8 +15,9 @@
 						<div class="d-flex justify-start">
 							<img v-if="subtask.is_finished" class="pencil-icon is-finished" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)">
 							<img v-if="!subtask.is_finished" class="pencil-icon" :src="require('@/plugins/app/_img/icons/checkmark.svg')" alt="checkmark-icon" @click.stop="clickCompleteTask(subtask)">
-							<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="pencil-icon" @click.stop="openTaskModal(subtask)">
-							<img class="trash-icon" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(subtask)">
+							<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="openTaskModal(subtask, true)">
+							<img class="pencil-icon ml-2" :src="require('@/plugins/app/_img/icons/eye.svg')" alt="eye-icon" @click.stop="openTaskModal(subtask, false)">
+							<img class="trash-icon  ml-2" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteTaskModal(subtask)">
 						</div>
 					</td>
 				</tr>
@@ -61,8 +62,8 @@ export default {
 			this.$events.emit('show-delete-task-modal', { subtask })
 		},
 
-		openTaskModal(subtask) {
-			this.$events.emit('show-subtask-modal', { subtask, editMode: false })
+		openTaskModal(subtask, editMode) {
+			this.$events.emit('show-subtask-modal', { subtask, editMode })
 		},
 
 		async clickCompleteTask(subtask) {
diff --git a/app/src/plugins/lib@search/search/search.vue b/app/src/plugins/lib@search/search/search.vue
index e4615bd..b079f1f 100644
--- a/app/src/plugins/lib@search/search/search.vue
+++ b/app/src/plugins/lib@search/search/search.vue
@@ -1,9 +1,14 @@
 <template>
-	<form>
-		<A-search-result-mastertasks v-if="searchResults?.mastertasks" :mastertasks="searchResults.mastertasks"/>
-		<A-search-result-subtasks v-if="searchResults?.subtasks" :subtasks="searchResults.subtasks" />
-		<A-search-result-team v-if="searchResults?.teams" :teams="searchResults.teams" />
-	</form>
+	<div>
+		<p v-if="!this.searchResults" class="px-3 py-3">{{ this.search?.length ? $t('Searching...') : $t('Type something') }}</p>
+		<p v-else-if="this.searchResults.error" class="px-3">{{ this.searchResults.error }}</p>
+
+		<div v-else>
+			<A-search-result-mastertasks :mastertasks="searchResults.mastertasks"/>
+			<A-search-result-subtasks :subtasks="searchResults.subtasks" />
+			<A-search-result-team :teams="searchResults.teams" />
+		</div>
+	</div>
 </template>
 
 <script>
@@ -21,33 +26,52 @@ export default {
 
 	data() {
 		return {
-			searchResults: {},
+			searchResults: null,
 			search: ''
 		}
 	},
 
 	created() {
 		this.$events.on('onSearch', (search) => {
+			if (!search?.length)
+				return
+				
 			this.search = search
+			this.onSearch(search)
 		})
 	},
 
-	watch: {
-		search(newVal) {
-			this.updateSearchResults(newVal)
-		}
+	mounted() {
+		this.$events.on('on-subtask-edited', () => {
+			this.onSearch(this.search, false)
+		})
+
+		this.$events.on('on-subtask-deleted', () => {
+			this.onSearch(this.search, false)
+		})
+
+		this.$events.on('on-mastertask-edited', () => {
+			this.onSearch(this.search, false)
+		})
+
+		this.$events.on('on-mastertask-deleted', () => {
+			this.onSearch(this.search, false)
+		})
 	},
 	
 	methods: {
-		updateSearchResults: debounce(async function (search) {
+		onSearch: debounce(async function (search, reset = true) {
 			try {
+				if (reset)
+					this.searchResults = null
+
 				const { mastertasks, subtasks, teams} = await this.$axios.get_auth(`v1/search?q=${search}`)
 				this.searchResults = {mastertasks: mastertasks.data, subtasks: subtasks.data, teams: teams.data}
-				console.log(this.searchResults)
 			} catch (error) {
 				this.$toast.error(error)
+				this.searchResults = {error}
 			}
-		}, 500)
+		}, 300)
 	}
 }
 </script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts b/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
index db74782..c38c0f2 100644
--- a/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
+++ b/app/src/plugins/tm@dashboard/tasks/_utils/timeline.utils.ts
@@ -117,6 +117,8 @@ export default {
 			})
 		}
 
+		console.log(events)
+
 		return events
 	},
 
diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue
index 93ec8e9..ff0f10e 100644
--- a/app/src/plugins/tm@dashboard/tasks/tasks.vue
+++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue
@@ -121,7 +121,7 @@ export default {
 
 			try {
 				const { subtasks, blockers } 	= await this.$axios.get_auth(`v1/subtasks?${queryParameters}`)
-				this.config.scrollHour 			= this.filter?.employee.work_start - 1
+				this.config.scrollHour 			= (this.filter?.employee.work_start / 60) - 1
 				this.config.date 				= this.filter.start
 				this.subtasks					= [...subtasks, ...blockers.map(blocker => ({...blocker, type: 'blocker'}))]
 			} catch (error) {
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 f63d6d6..0734b1b 100644
--- a/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
+++ b/app/src/plugins/tm@dashboard/teams/_mixins/TeamsCalendar.mixin.ts
@@ -43,14 +43,14 @@ export default {
 		_generateNonWorking() {
 			const nonWorkingHours 	 = []
 			const date 				 = new Date(this.filter.start)
-			let earliestStartHour 	 = null
+			let earliestStartMinutes = null
 			this.calendarConfig.date = date
 
 			const { start: dayStart, end: dayEnd } = this._getDayStartEnd()
 
 			this.filter.team.employees.forEach((employee, index) => {
-				if (!earliestStartHour || employee.work_start < earliestStartHour)
-					earliestStartHour = employee.work_start
+				if (!earliestStartMinutes || (employee.work_start) < earliestStartMinutes)
+					earliestStartMinutes = employee.work_start
 
 
 				nonWorkingHours.push({
@@ -72,7 +72,7 @@ export default {
 				})
 			})
 
-			this.calendarConfig.scrollHour = earliestStartHour - 1
+			this.calendarConfig.scrollHour = (earliestStartMinutes) - 1
 			return nonWorkingHours
 		},