Page routing refactor