page navigator refactored pt.2