Refactor navigation.