more fixes to collection view