fixed a few navigation bugs :)