Navigation, added more checks and fixes