Corrected some navigation errors