Partial MIFOSX-1580 solved. Navigation bugs. 

Sorry for sending a PR with previous commits. I have somehow managed to mangle git. Will fix it in next PR.