Additional work on the settings page