fixed some navigation bugs