Simplified navigation logic.