diff --git a/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt b/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
index 9d1491e..84816f9 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/account/changepassword.kt
@@ -103,7 +103,7 @@ fun ChangePasswordScreen() {
                 hint = "Enter your current password",
                 error = oldPasswordError
             )
-            Spacer(modifier = Modifier.height(24.dp))
+            Spacer(modifier = Modifier.height(4.dp))
             TextInputField(
                 text = newPassword,
                 onValueChange = { newPassword = it },
@@ -112,7 +112,7 @@ fun ChangePasswordScreen() {
                 hint = "Enter your new password",
                 error = passwordError
             )
-            Spacer(modifier = Modifier.height(24.dp))
+            Spacer(modifier = Modifier.height(4.dp))
             TextInputField(
                 text = confirmPassword,
                 onValueChange = { confirmPassword = it },
@@ -121,7 +121,7 @@ fun ChangePasswordScreen() {
                 hint = "Enter your new password again",
                 error = confirmPasswordError
             )
-            Spacer(modifier = Modifier.height(80.dp))
+            Spacer(modifier = Modifier.height(50.dp))
             ActionButton(
                 modifier = Modifier
                     .width(345.dp)
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteListPage.kt b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteListPage.kt
index f76ce16..cc2627c 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteListPage.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/favourite/FavouriteListPage.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -18,6 +19,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -78,7 +80,6 @@ fun FavouriteListPage() {
                                 .fillMaxWidth()
                                 .aspectRatio(1f)
                                 .padding(2.dp)
-
                                 .noRippleClickable {
                                     navController.navigateToPost(
                                         id = momentItem.id,
@@ -91,7 +92,8 @@ fun FavouriteListPage() {
                                 imageUrl = momentItem.images[0].thumbnail,
                                 contentDescription = "",
                                 modifier = Modifier
-                                    .fillMaxSize(),
+                                    .fillMaxSize()
+                                    .clip(RoundedCornerShape(8.dp)),
                                 context = context
                             )
                             if (momentItem.images.size > 1) {
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
index b8837d2..3c18a83 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
@@ -177,7 +177,7 @@ fun ProfileV3(
                                     modifier = Modifier
                                         .fillMaxWidth()
                                         .let {
-                                            if (isSelf && state.toolbarState.progress == 0f) {
+                                            if (isSelf) {
                                                 it.noRippleClickable {
                                                     Intent(Intent.ACTION_PICK).apply {
                                                         type = "image/*"
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt
index d6bdd86..e527540 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -141,7 +142,8 @@ fun DiscoverView() {
     val navController = LocalNavController.current
     LazyVerticalGrid(
         columns = GridCells.Fixed(3),
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier.fillMaxSize().padding(bottom = 8.dp),
+//        contentPadding = PaddingValues(8.dp)
     ) {
         items(moments.itemCount) { idx ->
             val momentItem = moments[idx] ?: return@items