Some work on the settings interface