Improved the settings screen