Fixed bugs with saving forms