more navigation bugs fixed