Fixed collection view issues