Clean and robust UICollectionView management