Some more UI surgery

Some refactor needed, I know (technical debt growing).