Refactored navigation
Merge pull request #48 from KevinHuebner/master

Refactored navigation