rearrange, current location on route map

[ci skip]