More changes to the routing and page setup.