A bit of cleanup after experimentation
Got a UI for settings to work