Javascript fixes
Storefront template/JS fixes