diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 5117d2c..2d3a2a2 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,11 +4,11 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-03-28T23:01:30.241145700Z">
+        <DropdownSelection timestamp="2024-04-02T17:02:57.318843Z">
           <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=d85c1834" />
-            </handle>
+            <template>
+              <DeviceId pluginId="FirebaseDirectAccess" type="TEMPLATE" identifier="model_id=a51/31" />
+            </template>
           </Target>
         </DropdownSelection>
         <DialogSelection />
diff --git a/.idea/other.xml b/.idea/other.xml
index 970d818..f0a23b3 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -70,6 +70,17 @@
           <option name="screenX" value="2220" />
           <option name="screenY" value="1080" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dreamlte" />
+          <option name="id" value="dreamlte" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S8" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -169,6 +180,17 @@
           <option name="screenX" value="1768" />
           <option name="screenY" value="2208" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
diff --git a/app/src/main/java/com/bobbyesp/metadator/model/ParcelableSong.kt b/app/src/main/java/com/bobbyesp/metadator/model/ParcelableSong.kt
index 67d1e45..67ac15f 100644
--- a/app/src/main/java/com/bobbyesp/metadator/model/ParcelableSong.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/model/ParcelableSong.kt
@@ -2,12 +2,14 @@ package com.bobbyesp.metadator.model
 
 import android.net.Uri
 import android.os.Parcelable
+import androidx.compose.runtime.Immutable
 import com.bobbyesp.model.UriSerializer
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize
 @Serializable
+@Immutable
 data class ParcelableSong(
     val name: String,
     val mainArtist: String,
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPage.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPage.kt
index 0102aac..9fa0494 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPage.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPage.kt
@@ -50,7 +50,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewModelScope
 import com.bobbyesp.ext.joinOrNullToString
 import com.bobbyesp.ext.toMinutes
 import com.bobbyesp.metadator.R
@@ -79,13 +78,10 @@ fun ID3MetadataEditorPage(
 
     var propertiesCopy = viewModel.propertiesCopy.value
 
-    val vmScope = viewModel.viewModelScope
-    LaunchedEffect(true) {
-        vmScope.launch(vmScope.coroutineContext + Dispatchers.IO) {
-            viewModel.loadTrackMetadata(
-                path = parcelableSong.localSongPath!!
-            )
-        }
+    LaunchedEffect(parcelableSong.localSongPath) {
+        viewModel.loadTrackMetadata(
+            path = parcelableSong.localSongPath!!
+        )
     }
 
     val sendActivityIntent =
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPageViewModel.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPageViewModel.kt
index 0415c8e..d486e2a 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPageViewModel.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/ID3MetadataEditorPageViewModel.kt
@@ -6,17 +6,27 @@ import android.content.Context
 import android.os.Build
 import android.util.Log
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.bobbyesp.metadator.R
 import com.bobbyesp.utilities.mediastore.AudioFileMetadata
 import com.bobbyesp.utilities.mediastore.MediaStoreReceiver
+import com.bobbyesp.utilities.mediastore.MetadataChangesDiff
 import com.kyant.taglib.AudioPropertiesReadStyle
 import com.kyant.taglib.Metadata
 import com.kyant.taglib.TagLib
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.IOException
 import javax.inject.Inject
 
@@ -32,36 +42,42 @@ class ID3MetadataEditorPageViewModel @Inject constructor(
     data class PageViewState(
         val metadata: Metadata? = null,
         val state: ID3MetadataEditorPageState = ID3MetadataEditorPageState.Loading,
-        val lyrics: String = "",
     )
 
-    fun loadTrackMetadata(path: String) {
+    suspend fun loadTrackMetadata(path: String) {
         updateState(ID3MetadataEditorPageState.Loading)
-        try {
+        kotlin.runCatching {
             MediaStoreReceiver.getFileDescriptorFromPath(context, path, mode = "r")?.use { songFd ->
-                val fd = songFd.dup()?.detachFd() ?: throw IOException("File descriptor is null")
-                val metadata = TagLib.getMetadata(
-                    fd,
-                    readStyle = AudioPropertiesReadStyle.Fast
-                )
+                val fd = songFd.dup()?.detachFd()
+                    ?: throw IllegalStateException("File descriptor is null")
+
+                val metadataDeferred =
+                    withContext(viewModelScope.coroutineContext + Dispatchers.IO) {
+                        async {
+                            TagLib.getMetadata(
+                                fd,
+                                readStyle = AudioPropertiesReadStyle.Fast
+                            )
+                        }
+                    }
+
+                val metadata = metadataDeferred.await()
+
                 if (metadata == null) {
                     updateState(ID3MetadataEditorPageState.Error(Exception("Metadata is null")))
                     return
                 }
 
-                val lyrics = metadata.propertyMap["LYRICS"]?.get(0) ?: ""
-
-                updateLyrics(lyrics)
                 updateMetadata(metadata)
 
                 updateState(ID3MetadataEditorPageState.Success(metadata))
             }
-        } catch (e: IOException) {
+        }.onFailure { error ->
             Log.e(
                 "ID3MetadataEditorPageViewModel",
-                "Error while trying to load metadata: ${e.message}"
+                "Error while trying to load metadata: ${error.message}"
             )
-            updateState(ID3MetadataEditorPageState.Error(e))
+            updateState(ID3MetadataEditorPageState.Error(error))
         }
     }
 
@@ -74,8 +90,12 @@ class ID3MetadataEditorPageViewModel @Inject constructor(
                 ?.dup()?.detachFd()
                 ?: throw IOException("File descriptor is null")
 
-            TagLib.savePropertyMap(fd, propertyMap = newMetadata.propertyMap)
-            updateState(ID3MetadataEditorPageState.Success(newMetadata))
+            viewModelScope.launch(Dispatchers.IO) {
+                TagLib.savePropertyMap(
+                    fd,
+                    propertyMap = newMetadata.propertyMap
+                )
+            }
             true
         } catch (securityException: SecurityException) {
             handleSecurityException(securityException, intentPassthrough)
@@ -105,19 +125,30 @@ class ID3MetadataEditorPageViewModel @Inject constructor(
         }
     }
 
-
-    private fun updateState(state: ID3MetadataEditorPageState) {
-        mutablePageViewState.update {
-            it.copy(
-                state = state
-            )
+    fun generateUnsavedChangesText(
+        context: Context,
+        changes: MetadataChangesDiff
+    ): AnnotatedString {
+        val builder = AnnotatedString.Builder()
+        val localizedInfoText = context.getString(R.string.unsaved_changes_info)
+        builder.append("$localizedInfoText \n")
+
+        changes.forEach { (key, value) ->
+            val start = builder.length
+            builder.append("$key: ")
+            val end = builder.length
+            builder.addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
+            builder.append("${value.first?.joinToString()} -> ${value.second?.joinToString()}\n")
         }
+
+        return builder.toAnnotatedString()
     }
 
-    private fun updateLyrics(lyrics: String) {
+
+    private fun updateState(state: ID3MetadataEditorPageState) {
         mutablePageViewState.update {
             it.copy(
-                lyrics = lyrics
+                state = state
             )
         }
     }
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/MediaStoreInfoDialog.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/MediaStoreInfoDialog.kt
index b1c580d..a803d87 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/MediaStoreInfoDialog.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/MediaStoreInfoDialog.kt
@@ -2,7 +2,6 @@ package com.bobbyesp.metadator.presentation.pages.utilities.tageditor
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -10,7 +9,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.bobbyesp.metadator.R
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MediaStoreInfoDialog(
     modifier: Modifier = Modifier,