Fixed navbar and removed some unused things