Fixes some navigation bugs