Improve navigation

The main goal is to improve readability and to break the dependency to `page.id` variable.