CollectionView: minor changes