saving and done button flow implemented