various changes to navigation