Fixed some navigation bugs.