Fixed navbar issues