diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt
index 4540faa..649caf6 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/TimerEditScreen.kt
@@ -1,6 +1,7 @@
 package be.ugent.sel.studeez.screens.timer_edit
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.tooling.preview.Preview
 import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
@@ -9,7 +10,7 @@ import be.ugent.sel.studeez.ui.theme.StudeezTheme
 
 data class TimerEditActions(
     val getTimerInfo: () -> TimerInfo,
-    val saveTimer: (TimerInfo) -> Unit
+    val saveTimer: (TimerInfo, () -> Unit) -> Unit
 )
 
 fun getTimerEditActions(
@@ -28,36 +29,18 @@ fun TimerEditRoute(
     popUp: () -> Unit,
     viewModel: TimerEditViewModel,
 ) {
-    TimerEditScreen(
-        timerEditActions = getTimerEditActions(viewModel, open),
-        popUp = popUp
-    )
-}
 
-@Composable
-fun TimerEditScreen(
-    timerEditActions: TimerEditActions,
-    popUp: () -> Unit
-) {
-    SecondaryScreenTemplate(title = "Edit Timer", popUp = { /*TODO*/ }) {
+    val timerEditActions = getTimerEditActions(viewModel, open)
+
+    SecondaryScreenTemplate(title = "Edit Timer", popUp = popUp) {
+
         val timerEditScreen = timerEditActions.getTimerInfo().accept(GetTimerEditScreen())
-        timerEditScreen { timerInfo -> timerEditActions.saveTimer(timerInfo) }
+        timerEditScreen { timerInfo ->
+            timerEditActions.saveTimer(timerInfo, popUp)
+        }
     }
 }
 
-//@Preview
-//@Composable
-//fun TimerEditScreenPreview() {
-//    val editEntries: List<EditEntry> = listOf(
-//        EditEntry("Name", "MyTimer") {},
-//        EditEntry("Description", "Dit is een leuke timer") {},
-//        EditEntry("StudyTime", "25") {}
-//    )
-//    val actions = TimerEditActions { editEntries }
-//    StudeezTheme { TimerEditScreen(timerEditActions = actions) {} }
-//}
-
-
 
 
 
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EditScreenUIState.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EditScreenUIState.kt
deleted file mode 100644
index 219c06b..0000000
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/EditScreenUIState.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package be.ugent.sel.studeez.screens.timer_edit.editScreens
-
-class EditScreenUIState {
-}
\ No newline at end of file