- general navigation fixes