Refactor to remove ListView from adapter.