fixes and constant navigation