fixing navbar
fixing navbar
merging