Fixed navigation bugs.