More site navigation refactoring