improvs in CollectionView