diff --git a/lib/screens/home/home_pages_widget.dart b/lib/screens/home/home_pages_widget.dart
index e1e06cc..abd6583 100644
--- a/lib/screens/home/home_pages_widget.dart
+++ b/lib/screens/home/home_pages_widget.dart
@@ -10,7 +10,6 @@ const _imageOpacity = 0.6;
 class HomePagesWidget extends StatefulWidget {
   final List<SurveyModel> surveys;
   final ValueNotifier<int> currentPage;
-  final PageController _pageController = PageController();
   final VoidCallback onNextButtonPressed;
   final bool isRefreshing;
   final VoidCallback onLoadMore;
@@ -37,13 +36,6 @@ class _HomePagesWidgetState extends State<HomePagesWidget> {
     super.dispose();
   }
 
-  void _handleNextButtonPressed(int index) {
-    if (widget.currentPage.value < widget.surveys.length - 1) {
-      widget.currentPage.value = index + 1;
-      _pageController.jumpToPage(widget.currentPage.value);
-    }
-  }
-
   void _handlePageChanged(int index) {
     widget.currentPage.value = index;
 
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart
index 4a21744..de1ff15 100644
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@@ -91,18 +91,17 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
                 children: [
                   if (surveys.isNotEmpty) ...[
                     HomePagesWidget(
-                      surveys: surveys,
-                      currentPage: _currentPage,
-                      onNextButtonPressed: () {
-                        final survey = surveys[_currentPage.value];
-                        context.push(
-                          AppRoute.survey.path,
-                          extra: survey,
-                        );
-                      },
+                        surveys: surveys,
+                        currentPage: _currentPage,
+                        onNextButtonPressed: () {
+                          final survey = surveys[_currentPage.value];
+                          context.push(
+                            AppRoute.survey.path,
+                            extra: survey,
+                          );
+                        },
                         onLoadMore: _loadSurveys,
-                        isRefreshing: isRefreshing
-                    ),
+                        isRefreshing: isRefreshing),
                     const HomeHeaderWidget(),
                     Align(
                       alignment: Alignment.bottomCenter,
diff --git a/lib/screens/home/home_view_model.dart b/lib/screens/home/home_view_model.dart
index 92d7019..25b2b66 100644
--- a/lib/screens/home/home_view_model.dart
+++ b/lib/screens/home/home_view_model.dart
@@ -8,7 +8,7 @@ import 'package:survey_flutter/usecases/get_cached_surveys_use_case.dart';
 import 'package:survey_flutter/usecases/get_surveys_use_case.dart';
 
 int _pageNumber = 1;
-const _pageSize = 5;
+const _pageSize = 10;
 List<SurveyModel> _loadedSurveys = [];
 
 final homeViewModelProvider =
@@ -40,14 +40,11 @@ class HomeViewModel extends StateNotifier<HomeState> {
   Stream<String> get error => _error.stream;
 
   void _handleError(Failed result) {
-    var errorMessage = result.getErrorMessage();
-    var isNotFoundError = result.isNotFoundError();
-
-    if (isNotFoundError) {
+    if (result.isNotFoundError()) {
       _surveys.add(_loadedSurveys);
       state = const HomeState.loadSurveysSuccess(false);
     } else {
-      _error.add(errorMessage);
+      _error.add(result.getErrorMessage());
       state = const HomeState.error();
     }
   }