diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt
index 3a291c6..35ba539 100644
--- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt
+++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt
@@ -84,7 +84,7 @@ class PopularNextSeasonRepository(
     ) {
         fun toGraphQL() = SeasonQuery(
             page = Optional.present(page),
-            perPage = Optional.present(10),
+            perPage = Optional.present(20),
             adultContent = if (nsfw) {
                 Optional.absent()
             } else {
diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt
index 4d4750c..120f9f9 100644
--- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt
+++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt
@@ -88,7 +88,7 @@ class PopularSeasonRepository(
     ) {
         fun toGraphQL() = SeasonQuery(
             page = Optional.present(page),
-            perPage = Optional.present(10),
+            perPage = Optional.present(20),
             adultContent = if (nsfw) {
                 Optional.absent()
             } else {
diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/HomeScreen.kt
index 33d61ae..2a4ba5b 100644
--- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/HomeScreen.kt
+++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/HomeScreen.kt
@@ -122,7 +122,7 @@ fun HomeScreen(component: HomeComponent) {
                 onClick = {
                     imagePicker.launch()
                 },
-                expanded = listState.isScrollingUp(),
+                expanded = listState.isScrollingUp() && listState.canScrollForward,
                 icon = {
                     Icon(
                         imageVector = Icons.Filled.CameraEnhance,
@@ -167,7 +167,6 @@ fun HomeScreen(component: HomeComponent) {
                         item {
                             ScheduleOverview(
                                 flow = component.airing,
-                                onMoreClick = { },
                                 onMediumClick = component::details
                             )
                         }
@@ -176,7 +175,6 @@ fun HomeScreen(component: HomeComponent) {
                         DefaultOverview(
                             title = "Trending",
                             flow = component.trending,
-                            onMoreClick = { },
                             onMediumClick = component::details
                         )
                     }
@@ -184,7 +182,6 @@ fun HomeScreen(component: HomeComponent) {
                         DefaultOverview(
                             title = "Popular",
                             flow = component.popularNow,
-                            onMoreClick = { },
                             onMediumClick = component::details
                         )
                     }
@@ -193,7 +190,6 @@ fun HomeScreen(component: HomeComponent) {
                             DefaultOverview(
                                 title = "Popular Next",
                                 flow = component.popularNext,
-                                onMoreClick = { },
                                 onMediumClick = component::details
                             )
                         }
diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/DefaultOverview.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/DefaultOverview.kt
index 2cdf9dd..23c6a22 100644
--- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/DefaultOverview.kt
+++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/DefaultOverview.kt
@@ -26,7 +26,6 @@ import kotlinx.coroutines.flow.Flow
 fun DefaultOverview(
     title: String,
     flow: Flow<CollectionState>,
-    onMoreClick: () -> Unit,
     onMediumClick: (Medium) -> Unit,
 ) {
     Column(
@@ -45,16 +44,6 @@ fun DefaultOverview(
                 style = MaterialTheme.typography.headlineMedium,
                 fontWeight = FontWeight.Bold
             )
-            Spacer(modifier = Modifier.weight(1f))
-            IconButton(
-                onClick = onMoreClick,
-                enabled = state.isSuccess
-            ) {
-                Icon(
-                    imageVector = Icons.AutoMirrored.Filled.ArrowForwardIos,
-                    contentDescription = null
-                )
-            }
         }
 
         when (val current = state) {
diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/ScheduleOverview.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/ScheduleOverview.kt
index af0b934..1310ec0 100644
--- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/ScheduleOverview.kt
+++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/home/component/ScheduleOverview.kt
@@ -28,7 +28,6 @@ import kotlinx.coroutines.flow.Flow
 @Composable
 fun ScheduleOverview(
     flow: Flow<AiringTodayRepository.State>,
-    onMoreClick: () -> Unit,
     onMediumClick: (Medium) -> Unit
 ) {
     Column(