More work on the settings drawer