Navigation fixes
Merge pull request #48 from artur-polcode/dev

Navigation fixes