some fixes for the collection view