Refactor of task buttons