general navigation fixes
fixes
fixes