Improvements in the settings options