refactored simple navigation