TaskViewBuilder refactoring, continued