nav bar yay
fix merge