Updated CollectionView logic