Improvements to the settings page