fixes to navigation