Add task view, fixes