Move arrows mapping in proper place