Fixed wishlist components (part 1)