Some more work done on the settings editor.