Refactoring UI and data-concept handling (part 5).