Fix navigation selection bug
Merge pull request #34 from agam360/master

Fix navigation selection bug