diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..fb93d254 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,34 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23d..0ad17cbd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index 4604c446..00000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </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" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2fb5d5f7..aa55e1dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,17 +79,18 @@ aboutLibraries {
 
 dependencies {
 
-    def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
+    def composeBom = platform('androidx.compose:compose-bom:2024.09.02')
     implementation composeBom
     androidTestImplementation composeBom
 
     // Android core components.
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4'
-    implementation 'androidx.activity:activity-compose:1.9.1'
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.4"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
+    implementation 'androidx.activity:activity-compose:1.9.2'
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.6"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6"
+    // TODO: Needs migration to type-safe navigation in v2.8.x
     implementation "androidx.navigation:navigation-compose:2.7.7"
     // Jetpack compose.
     implementation "androidx.compose.ui:ui"
@@ -103,7 +104,7 @@ dependencies {
     // Android 12+ splash API.
     implementation 'androidx.core:core-splashscreen:1.0.1'
     // Material icons.
-    implementation 'androidx.compose.material:material-icons-extended:1.6.8'
+    implementation 'androidx.compose.material:material-icons-extended:1.7.2'
     // Room database
     implementation "androidx.room:room-ktx:$room_version"
     ksp "androidx.room:room-compiler:$room_version"
@@ -135,7 +136,7 @@ dependencies {
     // Crash Handler.
     implementation 'cat.ereza:customactivityoncrash:2.4.0'
     // Oreo back-ports for API 24 (N)
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
     // Testing components.
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreen.kt
index b7680f23..1ce2c8cb 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreen.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreen.kt
@@ -28,34 +28,15 @@ package com.starry.greenstash.ui.screens.archive.composables
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Face2
-import androidx.compose.material.icons.filled.Image
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LargeTopAppBar
@@ -65,11 +46,9 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -78,29 +57,18 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieCompositionResult
-import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.animateLottieCompositionAsState
-import com.airbnb.lottie.compose.rememberLottieComposition
 import com.starry.greenstash.R
 import com.starry.greenstash.database.core.GoalWithTransactions
 import com.starry.greenstash.ui.screens.archive.ArchiveViewModel
 import com.starry.greenstash.ui.theme.greenstashFont
-import com.starry.greenstash.ui.theme.greenstashNumberFont
 import com.starry.greenstash.utils.Constants
 import com.starry.greenstash.utils.ImageUtils
 import com.starry.greenstash.utils.NumberUtils
@@ -108,7 +76,7 @@ import com.starry.greenstash.utils.weakHapticFeedback
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ArchiveScreen(navController: NavController) {
     val view = LocalView.current
@@ -201,7 +169,10 @@ fun ArchiveScreen(navController: NavController) {
                         ) { index ->
                             val goalItem = archivedGoals[index]
                             ArchivedLazyItem(
-                                modifier = Modifier.animateItemPlacement(),
+                                modifier = Modifier.animateItem(
+                                    fadeInSpec = null,
+                                    fadeOutSpec = null
+                                ),
                                 goalItem = goalItem,
                                 defaultCurrency = viewModel.getDefaultCurrency(),
                                 onRestoreConfirmed = {
@@ -278,244 +249,3 @@ private fun ArchivedLazyItem(
     }
 }
 
-@Composable
-private fun ArchivedGoalItem(
-    title: String,
-    icon: ImageVector?,
-    savedAmount: String,
-    onRestoreClicked: () -> Unit,
-    onDeleteClicked: () -> Unit
-) {
-    val view = LocalView.current
-
-    Card(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 12.dp, vertical = 8.dp)
-    ) {
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp)
-        ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-            ) {
-                Icon(
-                    imageVector = icon ?: Icons.Filled.Image,
-                    contentDescription = title,
-                    modifier = Modifier.size(48.dp)
-                )
-
-                Spacer(modifier = Modifier.weight(1f))
-
-                Box(
-                    modifier = Modifier
-                        .size(35.dp)
-                        .background(
-                            color = MaterialTheme.colorScheme.primary,
-                            shape = CircleShape
-                        )
-                        .clip(CircleShape)
-                        .clickable {
-                            view.weakHapticFeedback()
-                            onRestoreClicked()
-                        }
-                ) {
-                    Icon(
-                        imageVector = Icons.Filled.Refresh,
-                        contentDescription = title,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(9.dp),
-                        tint = MaterialTheme.colorScheme.onPrimary
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                Box(
-                    modifier = Modifier
-                        .size(35.dp)
-                        .background(
-                            color = MaterialTheme.colorScheme.primary,
-                            shape = CircleShape
-                        )
-                        .clip(CircleShape)
-                        .clickable {
-                            view.weakHapticFeedback()
-                            onDeleteClicked()
-                        }
-                ) {
-                    Icon(
-                        imageVector = Icons.Outlined.Delete,
-                        contentDescription = title,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(9.dp),
-                        tint = MaterialTheme.colorScheme.onPrimary
-                    )
-                }
-            }
-
-            Spacer(modifier = Modifier.height(14.dp))
-
-            Text(
-                text = title,
-                fontWeight = FontWeight.Medium,
-                fontFamily = greenstashFont,
-                fontSize = 18.sp,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-
-            Text(
-                text = savedAmount,
-                fontSize = 22.sp,
-                fontFamily = greenstashNumberFont,
-                fontWeight = FontWeight.Bold,
-                maxLines = 2,
-            )
-        }
-    }
-}
-
-@Composable
-private fun ArchiveDialogs(
-    showRestoreDialog: MutableState<Boolean>,
-    showDeleteDialog: MutableState<Boolean>,
-    onRestoreConfirmed: () -> Unit,
-    onDeleteConfirmed: () -> Unit
-) {
-    if (showRestoreDialog.value) {
-        AlertDialog(onDismissRequest = {
-            showRestoreDialog.value = false
-        }, title = {
-            Text(
-                text = stringResource(id = R.string.goal_restore_confirmation),
-                color = MaterialTheme.colorScheme.onSurface,
-                fontFamily = greenstashFont,
-                fontSize = 18.sp
-            )
-        }, confirmButton = {
-            FilledTonalButton(
-                onClick = {
-                    showRestoreDialog.value = false
-                    onRestoreConfirmed()
-                },
-                colors = ButtonDefaults.filledTonalButtonColors(
-                    containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
-                )
-            ) {
-                Text(stringResource(id = R.string.confirm), fontFamily = greenstashFont)
-            }
-        }, dismissButton = {
-            TextButton(onClick = {
-                showRestoreDialog.value = false
-            }) {
-                Text(stringResource(id = R.string.cancel), fontFamily = greenstashFont)
-            }
-        },
-            icon = {
-                Icon(
-                    imageVector = Icons.Filled.Refresh,
-                    contentDescription = null
-                )
-            }
-        )
-    }
-
-    if (showDeleteDialog.value) {
-        AlertDialog(onDismissRequest = {
-            showDeleteDialog.value = false
-        }, title = {
-            Text(
-                text = stringResource(id = R.string.goal_delete_confirmation),
-                color = MaterialTheme.colorScheme.onSurface,
-                fontFamily = greenstashFont,
-                fontSize = 18.sp
-            )
-        }, confirmButton = {
-            FilledTonalButton(
-                onClick = {
-                    showDeleteDialog.value = false
-                    onDeleteConfirmed()
-                },
-                colors = ButtonDefaults.filledTonalButtonColors(
-                    containerColor = MaterialTheme.colorScheme.errorContainer,
-                    contentColor = MaterialTheme.colorScheme.onErrorContainer
-                )
-            ) {
-                Text(stringResource(id = R.string.confirm), fontFamily = greenstashFont)
-            }
-        }, dismissButton = {
-            TextButton(onClick = {
-                showDeleteDialog.value = false
-            }) {
-                Text(stringResource(id = R.string.cancel), fontFamily = greenstashFont)
-            }
-        },
-            icon = {
-                Icon(
-                    imageVector = Icons.Outlined.Delete,
-                    contentDescription = null
-                )
-            }
-        )
-    }
-}
-
-
-@Composable
-private fun NoArchivedGoals() {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        val compositionResult: LottieCompositionResult =
-            rememberLottieComposition(
-                spec = LottieCompositionSpec.RawRes(R.raw.no_goal_found_lottie)
-            )
-        val progressAnimation by animateLottieCompositionAsState(
-            compositionResult.value,
-            isPlaying = true,
-            iterations = 1,
-            speed = 1f
-        )
-
-        Spacer(modifier = Modifier.weight(1f))
-
-        LottieAnimation(
-            composition = compositionResult.value,
-            progress = { progressAnimation },
-            modifier = Modifier.size(320.dp),
-            enableMergePaths = true
-        )
-
-        Text(
-            text = stringResource(id = R.string.archive_empty),
-            fontFamily = greenstashFont,
-            style = MaterialTheme.typography.titleMedium,
-            modifier = Modifier
-                .padding(start = 12.dp, end = 12.dp)
-                .offset(y = (-16).dp)
-        )
-
-        Spacer(modifier = Modifier.weight(2f))
-    }
-}
-
-@Preview
-@Composable
-fun ArchiveItemPV() {
-    ArchivedGoalItem(
-        title = "Home Decorations",
-        icon = Icons.Filled.Face2,
-        savedAmount = "₹10,000",
-        onRestoreClicked = {},
-        onDeleteClicked = {}
-    )
-}
-
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreenComponents.kt b/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreenComponents.kt
new file mode 100644
index 00000000..834bb47c
--- /dev/null
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/archive/composables/ArchiveScreenComponents.kt
@@ -0,0 +1,294 @@
+package com.starry.greenstash.ui.screens.archive.composables
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Face2
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionResult
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.animateLottieCompositionAsState
+import com.airbnb.lottie.compose.rememberLottieComposition
+import com.starry.greenstash.R
+import com.starry.greenstash.ui.theme.greenstashFont
+import com.starry.greenstash.ui.theme.greenstashNumberFont
+import com.starry.greenstash.utils.weakHapticFeedback
+
+@Composable
+fun ArchivedGoalItem(
+    title: String,
+    icon: ImageVector?,
+    savedAmount: String,
+    onRestoreClicked: () -> Unit,
+    onDeleteClicked: () -> Unit
+) {
+    val view = LocalView.current
+
+    Card(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 12.dp, vertical = 8.dp)
+    ) {
+        Column(
+            Modifier
+                .fillMaxWidth()
+                .padding(top = 16.dp, start = 16.dp, end = 16.dp, bottom = 8.dp)
+        ) {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+            ) {
+                Icon(
+                    imageVector = icon ?: Icons.Filled.Image,
+                    contentDescription = title,
+                    modifier = Modifier.size(48.dp)
+                )
+
+                Spacer(modifier = Modifier.weight(1f))
+
+                Box(
+                    modifier = Modifier
+                        .size(35.dp)
+                        .background(
+                            color = MaterialTheme.colorScheme.primary,
+                            shape = CircleShape
+                        )
+                        .clip(CircleShape)
+                        .clickable {
+                            view.weakHapticFeedback()
+                            onRestoreClicked()
+                        }
+                ) {
+                    Icon(
+                        imageVector = Icons.Filled.Refresh,
+                        contentDescription = title,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(9.dp),
+                        tint = MaterialTheme.colorScheme.onPrimary
+                    )
+                }
+
+                Spacer(modifier = Modifier.width(16.dp))
+
+                Box(
+                    modifier = Modifier
+                        .size(35.dp)
+                        .background(
+                            color = MaterialTheme.colorScheme.primary,
+                            shape = CircleShape
+                        )
+                        .clip(CircleShape)
+                        .clickable {
+                            view.weakHapticFeedback()
+                            onDeleteClicked()
+                        }
+                ) {
+                    Icon(
+                        imageVector = Icons.Outlined.Delete,
+                        contentDescription = title,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(9.dp),
+                        tint = MaterialTheme.colorScheme.onPrimary
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(14.dp))
+
+            Text(
+                text = title,
+                fontWeight = FontWeight.Medium,
+                fontFamily = greenstashFont,
+                fontSize = 18.sp,
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+
+            Text(
+                text = savedAmount,
+                fontSize = 22.sp,
+                fontFamily = greenstashNumberFont,
+                fontWeight = FontWeight.Bold,
+                maxLines = 2,
+            )
+        }
+    }
+}
+
+@Composable
+fun ArchiveDialogs(
+    showRestoreDialog: MutableState<Boolean>,
+    showDeleteDialog: MutableState<Boolean>,
+    onRestoreConfirmed: () -> Unit,
+    onDeleteConfirmed: () -> Unit
+) {
+    if (showRestoreDialog.value) {
+        AlertDialog(onDismissRequest = {
+            showRestoreDialog.value = false
+        }, title = {
+            Text(
+                text = stringResource(id = R.string.goal_restore_confirmation),
+                color = MaterialTheme.colorScheme.onSurface,
+                fontFamily = greenstashFont,
+                fontSize = 18.sp
+            )
+        }, confirmButton = {
+            FilledTonalButton(
+                onClick = {
+                    showRestoreDialog.value = false
+                    onRestoreConfirmed()
+                },
+                colors = ButtonDefaults.filledTonalButtonColors(
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                )
+            ) {
+                Text(stringResource(id = R.string.confirm), fontFamily = greenstashFont)
+            }
+        }, dismissButton = {
+            TextButton(onClick = {
+                showRestoreDialog.value = false
+            }) {
+                Text(stringResource(id = R.string.cancel), fontFamily = greenstashFont)
+            }
+        },
+            icon = {
+                Icon(
+                    imageVector = Icons.Filled.Refresh,
+                    contentDescription = null
+                )
+            }
+        )
+    }
+
+    if (showDeleteDialog.value) {
+        AlertDialog(onDismissRequest = {
+            showDeleteDialog.value = false
+        }, title = {
+            Text(
+                text = stringResource(id = R.string.goal_delete_confirmation),
+                color = MaterialTheme.colorScheme.onSurface,
+                fontFamily = greenstashFont,
+                fontSize = 18.sp
+            )
+        }, confirmButton = {
+            FilledTonalButton(
+                onClick = {
+                    showDeleteDialog.value = false
+                    onDeleteConfirmed()
+                },
+                colors = ButtonDefaults.filledTonalButtonColors(
+                    containerColor = MaterialTheme.colorScheme.errorContainer,
+                    contentColor = MaterialTheme.colorScheme.onErrorContainer
+                )
+            ) {
+                Text(stringResource(id = R.string.confirm), fontFamily = greenstashFont)
+            }
+        }, dismissButton = {
+            TextButton(onClick = {
+                showDeleteDialog.value = false
+            }) {
+                Text(stringResource(id = R.string.cancel), fontFamily = greenstashFont)
+            }
+        },
+            icon = {
+                Icon(
+                    imageVector = Icons.Outlined.Delete,
+                    contentDescription = null
+                )
+            }
+        )
+    }
+}
+
+
+@Composable
+fun NoArchivedGoals() {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        val compositionResult: LottieCompositionResult =
+            rememberLottieComposition(
+                spec = LottieCompositionSpec.RawRes(R.raw.no_goal_found_lottie)
+            )
+        val progressAnimation by animateLottieCompositionAsState(
+            compositionResult.value,
+            isPlaying = true,
+            iterations = 1,
+            speed = 1f
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        LottieAnimation(
+            composition = compositionResult.value,
+            progress = { progressAnimation },
+            modifier = Modifier.size(320.dp),
+            enableMergePaths = true
+        )
+
+        Text(
+            text = stringResource(id = R.string.archive_empty),
+            fontFamily = greenstashFont,
+            style = MaterialTheme.typography.titleMedium,
+            modifier = Modifier
+                .padding(start = 12.dp, end = 12.dp)
+                .offset(y = (-16).dp)
+        )
+
+        Spacer(modifier = Modifier.weight(2f))
+    }
+}
+
+
+@Preview
+@Composable
+fun ArchiveItemPV() {
+    ArchivedGoalItem(
+        title = "Home Decorations",
+        icon = Icons.Filled.Face2,
+        savedAmount = "₹10,000",
+        onRestoreClicked = {},
+        onDeleteClicked = {}
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
index 0a096c08..d2bdfcc7 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
@@ -31,7 +31,6 @@ import androidx.compose.animation.core.keyframes
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -277,7 +276,6 @@ fun HomeScreen(navController: NavController) {
 }
 
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun GoalSearchResults(
     allGoalState: State<List<GoalWithTransactions>>,
@@ -341,7 +339,7 @@ private fun GoalSearchResults(
                 contentType = { 0 }
             ) { idx ->
                 val item = filteredList[idx]
-                Box(modifier = Modifier.animateItemPlacement()) {
+                Box(modifier = Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null)) {
                     GoalLazyColumnItem(
                         viewModel = viewModel,
                         item = item,
@@ -358,7 +356,6 @@ private fun GoalSearchResults(
 }
 
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun AllGoalsList(
     lazyListState: LazyListState,
@@ -381,7 +378,7 @@ private fun AllGoalsList(
             contentType = { 0 }
         ) { idx ->
             val item = allGoals[idx]
-            Box(modifier = Modifier.animateItemPlacement()) {
+            Box(modifier = Modifier.animateItem(fadeInSpec = null, fadeOutSpec = null)) {
                 GoalLazyColumnItem(
                     viewModel = viewModel,
                     item = item,
diff --git a/build.gradle b/build.gradle
index e6c6dd67..c5d6a82d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
         kotlin_version = '2.0.0'
-        gradle_version = '8.5.0'
+        gradle_version = '8.6.1'
         hilt_version = '2.51.1'
         room_version = '2.6.1'
     }