Move page mapping to NavigationContext