Added Icons to CollectionView and small changes