Navigate bug fixes