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 6dd5623..e16726c 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
@@ -1,5 +1,5 @@
 <template>
-	<v-row no-gutters class="align-center border-bottom">
+	<v-row no-gutters class="align-center">
 		<v-col cols="5">
 			<v-sheet class="py-3">
 				<div class="d-flex align-center">
diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
index bafaded..a996220 100644
--- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
@@ -1,52 +1,131 @@
 <template>
-	<A-mastertask-name :id="subtask.master_task_id" :name="subtask._master_task.name" :color="subtask._master_task.color" @close-modal="$emit('close-modal')" />
-	<A-mastertask-status :is-finished="subtask.is_finished" />
-	<A-task-deadline :subtask="subtask" />
-	<A-task-timeblocks :timeblocks="subtask.timeblocks" :subtask="subtask" @update-subtask="$emit('update-subtask', $event)" />
-	<Z-created-by :employee-id="subtask.created_by" />
-	<A-task-assigned-employee :employee="subtask._employee" />
-	<A-task-planned-time :hours="subtask.duration" />
-	<A-task-remaining-time :hours="subtask.duration - subtask.spent_time" />
-	<A-task-spent-time :hours="subtask.spent_time" :subtask="subtask" />
-	<A-task-description :description="subtask.description" :mastertask-description="subtask.master_task_description" />
-	<Z-files :files="subtask.files" />
+  <A-mastertask-name
+    :id="subtask.master_task_id"
+    :name="subtask._master_task.name"
+    :color="subtask._master_task.color"
+    @close-modal="$emit('close-modal')"
+  />
+  <A-mastertask-status :is-finished="subtask.is_finished" />
+  <A-task-deadline :subtask="subtask" />
+  <Z-created-by :employee-id="subtask.created_by" />
+
+  <!-- Loop through normalized employees -->
+  <div
+    v-for="(employeeData, index) in normalizedEmployees"
+    :key="`employee-${employeeData.id || index}`"
+    :class="{
+      'employee-section': hasMultipleEmployees,
+      'border-top': hasMultipleEmployees,
+      'border-bottom':
+        hasMultipleEmployees && index === normalizedEmployees.length - 1,
+    }"
+  >
+    <A-task-assigned-employee :employee="employeeData._employee" />
+    <A-task-planned-time :hours="employeeData.duration" />
+    <A-task-timeblocks
+      :timeblocks="employeeData.timeblocks"
+      :subtask="{
+        ...subtask,
+        employee_id: employeeData.id,
+        timeblocks: employeeData.timeblocks,
+      }"
+      @update-subtask="$emit('update-subtask', $event)"
+    />
+  </div>
+
+  <!-- Remaining/spent time only for single employee (not in multi-employee drafts) -->
+  <template v-if="!hasMultipleEmployees">
+    <A-task-remaining-time :hours="subtask.duration - subtask.spent_time" />
+    <A-task-spent-time :hours="subtask.spent_time" :subtask="subtask" />
+  </template>
+
+  <A-task-description
+    :description="subtask.description"
+    :mastertask-description="subtask.master_task_description"
+  />
+  <Z-files :files="subtask.files" />
 </template>
 
 <script>
