Some reworking with the UI.