more navigation fixes