Second commit / organization of the navigation across all the pages.