Improve navigation. Fixes #8