WIP enhancements to UI.