Added to show all employee in Tasks, fixed return buttons
Merged the two versions