Improved saving settings