Also pushing product image panel fixes here