navigation fixes