Improve navigation across the pages