Improvements to settings page