collectionview flowlayout bug fixes