Improved navigation. Fixes #9