Working on the collection view bugs.