fixed navigation bar design
fixing merge conflicts