3 commits coming your way

- old buggy navigation
+ new navigation
+ one annoying bug in navigation :P