diff --git a/README.md b/README.md
index fbbbbf26b..8be54816a 100644
--- a/README.md
+++ b/README.md
@@ -90,8 +90,8 @@ Our commitment to Open Source can be found [here](https://vercel.com/oss).
 5. Duplicate `.env.template` and rename it to `.env.local`.
 6. Add proper store values to `.env.local`.
 7. Run `yarn dev` to build and watch for code changes
-8. The development branch is `development` (this is the branch pull requests should be made against).
-   On a release, `develop` branch is rebased into `master`.
+8. The development branch is `canary` (this is the branch pull requests should be made against).
+   On a release, `canary` branch is rebased into `master`.
 
 ## Framework
 
diff --git a/assets/base.css b/assets/base.css
index 781ebe0ac..f854065ba 100644
--- a/assets/base.css
+++ b/assets/base.css
@@ -102,8 +102,6 @@ a {
 }
 
 .animated {
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
   -webkit-animation-duration: 1s;
   animation-duration: 1s;
   -webkit-animation-fill-mode: both;
diff --git a/components/cart/CartItem/CartItem.tsx b/components/cart/CartItem/CartItem.tsx
index 1e9062e91..87fb86d0b 100644
--- a/components/cart/CartItem/CartItem.tsx
+++ b/components/cart/CartItem/CartItem.tsx
@@ -10,7 +10,14 @@ import usePrice from '@framework/product/use-price'
 import useUpdateItem from '@framework/cart/use-update-item'
 import useRemoveItem from '@framework/cart/use-remove-item'
 
-const Item = ({
+type ItemOption = {
+  name: string
+  nameId: number
+  value: string
+  valueId: number
+}
+
+const CartItem = ({
   item,
   currencyCode,
   ...rest
@@ -63,7 +70,7 @@ const Item = ({
     try {
       // If this action succeeds then there's no need to do `setRemoving(true)`
       // because the component will be removed from the view
-      await removeItem({ id: String(item.id) })
+      await removeItem(item)
     } catch (error) {
       setRemoving(false)
     }
@@ -96,14 +103,26 @@ const Item = ({
       <div className="flex-1 flex flex-col text-base">
         <Link href={`/product/${item.path}`}>
           <span
-            className="font-bold mb-5 text-lg cursor-pointer"
+            className="font-bold text-lg cursor-pointer leading-6"
             onClick={() => closeSidebarIfPresent()}
           >
             {item.name}
           </span>
         </Link>
-
-        <div className="flex items-center">
+        {item.options && item.options.length > 0 ? (
+          <div className="">
+            {item.options.map((option: ItemOption, i: number) => (
+              <span
+                key={`${item.id}-${option.name}`}
+                className="text-sm font-semibold text-accents-7"
+              >
+                {option.value}
+                {i === item.options.length - 1 ? '' : ', '}
+              </span>
+            ))}
+          </div>
+        ) : null}
+        <div className="flex items-center mt-3">
           <button type="button" onClick={() => increaseQuantity(-1)}>
             <Minus width={18} height={18} />
           </button>
@@ -136,4 +155,4 @@ const Item = ({
   )
 }
 
-export default Item
+export default CartItem
diff --git a/components/common/Avatar/Avatar.tsx b/components/common/Avatar/Avatar.tsx
index 6ea72abb2..351a117ec 100644
--- a/components/common/Avatar/Avatar.tsx
+++ b/components/common/Avatar/Avatar.tsx
@@ -1,4 +1,3 @@
-import cn from 'classnames'
 import { FC, useState, useMemo, useRef, useEffect } from 'react'
 import { getRandomPairOfColors } from '@lib/colors'
 
diff --git a/components/common/I18nWidget/I18nWidget.module.css b/components/common/I18nWidget/I18nWidget.module.css
index 07a1aeba7..b216f5706 100644
--- a/components/common/I18nWidget/I18nWidget.module.css
+++ b/components/common/I18nWidget/I18nWidget.module.css
@@ -29,7 +29,7 @@
 }
 
 .item {
-  @apply flex cursor-pointer px-6 py-3 flex transition ease-in-out duration-150 text-primary leading-6 font-medium items-center;
+  @apply flex cursor-pointer px-6 py-3 transition ease-in-out duration-150 text-primary leading-6 font-medium items-center;
   text-transform: capitalize;
 }
 
diff --git a/components/common/Layout/Layout.tsx b/components/common/Layout/Layout.tsx
index 0490dbb19..204c3a871 100644
--- a/components/common/Layout/Layout.tsx
+++ b/components/common/Layout/Layout.tsx
@@ -62,16 +62,16 @@ const Layout: FC<Props> = ({ children, pageProps }) => {
         <main className="fit">{children}</main>
         <Footer pages={pageProps.pages} />
 
-        <Sidebar open={displaySidebar} onClose={closeSidebar}>
-          <CartSidebarView />
-        </Sidebar>
-
         <Modal open={displayModal} onClose={closeModal}>
           {modalView === 'LOGIN_VIEW' && <LoginView />}
           {modalView === 'SIGNUP_VIEW' && <SignUpView />}
           {modalView === 'FORGOT_VIEW' && <ForgotPassword />}
         </Modal>
 
+        <Sidebar open={displaySidebar} onClose={closeSidebar}>
+          <CartSidebarView />
+        </Sidebar>
+
         <FeatureBar
           title="This site uses cookies to improve your experience. By clicking, you agree to our Privacy Policy."
           hide={acceptedCookies}
diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx
index 58ba11e10..464f097e8 100644
--- a/components/product/ProductCard/ProductCard.tsx
+++ b/components/product/ProductCard/ProductCard.tsx
@@ -12,76 +12,74 @@ interface Props {
   imgProps?: Omit<ImageProps, 'src'>
 }
 
+const placeholderImg = '/product-img-placeholder.svg'
+
 const ProductCard: FC<Props> = ({
   className,
   product,
   variant,
   imgProps,
   ...props
-}) => {
-  return (
-    <Link href={`/product/${product.slug}`} {...props}>
-      <a
-        className={cn(s.root, { [s.simple]: variant === 'simple' }, className)}
-      >
-        {variant === 'slim' ? (
-          <div className="relative overflow-hidden box-border">
-            <div className="absolute inset-0 flex items-center justify-end mr-8 z-20">
-              <span className="bg-black text-white inline-block p-3 font-bold text-xl break-words">
-                {product.name}
+}) => (
+  <Link href={`/product/${product.slug}`} {...props}>
+    <a className={cn(s.root, { [s.simple]: variant === 'simple' }, className)}>
+      {variant === 'slim' ? (
+        <div className="relative overflow-hidden box-border">
+          <div className="absolute inset-0 flex items-center justify-end mr-8 z-20">
+            <span className="bg-black text-white inline-block p-3 font-bold text-xl break-words">
+              {product.name}
+            </span>
+          </div>
+          {product?.images && (
+            <Image
+              quality="85"
+              src={product.images[0].url || placeholderImg}
+              alt={product.name || 'Product Image'}
+              height={320}
+              width={320}
+              layout="fixed"
+              {...imgProps}
+            />
+          )}
+        </div>
+      ) : (
+        <>
+          <div className={s.squareBg} />
+          <div className="flex flex-row justify-between box-border w-full z-20 absolute">
+            <div className="absolute top-0 left-0 pr-16 max-w-full">
+              <h3 className={s.productTitle}>
+                <span>{product.name}</span>
+              </h3>
+              <span className={s.productPrice}>
+                {product.price.value}
+                &nbsp;
+                {product.price.currencyCode}
               </span>
             </div>
-            {product?.images && (
-              <Image
-                quality="85"
-                alt={product.name}
-                src={product.images[0].url!}
-                height={320}
-                width={320}
-                layout="fixed"
-                {...imgProps}
-              />
-            )}
-          </div>
-        ) : (
-          <>
-            <div className={s.squareBg} />
-            <div className="flex flex-row justify-between box-border w-full z-20 absolute">
-              <div className="absolute top-0 left-0 pr-16 max-w-full">
-                <h3 className={s.productTitle}>
-                  <span>{product.name}</span>
-                </h3>
-                <span className={s.productPrice}>
-                  {product.price.value}
-                  &nbsp;
-                  {product.price.currencyCode}
-                </span>
-              </div>
-              {/* <WishlistButton
+            {/* <WishlistButton
                 className={s.wishlistButton}
                 productId={product.id}
                 variant={product.variants[0]}
               /> */}
-            </div>
-            <div className={s.imageContainer}>
-              {product?.images && (
-                <Image
-                  alt={product.name}
-                  className={s.productImage}
-                  src={product.images[0].url}
-                  height={540}
-                  width={540}
-                  quality="85"
-                  layout="responsive"
-                  {...imgProps}
-                />
-              )}
-            </div>
-          </>
-        )}
-      </a>
-    </Link>
-  )
-}
+          </div>
+          <div className={s.imageContainer}>
+            {product?.images && (
+              <Image
+                alt={product.name || 'Product Image'}
+                className={s.productImage}
+                src={product.images[0].url || placeholderImg}
+                height={540}
+                width={540}
+                quality="85"
+                layout="responsive"
+                {...imgProps}
+              />
+            )}
+          </div>
+        </>
+      )}
+    </a>
+  </Link>
+)
 
 export default ProductCard
diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx
index 448dfb10a..8aabfbd79 100644
--- a/components/product/ProductView/ProductView.tsx
+++ b/components/product/ProductView/ProductView.tsx
@@ -40,10 +40,8 @@ const ProductView: FC<Props> = ({ product }) => {
     setLoading(true)
     try {
       await addItem({
-        productId: Number(product.id),
-        variantId: variant
-          ? Number(variant.id)
-          : Number(product.variants[0].id),
+        productId: product.id,
+        variantId: variant ? variant.id : product.variants[0].id,
       })
       openSidebar()
       setLoading(false)
diff --git a/components/ui/context.tsx b/components/ui/context.tsx
index 096e2f865..206573858 100644
--- a/components/ui/context.tsx
+++ b/components/ui/context.tsx
@@ -90,6 +90,7 @@ function uiReducer(state: State, action: Action) {
       return {
         ...state,
         displayModal: true,
+        displaySidebar: false,
       }
     }
     case 'CLOSE_MODAL': {
diff --git a/framework/bigcommerce/api/cart/handlers/add-item.ts b/framework/bigcommerce/api/cart/handlers/add-item.ts
index f58a6c43c..c47e72cdb 100644
--- a/framework/bigcommerce/api/cart/handlers/add-item.ts
+++ b/framework/bigcommerce/api/cart/handlers/add-item.ts
@@ -25,8 +25,14 @@ const addItem: CartHandlers['addItem'] = async ({
     }),
   }
   const { data } = cartId
-    ? await config.storeApiFetch(`/v3/carts/${cartId}/items`, options)
-    : await config.storeApiFetch('/v3/carts', options)
+    ? await config.storeApiFetch(
+        `/v3/carts/${cartId}/items?include=line_items.physical_items.options`,
+        options
+      )
+    : await config.storeApiFetch(
+        '/v3/carts?include=line_items.physical_items.options',
+        options
+      )
 
   // Create or update the cart cookie
   res.setHeader(
diff --git a/framework/bigcommerce/api/cart/handlers/get-cart.ts b/framework/bigcommerce/api/cart/handlers/get-cart.ts
index 9fb42d730..890ac9997 100644
--- a/framework/bigcommerce/api/cart/handlers/get-cart.ts
+++ b/framework/bigcommerce/api/cart/handlers/get-cart.ts
@@ -1,6 +1,7 @@
+import type { BigcommerceCart } from '../../../types'
 import { BigcommerceApiError } from '../../utils/errors'
 import getCartCookie from '../../utils/get-cart-cookie'
-import type { Cart, CartHandlers } from '..'
+import type { CartHandlers } from '../'
 
 // Return current cart info
 const getCart: CartHandlers['getCart'] = async ({
@@ -8,11 +9,13 @@ const getCart: CartHandlers['getCart'] = async ({
   body: { cartId },
   config,
 }) => {
-  let result: { data?: Cart } = {}
+  let result: { data?: BigcommerceCart } = {}
 
   if (cartId) {
     try {
-      result = await config.storeApiFetch(`/v3/carts/${cartId}`)
+      result = await config.storeApiFetch(
+        `/v3/carts/${cartId}?include=line_items.physical_items.options`
+      )
     } catch (error) {
       if (error instanceof BigcommerceApiError && error.status === 404) {
         // Remove the cookie if it exists but the cart wasn't found
diff --git a/framework/bigcommerce/api/cart/handlers/remove-item.ts b/framework/bigcommerce/api/cart/handlers/remove-item.ts
index c980cbb42..c09848948 100644
--- a/framework/bigcommerce/api/cart/handlers/remove-item.ts
+++ b/framework/bigcommerce/api/cart/handlers/remove-item.ts
@@ -14,7 +14,7 @@ const removeItem: CartHandlers['removeItem'] = async ({
   }
 
   const result = await config.storeApiFetch<{ data: any } | null>(
-    `/v3/carts/${cartId}/items/${itemId}`,
+    `/v3/carts/${cartId}/items/${itemId}?include=line_items.physical_items.options`,
     { method: 'DELETE' }
   )
   const data = result?.data ?? null
diff --git a/framework/bigcommerce/api/cart/handlers/update-item.ts b/framework/bigcommerce/api/cart/handlers/update-item.ts
index b0ccc710b..27b74ca20 100644
--- a/framework/bigcommerce/api/cart/handlers/update-item.ts
+++ b/framework/bigcommerce/api/cart/handlers/update-item.ts
@@ -14,11 +14,8 @@ const updateItem: CartHandlers['updateItem'] = async ({
     })
   }
 
-  console.log('ITEM', item)
-  console.log('AFTER', parseCartItem(item))
-
   const { data } = await config.storeApiFetch(
-    `/v3/carts/${cartId}/items/${itemId}`,
+    `/v3/carts/${cartId}/items/${itemId}?include=line_items.physical_items.options`,
     {
       method: 'PUT',
       body: JSON.stringify({
diff --git a/framework/bigcommerce/api/cart/index.ts b/framework/bigcommerce/api/cart/index.ts
index 0f0365cc3..4ee668895 100644
--- a/framework/bigcommerce/api/cart/index.ts
+++ b/framework/bigcommerce/api/cart/index.ts
@@ -8,38 +8,25 @@ import getCart from './handlers/get-cart'
 import addItem from './handlers/add-item'
 import updateItem from './handlers/update-item'
 import removeItem from './handlers/remove-item'
-import type { Cart, UpdateCartItemHandlerBody } from '../../types'
-
-type OptionSelections = {
-  option_id: Number
-  option_value: Number | String
-}
-
-export type ItemBody = {
-  productId: number
-  variantId: number
-  quantity?: number
-  optionSelections?: OptionSelections
-}
-
-export type AddItemBody = { item: ItemBody }
-
-export type RemoveItemBody = { itemId: string }
+import type {
+  BigcommerceCart,
+  GetCartHandlerBody,
+  AddCartItemHandlerBody,
+  UpdateCartItemHandlerBody,
+  RemoveCartItemHandlerBody,
+} from '../../types'
 
 export type CartHandlers = {
-  getCart: BigcommerceHandler<Cart, { cartId?: string }>
-  addItem: BigcommerceHandler<Cart, { cartId?: string } & Partial<AddItemBody>>
-  updateItem: BigcommerceHandler<Cart, UpdateCartItemHandlerBody>
-  removeItem: BigcommerceHandler<
-    Cart,
-    { cartId?: string } & Partial<RemoveItemBody>
-  >
+  getCart: BigcommerceHandler<BigcommerceCart, GetCartHandlerBody>
+  addItem: BigcommerceHandler<BigcommerceCart, AddCartItemHandlerBody>
+  updateItem: BigcommerceHandler<BigcommerceCart, UpdateCartItemHandlerBody>
+  removeItem: BigcommerceHandler<BigcommerceCart, RemoveCartItemHandlerBody>
 }
 
 const METHODS = ['GET', 'POST', 'PUT', 'DELETE']
 
 // TODO: a complete implementation should have schema validation for `req.body`
-const cartApi: BigcommerceApiHandler<Cart, CartHandlers> = async (
+const cartApi: BigcommerceApiHandler<BigcommerceCart, CartHandlers> = async (
   req,
   res,
   config,
diff --git a/framework/bigcommerce/cart/use-add-item.tsx b/framework/bigcommerce/cart/use-add-item.tsx
index 38ac69650..c66ee462a 100644
--- a/framework/bigcommerce/cart/use-add-item.tsx
+++ b/framework/bigcommerce/cart/use-add-item.tsx
@@ -1,13 +1,16 @@
 import { useCallback } from 'react'
 import type { HookFetcher } from '@commerce/utils/types'
 import { CommerceError } from '@commerce/utils/errors'
-import useCartAddItem from '@commerce/cart/use-add-item'
+import useCartAddItem, {
+  AddItemInput as UseAddItemInput,
+} from '@commerce/cart/use-add-item'
 import { normalizeCart } from '../lib/normalize'
 import type {
-  ItemBody,
-  AddItemBody,
-  Cart as BigcommerceCart,
-} from '../api/cart'
+  AddCartItemBody,
+  Cart,
+  BigcommerceCart,
+  CartItemBody,
+} from '../types'
 import useCart from './use-cart'
 
 const defaultOpts = {
@@ -15,9 +18,9 @@ const defaultOpts = {
   method: 'POST',
 }
 
-export type AddItemInput = ItemBody
+export type AddItemInput = UseAddItemInput<CartItemBody>
 
-export const fetcher: HookFetcher<Cart, AddItemBody> = async (
+export const fetcher: HookFetcher<Cart, AddCartItemBody> = async (
   options,
   { item },
   fetch
@@ -31,7 +34,7 @@ export const fetcher: HookFetcher<Cart, AddItemBody> = async (
     })
   }
 
-  const data = await fetch<BigcommerceCart>({
+  const data = await fetch<BigcommerceCart, AddCartItemBody>({
     ...defaultOpts,
     ...options,
     body: { item },
diff --git a/framework/bigcommerce/cart/use-cart.tsx b/framework/bigcommerce/cart/use-cart.tsx
index 8e008c65a..afa37ec98 100644
--- a/framework/bigcommerce/cart/use-cart.tsx
+++ b/framework/bigcommerce/cart/use-cart.tsx
@@ -3,7 +3,7 @@ import type { SwrOptions } from '@commerce/utils/use-data'
 import useResponse from '@commerce/utils/use-response'
 import useCommerceCart, { CartInput } from '@commerce/cart/use-cart'
 import { normalizeCart } from '../lib/normalize'
-import type { Cart as BigcommerceCart } from '../api/cart'
+import type { Cart, BigcommerceCart } from '../types'
 
 const defaultOpts = {
   url: '/api/bigcommerce/cart',
diff --git a/framework/bigcommerce/cart/use-remove-item.tsx b/framework/bigcommerce/cart/use-remove-item.tsx
index 6f25c0c9e..c8cdaeb0d 100644
--- a/framework/bigcommerce/cart/use-remove-item.tsx
+++ b/framework/bigcommerce/cart/use-remove-item.tsx
@@ -1,8 +1,16 @@
 import { useCallback } from 'react'
 import { HookFetcher } from '@commerce/utils/types'
-import useCartRemoveItem from '@commerce/cart/use-remove-item'
+import { ValidationError } from '@commerce/utils/errors'
+import useCartRemoveItem, {
+  RemoveItemInput as UseRemoveItemInput,
+} from '@commerce/cart/use-remove-item'
 import { normalizeCart } from '../lib/normalize'
-import type { RemoveItemBody, Cart as BigcommerceCart } from '../api/cart'
+import type {
+  RemoveCartItemBody,
+  Cart,
+  BigcommerceCart,
+  LineItem,
+} from '../types'
 import useCart from './use-cart'
 
 const defaultOpts = {
@@ -10,11 +18,15 @@ const defaultOpts = {
   method: 'DELETE',
 }
 
-export type RemoveItemInput = {
-  id: string
-}
+export type RemoveItemFn<T = any> = T extends LineItem
+  ? (input?: RemoveItemInput<T>) => Promise<Cart | null>
+  : (input: RemoveItemInput<T>) => Promise<Cart | null>
 
-export const fetcher: HookFetcher<Cart | null, RemoveItemBody> = async (
+export type RemoveItemInput<T = any> = T extends LineItem
+  ? Partial<UseRemoveItemInput>
+  : UseRemoveItemInput
+
+export const fetcher: HookFetcher<Cart | null, RemoveCartItemBody> = async (
   options,
   { itemId },
   fetch
@@ -28,21 +40,29 @@ export const fetcher: HookFetcher<Cart | null, RemoveItemBody> = async (
 }
 
 export function extendHook(customFetcher: typeof fetcher) {
-  const useRemoveItem = (item?: any) => {
+  const useRemoveItem = <T extends LineItem | undefined = undefined>(
+    item?: T
+  ) => {
     const { mutate } = useCart()
-    const fn = useCartRemoveItem<Cart | null, RemoveItemBody>(
+    const fn = useCartRemoveItem<Cart | null, RemoveCartItemBody>(
       defaultOpts,
       customFetcher
     )
+    const removeItem: RemoveItemFn<LineItem> = async (input) => {
+      const itemId = input?.id ?? item?.id
 
-    return useCallback(
-      async function removeItem(input: RemoveItemInput) {
-        const data = await fn({ itemId: input.id ?? item?.id })
-        await mutate(data, false)
-        return data
-      },
-      [fn, mutate]
-    )
+      if (!itemId) {
+        throw new ValidationError({
+          message: 'Invalid input used for this operation',
+        })
+      }
+
+      const data = await fn({ itemId })
+      await mutate(data, false)
+      return data
+    }
+
+    return useCallback(removeItem as RemoveItemFn<T>, [fn, mutate])
   }
 
   useRemoveItem.extend = extendHook
diff --git a/framework/bigcommerce/cart/use-update-item.tsx b/framework/bigcommerce/cart/use-update-item.tsx
index 6592b090f..d1870c818 100644
--- a/framework/bigcommerce/cart/use-update-item.tsx
+++ b/framework/bigcommerce/cart/use-update-item.tsx
@@ -2,11 +2,12 @@ import { useCallback } from 'react'
 import debounce from 'lodash.debounce'
 import type { HookFetcher } from '@commerce/utils/types'
 import { ValidationError } from '@commerce/utils/errors'
-import useCartUpdateItem from '@commerce/cart/use-update-item'
+import useCartUpdateItem, {
+  UpdateItemInput as UseUpdateItemInput,
+} from '@commerce/cart/use-update-item'
 import { normalizeCart } from '../lib/normalize'
 import type {
   UpdateCartItemBody,
-  UpdateCartItemInput,
   Cart,
   BigcommerceCart,
   LineItem,
@@ -19,6 +20,10 @@ const defaultOpts = {
   method: 'PUT',
 }
 
+export type UpdateItemInput<T = any> = T extends LineItem
+  ? Partial<UseUpdateItemInput<LineItem>>
+  : UseUpdateItemInput<LineItem>
+
 export const fetcher: HookFetcher<Cart | null, UpdateCartItemBody> = async (
   options,
   { itemId, item },
@@ -55,31 +60,24 @@ function extendHook(customFetcher: typeof fetcher, cfg?: { wait?: number }) {
     )
 
     return useCallback(
-      debounce(
-        async (
-          input: T extends LineItem
-            ? Partial<UpdateCartItemInput>
-            : UpdateCartItemInput
-        ) => {
-          const itemId = input.id ?? item?.id
-          const productId = input.productId ?? item?.productId
-          const variantId = input.productId ?? item?.variantId
+      debounce(async (input: UpdateItemInput<T>) => {
+        const itemId = input.id ?? item?.id
+        const productId = input.productId ?? item?.productId
+        const variantId = input.productId ?? item?.variantId
 
-          if (!itemId || !productId || !variantId) {
-            throw new ValidationError({
-              message: 'Invalid input used for this operation',
-            })
-          }
-
-          const data = await fn({
-            itemId,
-            item: { productId, variantId, quantity: input.quantity },
+        if (!itemId || !productId || !variantId) {
+          throw new ValidationError({
+            message: 'Invalid input used for this operation',
           })
-          await mutate(data, false)
-          return data
-        },
-        cfg?.wait ?? 500
-      ),
+        }
+
+        const data = await fn({
+          itemId,
+          item: { productId, variantId, quantity: input.quantity },
+        })
+        await mutate(data, false)
+        return data
+      }, cfg?.wait ?? 500),
       [fn, mutate]
     )
   }
diff --git a/framework/bigcommerce/product/use-search.tsx b/framework/bigcommerce/product/use-search.tsx
index ade0bbca2..2b4ee7593 100644
--- a/framework/bigcommerce/product/use-search.tsx
+++ b/framework/bigcommerce/product/use-search.tsx
@@ -26,8 +26,7 @@ export const fetcher: HookFetcher<SearchProductsData, SearchProductsInput> = (
   if (search) url.searchParams.set('search', search)
   if (Number.isInteger(categoryId))
     url.searchParams.set('category', String(categoryId))
-  if (Number.isInteger(categoryId))
-    url.searchParams.set('brand', String(brandId))
+  if (Number.isInteger(brandId)) url.searchParams.set('brand', String(brandId))
   if (sort) url.searchParams.set('sort', sort)
 
   return fetch({
diff --git a/framework/bigcommerce/types.ts b/framework/bigcommerce/types.ts
index 766f2dbe9..90afb425d 100644
--- a/framework/bigcommerce/types.ts
+++ b/framework/bigcommerce/types.ts
@@ -43,12 +43,20 @@ export interface CartItemBody extends Core.CartItemBody {
   optionSelections?: OptionSelections
 }
 
-export interface UpdateCartItemBody extends Core.UpdateCartItemBody {
-  item: CartItemBody
-}
+export interface GetCartHandlerBody extends Core.GetCartHandlerBody {}
 
-export interface UpdateCartItemInput
-  extends Core.UpdateCartItemInput<CartItemBody> {}
+export interface AddCartItemBody extends Core.AddCartItemBody<CartItemBody> {}
+
+export interface AddCartItemHandlerBody
+  extends Core.AddCartItemHandlerBody<CartItemBody> {}
+
+export interface UpdateCartItemBody
+  extends Core.UpdateCartItemBody<CartItemBody> {}
 
 export interface UpdateCartItemHandlerBody
-  extends Core.UpdateCartItemHandlerBody {}
+  extends Core.UpdateCartItemHandlerBody<CartItemBody> {}
+
+export interface RemoveCartItemBody extends Core.RemoveCartItemBody {}
+
+export interface RemoveCartItemHandlerBody
+  extends Core.RemoveCartItemHandlerBody {}
diff --git a/framework/commerce/cart/use-add-item.tsx b/framework/commerce/cart/use-add-item.tsx
index f6c069f2b..2f6422ab3 100644
--- a/framework/commerce/cart/use-add-item.tsx
+++ b/framework/commerce/cart/use-add-item.tsx
@@ -1,4 +1,8 @@
 import useAction from '../utils/use-action'
+import type { CartItemBody } from '../types'
+
+// Input expected by the action returned by the `useAddItem` hook
+export type AddItemInput<T extends CartItemBody> = T
 
 const useAddItem = useAction
 
diff --git a/framework/commerce/cart/use-cart.tsx b/framework/commerce/cart/use-cart.tsx
index 94ccb73fc..0a7ba49ee 100644
--- a/framework/commerce/cart/use-cart.tsx
+++ b/framework/commerce/cart/use-cart.tsx
@@ -6,6 +6,7 @@ import { useCommerce } from '..'
 
 export type CartResponse<Data> = ResponseState<Data> & { isEmpty?: boolean }
 
+// Input expected by the `useCart` hook
 export type CartInput = {
   cartId?: Cart['id']
 }
diff --git a/framework/commerce/cart/use-remove-item.tsx b/framework/commerce/cart/use-remove-item.tsx
index dfa60c363..8a63b1b73 100644
--- a/framework/commerce/cart/use-remove-item.tsx
+++ b/framework/commerce/cart/use-remove-item.tsx
@@ -1,5 +1,10 @@
 import useAction from '../utils/use-action'
 
+// Input expected by the action returned by the `useRemoveItem` hook
+export interface RemoveItemInput {
+  id: string
+}
+
 const useRemoveItem = useAction
 
 export default useRemoveItem
diff --git a/framework/commerce/cart/use-update-item.tsx b/framework/commerce/cart/use-update-item.tsx
index 1c6261054..e1adcb5fb 100644
--- a/framework/commerce/cart/use-update-item.tsx
+++ b/framework/commerce/cart/use-update-item.tsx
@@ -1,4 +1,10 @@
 import useAction from '../utils/use-action'
+import type { CartItemBody } from '../types'
+
+// Input expected by the action returned by the `useUpdateItem` hook
+export type UpdateItemInput<T extends CartItemBody> = T & {
+  id: string
+}
 
 const useUpdateItem = useAction
 
diff --git a/framework/commerce/types.ts b/framework/commerce/types.ts
index c662077a1..cc04f52e1 100644
--- a/framework/commerce/types.ts
+++ b/framework/commerce/types.ts
@@ -87,6 +87,10 @@ export interface Cart {
   discounts?: Discount[]
 }
 
+/**
+ * Cart mutations
+ */
+
 // Base cart item body used for cart mutations
 export interface CartItemBody {
   variantId: string
@@ -94,18 +98,40 @@ export interface CartItemBody {
   quantity?: number
 }
 
-// Body by the update operation
-export interface UpdateCartItemBody {
-  itemId: string
-  item: CartItemBody
-}
-
-// Input expected by the `useUpdateItem` hook
-export type UpdateCartItemInput<T extends CartItemBody> = T & {
-  id: string
-}
-
-// Body expected by the update operation handler
-export interface UpdateCartItemHandlerBody extends Partial<UpdateCartItemBody> {
+// Body used by the `getCart` operation handler
+export interface GetCartHandlerBody {
+  cartId?: string
+}
+
+// Body used by the add item to cart operation
+export interface AddCartItemBody<T extends CartItemBody> {
+  item: T
+}
+
+// Body expected by the add item to cart operation handler
+export interface AddCartItemHandlerBody<T extends CartItemBody>
+  extends Partial<AddCartItemBody<T>> {
+  cartId?: string
+}
+
+// Body used by the update cart item operation
+export interface UpdateCartItemBody<T extends CartItemBody> {
+  itemId: string
+  item: T
+}
+
+// Body expected by the update cart item operation handler
+export interface UpdateCartItemHandlerBody<T extends CartItemBody>
+  extends Partial<UpdateCartItemBody<T>> {
+  cartId?: string
+}
+
+// Body used by the remove cart item operation
+export interface RemoveCartItemBody {
+  itemId: string
+}
+
+// Body expected by the remove cart item operation handler
+export interface RemoveCartItemHandlerBody extends Partial<RemoveCartItemBody> {
   cartId?: string
 }
diff --git a/pages/[...pages].tsx b/pages/[...pages].tsx
index 98d7697cd..3f39845b5 100644
--- a/pages/[...pages].tsx
+++ b/pages/[...pages].tsx
@@ -65,7 +65,7 @@ export default function Pages({
   page,
 }: InferGetStaticPropsType<typeof getStaticProps>) {
   return (
-    <div className="max-w-2xl mx-auto py-20">
+    <div className="max-w-2xl mx-8 sm:mx-auto py-20">
       {page?.body && <Text html={page.body} />}
     </div>
   )
diff --git a/pages/cart.tsx b/pages/cart.tsx
index 61b9f632e..8b2dbb57b 100644
--- a/pages/cart.tsx
+++ b/pages/cart.tsx
@@ -4,10 +4,9 @@ import getAllPages from '@framework/common/get-all-pages'
 import useCart from '@framework/cart/use-cart'
 import usePrice from '@framework/product/use-price'
 import { Layout } from '@components/common'
-import { Button } from '@components/ui'
+import { Button, Text } from '@components/ui'
 import { Bag, Cross, Check } from '@components/icons'
 import { CartItem } from '@components/cart'
-import { Text } from '@components/ui'
 
 export async function getStaticProps({
   preview,
diff --git a/public/product-img-placeholder.svg b/public/product-img-placeholder.svg
new file mode 100644
index 000000000..fbb43bb62
--- /dev/null
+++ b/public/product-img-placeholder.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800">
+  <defs/>
+  <g fill="none" fill-rule="nonzero">
+    <path fill="#EAEAEA" d="M0 0h800v800H0z"/>
+    <path fill="#FFF" d="M366.333 365.833c0 5.695-1.993 10.535-5.979 14.521-3.986 3.986-8.826 5.98-14.52 5.98-5.695 0-10.535-1.994-14.522-5.98-3.986-3.986-5.979-8.826-5.979-14.52 0-5.695 1.993-10.535 5.98-14.522 3.986-3.986 8.826-5.979 14.52-5.979 5.695 0 10.535 1.993 14.521 5.98 3.986 3.986 5.98 8.826 5.98 14.52zm109.334 41v47.834H325.333v-20.5L359.5 400l17.083 17.083 54.667-54.666 44.417 44.416zm10.25-75.166H315.083c-.925 0-1.726.338-2.402 1.014-.676.676-1.014 1.477-1.014 2.402v129.834c0 .925.338 1.726 1.014 2.402.676.676 1.477 1.014 2.402 1.014h170.834c.925 0 1.726-.338 2.402-1.014.676-.676 1.014-1.477 1.014-2.402V335.083c0-.925-.338-1.726-1.014-2.402-.676-.676-1.477-1.014-2.402-1.014zM503 335.083v129.834c0 4.698-1.673 8.72-5.018 12.065-3.346 3.345-7.367 5.018-12.065 5.018H315.083c-4.698 0-8.72-1.673-12.065-5.018-3.345-3.346-5.018-7.367-5.018-12.065V335.083c0-4.698 1.673-8.72 5.018-12.065 3.346-3.345 7.367-5.018 12.065-5.018h170.834c4.698 0 8.72 1.673 12.065 5.018 3.345 3.346 5.018 7.367 5.018 12.065z"/>
+  </g>
+</svg>