Refactor task/project/client rendering and selection
Fix tests
Merge branch 'master' into builds
7.146