new fixes for navigation