Refactored nav bar
Fixing merge conflict