Fixed navigation bugs
Fixed pull request merge