Refactored navigation into separate file