fix nav bar naming issues