OZP-10: Refactoring to use CollectionView