Fiiinally fixed all navigation bugs. Hopefully