Updated Save&Close and Save&AddAnother buttons, CORE-557