Refactor CollectionView and Cursor