navbar changes
fixing merge conflicts