Navbar changes
Merge conflicts