Improve TaskView