Navigation changes

For your review. Will squash em before merge, but leaving the commits for clairity.

Btw, testing on the Keon the buttons act very bad! Is the click event the wrong event?