fixin some navigation bugs