diff --git a/App.apk b/App.apk
index 5618693..ef58382 100644
Binary files a/App.apk and b/App.apk differ
diff --git a/data/src/main/kotlin/dev/adriankuta/kahootquiz/data/QuizRepositoryImpl.kt b/data/src/main/kotlin/dev/adriankuta/kahootquiz/data/QuizRepositoryImpl.kt
index 1451991..54924dc 100644
--- a/data/src/main/kotlin/dev/adriankuta/kahootquiz/data/QuizRepositoryImpl.kt
+++ b/data/src/main/kotlin/dev/adriankuta/kahootquiz/data/QuizRepositoryImpl.kt
@@ -1,9 +1,9 @@
 package dev.adriankuta.kahootquiz.data
 
 import dev.adriankuta.kahootquiz.core.network.retrofit.QuizApi
+import dev.adriankuta.kahootquiz.data.mappers.toDomainModel
 import dev.adriankuta.kahootquiz.domain.models.Quiz
 import dev.adriankuta.kahootquiz.domain.repositories.QuizRepository
-import dev.adriankuta.kahootquiz.data.mappers.toDomainModel
 import javax.inject.Inject
 
 internal class QuizRepositoryImpl @Inject constructor(
diff --git a/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/QuizScreen.kt b/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/QuizScreen.kt
index e3a38b6..c453a2e 100644
--- a/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/QuizScreen.kt
+++ b/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/QuizScreen.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
@@ -79,6 +78,7 @@ private fun QuizScreenLoading(
 }
 
 @Composable
+@Suppress("LongMethod")
 private fun QuizScreenSuccess(
     uiState: ScreenUiState.Success,
     onSelect: (Int) -> Unit,
@@ -90,7 +90,7 @@ private fun QuizScreenSuccess(
             .fillMaxWidth(),
     ) {
         Box(
-            modifier = modifier
+            modifier = Modifier
                 .height(72.dp),
         ) {
             Toolbar(
@@ -115,7 +115,6 @@ private fun QuizScreenSuccess(
         )
         Spacer(Modifier.height(8.dp))
 
-
         Choices(
             choices = uiState.currentQuestion.choices,
             selectedChoiceIndex = uiState.selectedChoiceIndex,
@@ -150,22 +149,10 @@ private fun QuizScreenSuccess(
                     )
                 }
             }
-
         }
     }
 }
 
-
-private fun LazyListScope.timer(uiState: ScreenUiState.Success) {
-    item(key = "timer_${uiState.currentQuestionIndex}") {
-        TimerBar(
-            totalSeconds = uiState.timerState.totalTimeSeconds,
-            remainingSeconds = uiState.timerState.remainingTimeSeconds,
-            modifier = Modifier.padding(8.dp),
-        )
-    }
-}
-
 @Preview
 @Composable
 private fun QuizScreenPreview() {
diff --git a/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/components/QuestionContent.kt b/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/components/QuestionContent.kt
index a813f1f..6830f16 100644
--- a/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/components/QuestionContent.kt
+++ b/ui/quiz/src/main/kotlin/dev/adriankuta/kahootquiz/ui/quiz/components/QuestionContent.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -31,9 +32,10 @@ fun QuestionContent(
         AsyncImage(
             model = question.image,
             contentDescription = question.imageMetadata?.altText,
-            contentScale = ContentScale.FillWidth,
+            contentScale = ContentScale.Fit,
             modifier = Modifier
                 .weight(1f)
+                .align(Alignment.CenterHorizontally)
                 .clip(shape = RoundedCornerShape(4.dp)),
         )
         Spacer(Modifier.height(16.dp))