diff --git a/app/frontend/build.gradle.kts b/app/frontend/build.gradle.kts
index 6441ae2..1433da0 100644
--- a/app/frontend/build.gradle.kts
+++ b/app/frontend/build.gradle.kts
@@ -16,6 +16,23 @@ android {
         versionName = "1.0"
     }
 
+    signingConfigs {
+        create("release") {
+            storeFile = file("../release-key.jks")
+            storePassword = "youtubeapp"
+            keyAlias = "youtubeapp"
+            keyPassword = "youtubeapp"
+            enableV1Signing = true
+            enableV2Signing = true
+        }
+    }
+
+    buildTypes {
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("release")
+        }
+    }
+
     buildFeatures {
         compose = true
     }
diff --git a/app/frontend/src/main/AndroidManifest.xml b/app/frontend/src/main/AndroidManifest.xml
index fc6e766..c15933d 100644
--- a/app/frontend/src/main/AndroidManifest.xml
+++ b/app/frontend/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:exported="true"
+            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/frontend/src/main/java/com/youtubeapp/data/ApiClient.kt b/app/frontend/src/main/java/com/youtubeapp/data/ApiClient.kt
index fdca5b6..c51d4ec 100644
--- a/app/frontend/src/main/java/com/youtubeapp/data/ApiClient.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/data/ApiClient.kt
@@ -8,7 +8,7 @@ object ApiClient {
     val BASE_URL: String = if (Build.FINGERPRINT.contains("generic") || Build.FINGERPRINT.contains("sdk"))
         "http://10.0.2.2:8000/"
     else
-        "http://marha.local:8000/"
+        "http://192.168.178.34:8000/"
 
     val api: VideoApi by lazy {
         Retrofit.Builder()
diff --git a/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt b/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
index 5be8431..b57688e 100644
--- a/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/data/LocalStorageService.kt
@@ -1,12 +1,15 @@
 package com.youtubeapp.data
 
 import android.content.Context
+import com.google.gson.Gson
 import java.io.File
 import java.io.FileOutputStream
 import java.net.URL
 
 class LocalStorageService(private val context: Context) {
 
+    private val gson = Gson()
+
     private fun videosDir(): File {
         val dir = File(context.filesDir, "videos")
         if (!dir.exists()) dir.mkdirs()
@@ -15,6 +18,8 @@ class LocalStorageService(private val context: Context) {
 
     private fun videoFile(videoId: Int): File = File(videosDir(), "$videoId.mp4")
 
+    private fun metadataFile(videoId: Int): File = File(videosDir(), "$videoId.json")
+
     fun isLocallyAvailable(videoId: Int): Boolean = videoFile(videoId).exists()
 
     fun getLocalFile(videoId: Int): File? {
@@ -22,7 +27,10 @@ class LocalStorageService(private val context: Context) {
         return if (file.exists()) file else null
     }
 
-    fun deleteLocalFile(videoId: Int): Boolean = videoFile(videoId).delete()
+    fun deleteLocalFile(videoId: Int): Boolean {
+        metadataFile(videoId).delete()
+        return videoFile(videoId).delete()
+    }
 
     fun getLocalVideoIds(): List<Int> {
         return videosDir().listFiles()
@@ -31,6 +39,24 @@ class LocalStorageService(private val context: Context) {
             ?: emptyList()
     }
 
+    fun saveMetadata(video: Video) {
+        metadataFile(video.id).writeText(gson.toJson(video))
+    }
+
+    fun getLocalVideos(): List<Video> {
+        return videosDir().listFiles()
+            ?.filter { it.extension == "json" }
+            ?.mapNotNull { file ->
+                try {
+                    val video = gson.fromJson(file.readText(), Video::class.java)
+                    if (videoFile(video.id).exists()) video else null
+                } catch (_: Exception) {
+                    null
+                }
+            }
+            ?: emptyList()
+    }
+
     fun downloadAndSave(videoId: Int): File {
         val url = "${ApiClient.BASE_URL}videos/$videoId/file"
         val file = videoFile(videoId)
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
index be37466..e5570ba 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
@@ -109,24 +109,15 @@ class VideoViewModel : ViewModel() {
                 .onSuccess { videos ->
                     _state.value = _state.value.copy(allVideos = videos, isLoading = false)
                 }
-                .onFailure { e ->
-                    _state.value = _state.value.copy(error = e.message, isLoading = false)
+                .onFailure {
+                    _state.value = _state.value.copy(error = "Server nicht erreichbar", isLoading = false)
                 }
         }
     }
 
     fun loadDownloadedVideos() {
-        viewModelScope.launch {
-            _state.value = _state.value.copy(isLoading = true, error = null)
-            repository.getAllVideos(profileId = _state.value.selectedProfileId)
-                .onSuccess { videos ->
-                    val local = videos.filter { localStorage?.isLocallyAvailable(it.id) == true }
-                    _state.value = _state.value.copy(downloadedVideos = local, isLoading = false)
-                }
-                .onFailure { e ->
-                    _state.value = _state.value.copy(error = e.message, isLoading = false)
-                }
-        }
+        val videos = localStorage?.getLocalVideos() ?: emptyList()
+        _state.value = _state.value.copy(downloadedVideos = videos)
     }
 
     fun triggerDownload(videoId: Int) {
@@ -144,16 +135,24 @@ class VideoViewModel : ViewModel() {
 
                 val status = result.getOrNull()
                 if (status == "download_started") {
-                    while (true) {
+                    var attempts = 0
+                    while (attempts < 150) {
                         delay(2000)
                         val videosResult = repository.getAllVideos()
                         val video = videosResult.getOrNull()?.find { it.id == videoId }
                         if (video?.is_downloaded == true) break
+                        attempts++
                     }
+                    if (attempts >= 150) throw Exception("Download fehlgeschlagen")
                 }
 
                 localStorage?.downloadAndSave(videoId)
+                val video = _state.value.allVideos.find { it.id == videoId }
+                if (video != null) {
+                    localStorage?.saveMetadata(video)
+                }
                 repository.deleteServerFile(videoId)
+                loadDownloadedVideos()
                 _state.value = _state.value.copy(
                     isDownloading = false,
                     downloadStatus = "Lokal gespeichert"
@@ -187,6 +186,7 @@ class VideoViewModel : ViewModel() {
 
     fun getVideoById(videoId: Int): Video? {
         return _state.value.allVideos.find { it.id == videoId }
+            ?: _state.value.downloadedVideos.find { it.id == videoId }
     }
 
     fun isLocallyAvailable(videoId: Int): Boolean {
diff --git a/app/release-key.jks b/app/release-key.jks
new file mode 100644
index 0000000..d53f9ae
Binary files /dev/null and b/app/release-key.jks differ
diff --git a/features.md b/features.md
index e72a6c3..215826a 100644
--- a/features.md
+++ b/features.md
@@ -21,13 +21,13 @@
 - Benutzer Icon: Verfügbare Profile anzeigen
   - Klick auf ein Profile setzt dieses als das aktuelle Profil
   - Es werden nur Videos zu dem Profil angezeigt
-  - Standardprofil enthält alle Videos ohne Profilzuweisung
+  - Videos ohne Profilzuweisung werden automatisch dem Standardprofil zugeordnet
 - Videoübersicht:
   - Oben links: Zurück-Button
   - Unter Zurück-Button: Thumbnail
   - Unten: Abspielen und Download Buttons
 - Abspielen:
-  - "Zurück"-Button oben linsk
+  - "Zurück"-Button oben links
   - Standard Videos Controls
   - Startet einen Stream über den Server
 - Download: