fix AV;
Merge remote-tracking branch 'origin/master'
Fix product list layout