Updated with CollectionView size fixed