Refactoring, navigation finished.