Adding popup for collectionView, bugs fixed