WIP further work on the settings menu