Refactored the navigation bar