Made some changes to CollectionView behavior