Added TaskModel, refactored tableView code