Save and continue buttons refactored to be less fragile