fixed navigation bugs