refactored navbar