bug fixes to navigation issues