Completed TaskList refactor and reordering