Fixed a few navigation errors