some navigation fixes