Fix Save and Cancel button alignment