recommitting all my changes yet.
Merge pull request #1197 from shashvattrip/develop

Partial MIFOSX-1580 solved. Navigation bugs.