Save and Finalize button behavior corrected