SSP-677 Save and Cancel button consistency