refactored nav