final changes to navigation