Fix nav controller
Merge pull request #44 from amitburst/navctrl

Fix nav controller