Fixed navbar bugs