Fixed navbar + other changes