More changes on settings