Refactored navigation.