Get rid of some test-code that shouldn't have gone in (65d94071a482cd035d11acc3f3dac7973c06c661)
Small adjustments to the settings form placement of controls and rename 'Clear' button to 'Default' (because that's what it actually does)