UI cleanup, config layering, bug fixes, etc