More clean up to collectionView, glitchy view bug fixed.