changes to facilitate better control over save/cancel button