Improve navigation
Merge pull request #187 from penibelst/navigation

Improve navigation