diff --git a/components/product/tasting-notes.tsx b/components/product/tasting-notes.tsx
index eae26cda4..cf476d3ed 100644
--- a/components/product/tasting-notes.tsx
+++ b/components/product/tasting-notes.tsx
@@ -15,13 +15,13 @@ export function ProductTastingNotes({ product }: { product: Product }) {
   return (
     <div className="flex flex-col justify-between space-y-6 px-6 md:flex-row md:items-end md:space-x-12 md:space-y-0">
       {!!notes ? (
-        <div className="flex w-1/2 flex-col space-y-4">
-          <h2 className="font-multilingual text-[38px] leading-tight">tasting notes</h2>
+        <div className="font-multilingual flex flex-col space-y-4 md:min-w-[120px] md:max-w-sm">
+          <h2 className="text-[38px] leading-tight">tasting notes</h2>
           <div className="flex w-full flex-row justify-end whitespace-pre-line">{notes}</div>
         </div>
       ) : null}
       {imageUrl && imageHeight && imageWidth && (
-        <div>
+        <div className="md:w-2/3">
           <Image
             src={imageUrl}
             width={imageWidth}
diff --git a/lib/shopify/mutations/cart.ts b/lib/shopify/mutations/cart.ts
index 07e3d02d1..4cc1b5ac6 100644
--- a/lib/shopify/mutations/cart.ts
+++ b/lib/shopify/mutations/cart.ts
@@ -1,12 +1,7 @@
 import cartFragment from '../fragments/cart';
 
 export const addToCartMutation = /* GraphQL */ `
-  mutation addToCart(
-    $cartId: ID!
-    $lines: [CartLineInput!]!
-    $country: CountryCode
-    $language: LanguageCode
-  ) @inContext($country: String, $language: String) {
+  mutation addToCart($cartId: ID!, $lines: [CartLineInput!]!) {
     cartLinesAdd(cartId: $cartId, lines: $lines) {
       cart {
         ...cart
@@ -17,11 +12,7 @@ export const addToCartMutation = /* GraphQL */ `
 `;
 
 export const createCartMutation = /* GraphQL */ `
-  mutation createCart(
-    $lineItems: [CartLineInput!],
-    $country: CountryCode,
-    $language: LanguageCode
-  )  @inContext($country: String, $language: String) {
+  mutation createCart($lineItems: [CartLineInput!]) {
     cartCreate(input: { lines: $lineItems }) {
       cart {
         ...cart
@@ -32,8 +23,7 @@ export const createCartMutation = /* GraphQL */ `
 `;
 
 export const editCartItemsMutation = /* GraphQL */ `
-  mutation editCartItems($cartId: ID!, $lines: [CartLineUpdateInput!]!, $country: CountryCode, $language: LanguageCode) 
-  @inContext($country: String, $language: String) {
+  mutation editCartItems($cartId: ID!, $lines: [CartLineUpdateInput!]!) {
     cartLinesUpdate(cartId: $cartId, lines: $lines) {
       cart {
         ...cart
@@ -44,8 +34,7 @@ export const editCartItemsMutation = /* GraphQL */ `
 `;
 
 export const removeFromCartMutation = /* GraphQL */ `
-  mutation removeFromCart($cartId: ID!, $lineIds: [ID!]!, $country: CountryCode, $language: LanguageCode) 
-  @inContext($country: String, $language: String) {
+  mutation removeFromCart($cartId: ID!, $lineIds: [ID!]!) {
     cartLinesRemove(cartId: $cartId, lineIds: $lineIds) {
       cart {
         ...cart