Refactorings on navigation.