Revert back to UICollectionView. Fix possible crash when there are no sections yet