Update wishlist buttons

Fixes #854
Fixes #865