diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d843f34..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/fr/univpau/queezer/Fetcher.kt b/app/src/main/java/fr/univpau/queezer/Fetcher.kt
index 52635f0..622c795 100644
--- a/app/src/main/java/fr/univpau/queezer/Fetcher.kt
+++ b/app/src/main/java/fr/univpau/queezer/Fetcher.kt
@@ -26,7 +26,7 @@ data class Album(
 )
 
 
-suspend fun fetchTracks(apiUrl: String): MutableState<List<Track>> {
+suspend fun fetchTracks(apiUrl: String): List<Track>? {
     return withContext(Dispatchers.IO) {
         try {
             val url = URL(apiUrl)
@@ -40,11 +40,11 @@ suspend fun fetchTracks(apiUrl: String): MutableState<List<Track>> {
                 val trackListType = object : TypeToken<List<Track>>() {}.type
                 Gson().fromJson<List<Track>>(tracksJson, trackListType)
             } else {
-                null
+                emptyList()
             }
         } catch (e: Exception) {
             e.printStackTrace()
-            null
+            emptyList()
         }
     }
 }
diff --git a/app/src/main/java/fr/univpau/queezer/GameScreen.kt b/app/src/main/java/fr/univpau/queezer/GameScreen.kt
index 8225865..6a6d554 100644
--- a/app/src/main/java/fr/univpau/queezer/GameScreen.kt
+++ b/app/src/main/java/fr/univpau/queezer/GameScreen.kt
@@ -1,8 +1,6 @@
 package fr.univpau.queezer
 
 import android.os.CountDownTimer
-import android.util.Log
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -14,26 +12,19 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
-import androidx.compose.ui.res.painterResource
-import kotlinx.coroutines.runBlocking
 
 @Composable
 fun GameScreen(navController: NavHostController) {
@@ -43,10 +34,10 @@ fun GameScreen(navController: NavHostController) {
     var selectedGameMode by remember { mutableStateOf(loadedSettings.gameMode) }
     val numberOfTitles by remember { mutableIntStateOf(loadedSettings.numberOfTitles.toInt()) }
     val playlistUrl by remember { mutableStateOf(loadedSettings.playlistUrl) }
-    var tracks = remember { mutableStateOf(emptyList<Track>()) }
+    val tracks = remember { mutableStateOf(emptyList<Track>()) }
 
     LaunchedEffect(playlistUrl) {
-        tracks = fetchTracks(playlistUrl)
+        // tracks = fetchTracks(playlistUrl)
     }
 
     val score = remember { mutableIntStateOf(0) }