Improve navigate calling in router