Fixed navbar issue and stuff