More improvements to Navigaton module.