Fix Add to Cart, Cart and Account pages