Refactor task displaying WIP