SSP-677 Save and cancel button consistency