Fixing bug
Fixing CollectionView Error Layout Bug
Updating code
Merge pull request #1 from ChilokWang/master

Updating Proj