Improve Navigaton, Improve changing scale