modified taskActivity and tasksActivity