Some work on the settings menu