Fixed navigation bugs