diff --git a/Backend/models/workDay.go b/Backend/models/workDay.go
index cde6dd3..6624296 100644
--- a/Backend/models/workDay.go
+++ b/Backend/models/workDay.go
@@ -84,6 +84,7 @@ func (d *WorkDay) TimeWorkVirtual(u User) time.Duration {
 	if d.IsKurzArbeit() {
 		return u.ArbeitszeitProTag()
 	}
+
 	return d.workTime
 }
 
diff --git a/Backend/models/workWeek.go b/Backend/models/workWeek.go
index 7144b8e..634d6fb 100644
--- a/Backend/models/workWeek.go
+++ b/Backend/models/workWeek.go
@@ -45,11 +45,15 @@ func NewWorkWeek(user User, tsMonday time.Time, populate bool) WorkWeek {
 }
 
 func (w *WorkWeek) PopulateWithDays(worktime time.Duration, overtime time.Duration) {
+	log.Println("Got Days with overtime and worktime", worktime, overtime)
 	w.Days = GetDays(w.User, w.WeekStart, w.WeekStart.Add(6*24*time.Hour), false)
+	log.Println(w.Worktime)
 
 	for _, day := range w.Days {
+		log.Println(day.TimeWorkVirtual(w.User))
 		w.Worktime += day.TimeWorkVirtual(w.User)
 	}
+	log.Println("Calculated new worktime", w.Worktime)
 	w.Overtime = w.Worktime - w.User.ArbeitszeitProWoche()
 
 	w.Worktime = w.Worktime.Round(time.Minute)
@@ -127,12 +131,13 @@ func (w *WorkWeek) GetSendWeeks(user User) []WorkWeek {
 	defer rows.Close()
 	for rows.Next() {
 		var week WorkWeek = WorkWeek{User: user}
-		if err := rows.Scan(&week.Id, &week.WeekStart, &week.Worktime, &week.Overtime); err != nil {
+		var workTime, overTime time.Duration
+		if err := rows.Scan(&week.Id, &week.WeekStart, &workTime, &overTime); err != nil {
 			log.Println("Error scanning row!", err)
 			return weeks
 		}
 
-		week.PopulateWithDays(week.Worktime, week.Overtime)
+		week.PopulateWithDays(workTime, overTime)
 		weeks = append(weeks, week)
 	}
 	if err = rows.Err(); err != nil {
diff --git a/Backend/templates/pages.templ b/Backend/templates/pages.templ
index 7d9c6a7..b2a3475 100644
--- a/Backend/templates/pages.templ
+++ b/Backend/templates/pages.templ
@@ -93,61 +93,6 @@ templ TeamPage(weeks []models.WorkWeek, userWeek models.WorkWeek) {
 			</div>
 		</div>
 		@workWeekComponent(userWeek, false)
-		// <div class="grid-sub lg:divide-x-1 max-md:divide-y-1 responsive @container">
-		// 	<div class="grid-cell col-span-full bg-neutral-300 lg:border-0">
-		// 		<h2 class="text-2xl uppercase font-bold">Eigene Abrechnung</h2>
-		// 	</div>
-		// 	<div class="grid-cell flex flex-col max-md:border-b-1 max-md:bg-neutral-300 gap-2 ">
-		// 		<div class="lg:hidden">
-		// 			@weekPicker(userWeek.WeekStart)
-		// 		</div>
-		// 		<h2 class="uppercase font-bold">{ fmt.Sprintf("%s %s", userWeek.User.Vorname, userWeek.User.Name) }</h2>
-		// 		<div class="grid grid-cols-5 gap-2 lg:grid-cols-1">
-		// 			<div class="col-span-2">
-		// 				<span class="flex flex-row gap-2 items-center">
-		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusSent)
-		// 					Gesendet
-		// 				</span>
-		// 				<span class="flex flex-row gap-2 items-center">
-		// 					@statusCheckMark(userWeek.CheckStatus(), models.WeekStatusAccepted)
-		// 					Akzeptiert
-		// 				</span>
-		// 			</div>
-		// 			<div class="flex flex-row gap-2 col-span-3">
-		// 				@timeGaugeComponent(int8(progress), false)
-		// 				<div>
-		// 					<p>Arbeitszeit: { fmt.Sprintf("%s", helper.FormatDuration(userWeek.Worktime)) }</p>
-		// 					<p>Überstunden: { fmt.Sprintf("%s", helper.FormatDurationFill(userWeek.Overtime, true)) }</p>
-		// 				</div>
-		// 			</div>
-		// 		</div>
-		// 	</div>
-		// 	<div class="grid-cell col-span-3 flex flex-col @7xl:grid @7xl:grid-cols-5 gap-2 py-4 content-baseline">
-		// 		for _, day := range userWeek.Days {
-		// 			@defaultWeekDayComponent(userWeek.User, day)
-		// 		}
-		// 	</div>
-		// 	<div class="grid-cell flex flex-col gap-2 justify-between">
-		// 		<div class="max-md:hidden">
-		// 			@weekPicker(userWeek.WeekStart)
-		// 		</div>
-		// 		<form method="post" class="flex flex-col gap-2">
-		// 			<input type="hidden" name="method" value="send"/>
-		// 			<input type="hidden" name="user" value={ strconv.Itoa(userWeek.User.PersonalNummer) }/>
-		// 			<input type="hidden" name="week" value={ userWeek.WeekStart.Format(time.DateOnly) }/>
-		// 			switch userWeek.CheckStatus() {
-		// 				case models.WeekStatusNone:
-		// 					<p class="text-sm">an Vorgesetzten senden</p>
-		// 				case models.WeekStatusSent:
-		// 					<p class="text-sm">an Vorgesetzten gesendet</p>
-		// 				case models.WeekStatusAccepted:
-		// 					<p class="text-sm">vom Vorgesetzten bestätigt</p>
-		// 			}
-		// 			<button disabled?={ userWeek.Status < models.WeekStatusSent } type="submit" class="btn">Korrigieren</button>
-		// 			<button disabled?={ time.Since(userWeek.WeekStart) < 24*7*time.Hour || userWeek.Status >= models.WeekStatusSent || userWeek.RequiresAction() } type="submit" class="btn">Senden</button>
-		// 		</form>
-		// 	</div>
-		// </div>
 		if len(weeks) > 0 {
 			<div class="grid-cell col-span-full bg-neutral-300">
 				<h2 class="text-2xl uppercase font-bold">Abrechnung Mitarbeiter</h2>
diff --git a/Backend/templates/pages_templ.go b/Backend/templates/pages_templ.go
index 14fae96..ad17982 100644
--- a/Backend/templates/pages_templ.go
+++ b/Backend/templates/pages_templ.go
@@ -337,7 +337,7 @@ func TeamPresencePage(teamPresence map[models.User]bool) templ.Component {
 			var templ_7745c5c3_Var11 string
 			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(user.Vorname)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 173, Col: 22}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 22}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 			if templ_7745c5c3_Err != nil {
@@ -350,7 +350,7 @@ func TeamPresencePage(teamPresence map[models.User]bool) templ.Component {
 			var templ_7745c5c3_Var12 string
 			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(user.Name)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 173, Col: 36}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/pages.templ`, Line: 118, Col: 36}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 			if templ_7745c5c3_Err != nil {
diff --git a/Backend/templates/timePage.templ b/Backend/templates/timePage.templ
index 1c68483..7df0b29 100644
--- a/Backend/templates/timePage.templ
+++ b/Backend/templates/timePage.templ
@@ -103,7 +103,7 @@ templ defaultDayComponent(day models.IWorkDay) {
 				if day.IsWorkDay() {
 					{{
 						workDay, _ := day.(*models.WorkDay)
-						work, pause, overtime := workDay.GetAllWorkTimesVirtual(user)
+						work, pause, overtime := workDay.GetAllWorkTimesReal(user)
 					}}
 					if day.RequiresAction() {
 						<p class="text-red-600">Bitte anpassen</p>
diff --git a/Backend/templates/timePage_templ.go b/Backend/templates/timePage_templ.go
index 272389b..dd29246 100644
--- a/Backend/templates/timePage_templ.go
+++ b/Backend/templates/timePage_templ.go
@@ -297,7 +297,7 @@ func defaultDayComponent(day models.IWorkDay) templ.Component {
 		if day.IsWorkDay() {
 
 			workDay, _ := day.(*models.WorkDay)
-			work, pause, overtime := workDay.GetAllWorkTimesVirtual(user)
+			work, pause, overtime := workDay.GetAllWorkTimesReal(user)
 			if day.RequiresAction() {
 				templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"text-red-600\">Bitte anpassen</p>")
 				if templ_7745c5c3_Err != nil {