*: fixed button madness
templates: wishlist: fixed image changes not being reflected in the actual item
Merge branch 'layout'