diff --git a/feature/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt b/feature/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt
index 0c3a21f..dd6fdd4 100644
--- a/feature/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt
+++ b/feature/album/src/main/java/com/android/swingmusic/album/presentation/screen/AllAlbumScreen.kt
@@ -241,6 +241,10 @@ private fun AllAlbums(
                                 }
                             )
                         }
+
+                        item(span = { GridItemSpan(allAlbumsUiState.gridCount) }) {
+                            Spacer(modifier = Modifier.height(200.dp))
+                        }
                     }
 
                     loadingState?.let {
diff --git a/feature/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt b/feature/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt
index a0475b3..3895760 100644
--- a/feature/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt
+++ b/feature/artist/src/main/java/com/android/swingmusic/artist/presentation/screen/ArtistsScreen.kt
@@ -238,6 +238,10 @@ private fun Artists(
                                 }
                             )
                         }
+
+                        item(span = { GridItemSpan(artistsUiState.gridCount) }) {
+                            Spacer(modifier = Modifier.height(200.dp))
+                        }
                     }
 
                     loadingState?.let {
diff --git a/feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt b/feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt
index 57b3589..b717c63 100644
--- a/feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt
+++ b/feature/folder/src/main/java/com/android/swingmusic/folder/presentation/screen/FoldersAndTracks.kt
@@ -276,7 +276,7 @@ private fun FoldersAndTracks(
                                 if (index == foldersAndTracksState.foldersAndTracks.folders.lastIndex &&
                                     foldersAndTracksState.foldersAndTracks.tracks.isEmpty()
                                 ) {
-                                    Spacer(modifier = Modifier.height(150.dp))
+                                    Spacer(modifier = Modifier.height(200.dp))
                                 }
                             }
 
@@ -287,7 +287,7 @@ private fun FoldersAndTracks(
                             ) { index, track ->
                                 TrackItem(
                                     track = track,
-                                    showMenuIcon = true, // TODO: set true after fixing AlbumInfo bug
+                                    showMenuIcon = true,
                                     isCurrentTrack = track.trackHash == currentTrackHash,
                                     playbackState = playbackState,
                                     baseUrl = baseUrl,
@@ -303,7 +303,7 @@ private fun FoldersAndTracks(
                                 )
 
                                 if (index == foldersAndTracksState.foldersAndTracks.tracks.lastIndex) {
-                                    Spacer(modifier = Modifier.height(150.dp))
+                                    Spacer(modifier = Modifier.height(200.dp))
                                 }
                             }
                         }