Grouped results by work and changed UI
Solved merge conflicts