Navigation buttons

Tweaked navigation