some more improvements on navigation. still not smooth