enhance move steps behaviour into confirm template