reworked wishlist and collection views