fixing save btn issues