The much needed navigation and locator fixes
removed the navigator
Merge pull request #454 from kbidarkar/temp-fixsearch

The much needed navigation and locator fixes