diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index 049936f..0aa7e48 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -9,8 +9,8 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
         case YON_PAGE_LICENCE: return YON_PAGE_SECTIONS; break;
         case YON_PAGE_SECTIONS: return yon_sections_get_next_page(widgets); break;
         case YON_PAGE_OS_COMPONENTS: return YON_PAGE_INSTALLATION_BEGIN; break;
-        case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_CONFIG_HUB; break;
+        case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_CONFIG_HUB: return YON_PAGE_INSTALLATION; break;
         case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_KERNEL_ADDON: return YON_PAGE_CONFIG_HUB; break;
@@ -53,8 +53,8 @@ enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){
         case YON_PAGE_LICENCE: return YON_PAGE_WELCOME; break;
         case YON_PAGE_SECTIONS: return YON_PAGE_LICENCE; break;
         case YON_PAGE_OS_COMPONENTS: return YON_PAGE_SECTIONS; break;
+        case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_OS_COMPONENTS; break;
         case YON_PAGE_SOFTWARE: return YON_PAGE_CONFIG_HUB; break;
-        case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_CONFIG_HUB: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_KERNEL: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_KERNEL_ADDON: return YON_PAGE_CONFIG_HUB; break;
@@ -65,7 +65,7 @@ enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){
         case YON_PAGE_STARTUP: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_BOOTLOADER: return YON_PAGE_CONFIG_HUB; break;
         case YON_PAGE_NETWORK: return YON_PAGE_CONFIG_HUB; break;
-        case YON_PAGE_PACKAGES: return YON_PAGE_NETWORK;
+        case YON_PAGE_PACKAGES: return YON_PAGE_CONFIG_HUB;
         case YON_PAGE_INSTALLATION: return YON_PAGE_INSTALLATION; break;
         case YON_PAGE_CONFIGURE_END: return YON_PAGE_CONFIGURE_END; break;
         case YON_PAGE_INSTALL_COMMON: return YON_PAGE_SECTIONS; break;