fixes

Shop & Basket layout fixes

Interaction tweaks