Refactored navigation feature

Fixed grading tests