More config, UI

(Forgot to commit last night's work)