CLSN-410 change validation implementation on buttons