Ux improvement, merge after contract-migration