Fixed navigation bugs
Fixed navigation bugs