diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/SimpleScreenComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/SimpleScreenComposable.kt
new file mode 100644
index 0000000..0e3c684
--- /dev/null
+++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/SimpleScreenComposable.kt
@@ -0,0 +1,16 @@
+package be.ugent.sel.studeez.common.composable
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.runtime.Composable
+
+@Composable
+fun SimpleScreenTemplate(
+    title: String,
+    content: @Composable (PaddingValues) -> Unit
+) {
+    Scaffold( topBar = { TopAppBar ( title = { Text(text = title) } ) }
+    ) { paddingValues -> content(paddingValues) }
+}
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt
index 82ff679..2762abc 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt
@@ -26,8 +26,7 @@ fun LoginScreen(
 ) {
     val uiState by viewModel.uiState
 
-    // TODO Make this a separate kind of screen?
-    SecondaryScreenTemplate(title = resources().getString(AppText.sign_in), {}) {
+    SimpleScreenTemplate(title = resources().getString(AppText.sign_in)) {
         Column(
             modifier = modifier
                 .fillMaxWidth()
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
index 19ff103..7515117 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
@@ -29,7 +27,7 @@ fun SignUpScreen(
     val uiState by viewModel.uiState
     val fieldModifier = Modifier.fieldModifier()
 
-    SecondaryScreenTemplate(title = resources().getString(AppText.create_account), {}) {
+    SimpleScreenTemplate(title = resources().getString(AppText.create_account)) {
         Column(
             modifier = modifier
                 .fillMaxWidth()