Settings beautified, Due To bug fixed