clean up & nav fix