-import AMastertaskName from './_components/a-mastertask-name.vue'
-import AMastertaskStatus from './_components/a-mastertask-status.vue'
-import ATaskTimeblocks from './_components/a-task-timeblocks.vue'
-import ZCreatedBy from '../../_components/read-only/z-created-by.vue'
-import ATaskAssignedEmployee from './_components/a-task-assigned-employee.vue'
-import ATaskPlannedTime from './_components/a-task-planned-time.vue'
-import ATaskSpentTime from './_components/a-task-spent-time.vue'
-import ATaskRemainingTime from './_components/a-task-remaining-time.vue'
-import ATaskDeadline from './_components/a-task-deadline.vue'
-import ATaskDescription from './_components/a-task-description.vue'
-import ZFiles from '@/plugins/tm@modal/_components/read-only/z-files.vue'
+import AMastertaskName from './_components/a-mastertask-name.vue';
+import AMastertaskStatus from './_components/a-mastertask-status.vue';
+import ATaskTimeblocks from './_components/a-task-timeblocks.vue';
+import ZCreatedBy from '../../_components/read-only/z-created-by.vue';
+import ATaskAssignedEmployee from './_components/a-task-assigned-employee.vue';
+import ATaskPlannedTime from './_components/a-task-planned-time.vue';
+import ATaskSpentTime from './_components/a-task-spent-time.vue';
+import ATaskRemainingTime from './_components/a-task-remaining-time.vue';
+import ATaskDeadline from './_components/a-task-deadline.vue';
+import ATaskDescription from './_components/a-task-description.vue';
+import ZFiles from '@/plugins/tm@modal/_components/read-only/z-files.vue';
+import { mapGetters } from 'vuex';
 
 export default {
+  components: {
+    ZFiles,
+    AMastertaskName,
+    AMastertaskStatus,
+    ATaskTimeblocks,
+    ZCreatedBy,
+    ATaskAssignedEmployee,
+    ATaskPlannedTime,
+    ATaskSpentTime,
+    ATaskRemainingTime,
+    ATaskDescription,
+    ATaskDeadline,
+  },
 
-	components: {
-		ZFiles,
-		AMastertaskName,
-		AMastertaskStatus,
-		ATaskTimeblocks,
-		ZCreatedBy,
-		ATaskAssignedEmployee,
-		ATaskPlannedTime,
-		ATaskSpentTime,
-		ATaskRemainingTime,
-		ATaskDescription,
-		ATaskDeadline
-	},
+  props: {
+    subtask: {
+      type: Object,
+      required: true,
+    },
+  },
+  emits: ['close-modal', 'update-subtask'],
 
-	props: {
-		subtask: {
-			type: Object,
-			required: true
-		}
-	},
-	emits: ['close-modal', 'update-subtask']
-}
+  computed: {
+    ...mapGetters('tm', ['enrichedEmployees']),
+
+    normalizedEmployees() {
+      // Draft with multiple employees
+      if (this.subtask.is_draft && Array.isArray(this.subtask.employees)) {
+        return this.subtask.employees
+          .filter((emp) => emp.id) // Filter out empty employee slots
+          .map((emp) => ({
+            id: emp.id,
+            duration: emp.duration || 0,
+            timeblocks: emp.timeblocks || [],
+            _employee: this.enrichedEmployees.find((e) => e.id == emp.id) || {},
+          }));
+      }
+
+      // Single employee (published subtask)
+      return [
+        {
+          id: this.subtask.employee_id,
+          duration: this.subtask.duration,
+          timeblocks: this.subtask.timeblocks || [],
+          _employee: this.subtask._employee,
+        },
+      ];
+    },
+
+    hasMultipleEmployees() {
+      return this.normalizedEmployees.length > 1;
+    },
+  },
+};
 </script>
+
+<style lang="sass" scoped>
+.employee-section
+	margin: 16px 0
+
+.border-top
+	border-top: 1px solid rgba(0, 0, 0, 0.12)
+	padding-top: 16px
+
+.border-bottom
+	border-bottom: 1px solid rgba(0, 0, 0, 0.12)
+	padding-bottom: 16px
+</style>
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 a409585..4480cfa 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -579,6 +579,11 @@ export default {
       return employee ? `${employee.name} ${employee.surname}` : '';
     },
 
+    // Helper: Get enriched employee data by ID
+    getEnrichedEmployee(employeeId) {
+      return this.enrichedEmployees.find((emp) => emp.id === employeeId) || {};
+    },
+
     // Helper: Get valid employees (with id and duration) in create mode
     getValidEmployees() {
       if (!this.subtask?.employees) return [];