Add work by task view
Add workload feature
Refactoring