- navigation fixes