diff --git a/src/components/molecules/CartItem.svelte b/src/components/molecules/CartItem.svelte
index a87dd98..c67f958 100644
--- a/src/components/molecules/CartItem.svelte
+++ b/src/components/molecules/CartItem.svelte
@@ -1,17 +1,21 @@
 <script lang="ts">
-    import { createEventDispatcher } from 'svelte';
+    import { createEventDispatcher } from 'svelte'
+    // Components
+    import ButtonCircle from '$components/atoms/ButtonCircle.svelte'
+    import Select from '$components/molecules/Select.svelte'
 
     export let item: any
+    export let index: number
 
-    // console.log(item)
     const dispatch = createEventDispatcher()
+    const quantityLimit = 5
 
 
     // When changing item quantity
-    const updateQuantity = ({ target: { value }}: any) => {
+    const updateQuantity = ({ detail }: any) => {
         dispatch('updatedQuantity', {
             id: item.id,
-            quantity: Number(value)
+            quantity: Number(detail)
         })
     }
 
@@ -21,29 +25,39 @@
     }
 </script>
 
-<aside class="cart-item shadow-small">
+<div class="cart-item shadow-small">
     <div class="cart-item__left">
-        <img
-            src={item.product.images[0].file.url}
-            width={200}
-            height={300}
-            alt={item.product.name}
-        >
+        <img src={item.product.images[0].file.url} width={200} height={300} alt={item.product.name}>
     </div>
     <div class="cart-item__right">
         <h3>Poster</h3>
         <p>{item.product.name} – {item.price_total}€</p>
 
-        {#if item && item.product}
-            <div class="select">
-                <select on:change={updateQuantity}>
-                    {#each Array(5) as _, index}
-                        <option value={index + 1} selected={item.quantity - 1 === index}>{index + 1}</option>
-                    {/each}
-                </select>
-            </div>
+        {#if item && item.quantity}
+            <Select
+                name="sort" id="filter_sort"
+                options={[...Array(item.quantity <= quantityLimit ? quantityLimit : item.quantity)].map((_, index) => {
+                    return {
+                        value: `${index + 1}`,
+                        name: `${index + 1}`,
+                        default: index === 0,
+                        selected: index + 1 === item.quantity,
+                    }
+                })}
+                on:change={updateQuantity}
+                value={String(item.quantity)}
+            >
+                <span>Quantity:</span>
+            </Select>
         {/if}
 
-        <button on:click={removeItem}>Remove</button>
+        <ButtonCircle class="remove"
+            size="tiny" color="gray"
+            on:click={removeItem}
+        >
+            <svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M7.81 1.104a.647.647 0 1 0-.914-.915L4 3.085 1.104.19a.647.647 0 1 0-.915.915L3.085 4 .19 6.896a.647.647 0 1 0 .915.915L4 4.915 6.896 7.81a.647.647 0 1 0 .915-.915L4.915 4 7.81 1.104Z" fill="#666"/>
+            </svg>
+        </ButtonCircle>
     </div>
-</aside>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/components/organisms/Cart.svelte b/src/components/organisms/Cart.svelte
index e880d87..34b4d75 100644
--- a/src/components/organisms/Cart.svelte
+++ b/src/components/organisms/Cart.svelte
@@ -2,7 +2,7 @@
     import { onMount } from 'svelte'
     import { fade, fly } from 'svelte/transition'
     import { quartOut } from 'svelte/easing'
-    import { cartOpen, cartId, cartData, cartAmount } from '$utils/store'
+    import { cartOpen, cartId, cartData, cartAmount, cartIsUpdating } from '$utils/store'
     // Components
     import Button from '$components/atoms/Button.svelte'
     import CartItem from '$components/molecules/CartItem.svelte'
@@ -25,7 +25,7 @@
                 const cart = await existantCart.json()
                 $cartId = cart.id
                 $cartData = cart
-                console.log('fetched existant cart:', $cartId, $cartData)
+                // console.log('Fetched existant cart:', $cartId, $cartData)
             }
         }
         // Cart doesn't exists
@@ -41,7 +41,7 @@
                 const cart = await newCart.json()
                 $cartId = cart.id
                 $cartData = cart
-                console.log('new cart:', localStorage.getItem('cartId'))
+                // console.log('Created new cart:', localStorage.getItem('cartId'))
             }
         }
     })
@@ -54,43 +54,53 @@
 
     // Item quantity changed
     const changedQuantity = async ({ detail: { id, quantity } }) => {
-        // Update item in cart
-        // const updatedCart = await swell.cart.updateItem(id, {
-        //     quantity
-        // })
-        // if (updatedCart) {
-        //     $cartData = updatedCart
-        // }
+        // Cart is now updating
+        $cartIsUpdating = true
 
+        // Get updated cart
         const updatedCart = await fetch('/api/swell', {
             method: 'POST',
             body: JSON.stringify({
                 action: 'updateCartItem',
                 cartId: $cartId,
                 productId: id,
-                quantity: quantity
+                quantity,
             })
         })
-
         if (updatedCart.ok) {
-            // const cart = await updatedCart.json()
-            // $cartData = cart
-            // console.log('updated cart:', $cartData.items)
+            const cart = await updatedCart.json()
+            $cartData = cart
+            // Cart is updated
+            $cartIsUpdating = false
         }
     }
 
     // Item removed
     const removedItem = async ({ detail: id }) => {
+        // Cart is now updating
+        $cartIsUpdating = true
+
         // Remove item from cart
-        // const removedItem = await swell.cart.removeItem(id)
-        // if (removedItem) {
-        //     $cartData = removedItem
-        // }
+        const updatedCart = await fetch('/api/swell', {
+            method: 'POST',
+            body: JSON.stringify({
+                action: 'removeCartItem',
+                cartId: $cartId,
+                productId: id,
+            })
+        })
+        if (updatedCart.ok) {
+            const cart = await updatedCart.json()
+            $cartData = cart
+            // Cart is updated
+            $cartIsUpdating = false
+        }
     }
 </script>
 
 {#if $cartOpen}
     <aside class="cart shadow-box-dark"
+        class:is-updating={$cartIsUpdating}
         transition:fly={{ x: 48, duration: 600, easing: quartOut }}
     >
         <header class="cart__heading">
@@ -100,20 +110,28 @@
 
         <div class="cart__content">
             {#if $cartAmount > 0}
-                {#each $cartData.items as item}
-                    <CartItem {item}
+                {#each $cartData.items as item, index}
+                    <CartItem {item} {index}
                         on:updatedQuantity={changedQuantity}
                         on:removed={removedItem}
                     />
                 {/each}
             {:else}
-                <div class="cart__message shadow-small">
+                <div class="cart__empty shadow-small">
                     <div class="icon">
-
+                        <svg width="23" height="29" viewBox="0 0 23 29" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                            <path fill-rule="evenodd" clip-rule="evenodd" d="M6.95 5.83a4.94 4.94 0 0 1 1.23-3.42 3.8 3.8 0 0 1 2.8-1.2c2.07.02 4 1.67 4.04 4.62h4.13c.6 0 1.08.52 1.03 1.11l-.02.32 2.68 18.19a.94.94 0 0 1-1.26 1.02l-1.02-.38a.09.09 0 0 0-.08.01l-1.84 1.2c-.08.5-.5.88-1.02.88H1.78c-.6 0-1.07-.51-1.03-1.1l1.53-20.3c.04-.53.5-.95 1.03-.95h3.64Zm1.2 0c.01-1.2.4-2.05.9-2.6a2.6 2.6 0 0 1 1.93-.81c1.34 0 2.8 1.07 2.84 3.41H8.15Zm6.87 1.2h3.95l-.02.27-1.48 19.68H1.97l1.5-19.95h3.48v3.41a1.38 1.38 0 1 0 1.2 0v-3.4h5.67v3.4a1.38 1.38 0 1 0 1.2 0v-3.4Zm3.74 18.77.99-13.1 1.84 12.5-.62-.23c-.38-.14-.81-.1-1.15.13l-1.06.7ZM7.87 11.68a.33.33 0 1 1-.65 0 .33.33 0 0 1 .65 0Zm6.55.33a.33.33 0 1 0 0-.66.33.33 0 0 0 0 .66Z"/>
+                        </svg>
                     </div>
                     <p>Your cart is empty</p>
                 </div>
             {/if}
+
+            {#if !$cartData || $cartIsUpdating}
+                <div class="cart__update">
+                    <p>Updating…</p>
+                </div>
+            {/if}
         </div>
 
         <footer class="cart__total">
diff --git a/src/routes/api/swell.ts b/src/routes/api/swell.ts
index 3227b36..61992f1 100644
--- a/src/routes/api/swell.ts
+++ b/src/routes/api/swell.ts
@@ -1,4 +1,4 @@
-import { addToCart, createCart, fetchCart, getProduct, updateCartItem } from '$utils/swellFunctions'
+import { addToCart, createCart, fetchCart, getProduct, removeCartItem, updateCartItem } from '$utils/swellFunctions'
 
 
 // Block GET requests
@@ -41,11 +41,13 @@ export async function post ({ headers, query, body, params, ...rest }) {
                     result = await updateCartItem(cartId, productId, bodyParsed.quantity)
                     break
                 }
-
+                case 'removeCartItem': {
+                    result = await removeCartItem(cartId, productId)
+                    break
+                }
                 default: break
             }
         }
-
         return {
             status: 200,
             body: result,
diff --git a/src/style/molecules/_cart-item.scss b/src/style/molecules/_cart-item.scss
index 17a9ea1..6fd554f 100644
--- a/src/style/molecules/_cart-item.scss
+++ b/src/style/molecules/_cart-item.scss
@@ -1,11 +1,14 @@
 // Cart item
 .cart-item {
+    position: relative;
     display: flex;
-    background-color: #fff;
-    color: $color-gray;
-    margin-bottom: 24px;
-    border-radius: 6px;
     align-items: center;
+    margin-bottom: 24px;
+    background: #fff;
+    color: $color-gray;
+    border-radius: 6px;
+    overflow: hidden;
+    transition: opacity 0.3s var(--ease-quart);
 
     &:last-child {
         margin-bottom: 0;
@@ -13,14 +16,14 @@
 
     // Left Image
     &__left {
-        margin-right: 20px;
         width: 100px;
         height: 150px;
+        margin-right: 20px;
 
         @include bp (sm) {
-            margin-right: 32px;
             width: 124px;
             height: 180px;
+            margin-right: 32px;
         }
 
         img {
@@ -32,7 +35,11 @@
         }
     }
 
+    // Details
     &__right {
+        display: flex;
+        flex-direction: column;
+
         // Poster Title
         h3 {
             font-family: $font-serif;
@@ -45,14 +52,71 @@
         }
         // Text
         p {
-            font-size: rem(12px);
-            line-height: 1.4;
             max-width: 124px;
             margin: 8px 0 20px;
+            font-size: rem(12px);
+            line-height: 1.4;
 
             @include bp (sm) {
                 font-size: rem(13px);
             }
         }
+        // Select
+        .select {
+            position: relative;
+            display: flex;
+            align-items: center;
+            height: 28px;
+            margin-right: auto;
+            padding: 0 12px;
+            border: 1px solid rgba($color-lightgray, 0.3);
+            border-radius: 100vh;
+            cursor: pointer;
+            transition: border-color 0.4s var(--ease-quart);
+
+            span {
+                display: block;
+                font-size: rem(12px);
+                color: $color-text;
+
+                & + span {
+                    margin-left: 4px;
+                }
+            }
+            select {
+                position: absolute;
+                z-index: 1;
+                top: 0;
+                left: 0;
+                width: 100%;
+                height: 100%;
+                opacity: 0;
+                cursor: pointer;
+                text-align: center;
+            }
+            &:after {
+                content: "";
+                display: block;
+                width: 8px;
+                height: 5px;
+                margin-left: 4px;
+                color: red;
+                background: url('data:image/svg+xml; utf8, <svg width="8" height="5" viewBox="0 0 8 5" fill="none" xmlns="http://www.w3.org/2000/svg">\
+                    <path d="m1 1 3 3 3-3" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>\
+                </svg>');
+            }
+
+            // Hover
+            &:hover {
+                border-color: $color-secondary-light;
+            }
+        }
+
+        // Remove Icon
+        .remove {
+            position: absolute;
+            top: 16px;
+            right: 16px;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/style/organisms/_cart.scss b/src/style/organisms/_cart.scss
index a2b9ac3..cc079d6 100644
--- a/src/style/organisms/_cart.scss
+++ b/src/style/organisms/_cart.scss
@@ -1,12 +1,13 @@
 .cart {
     display: flex;
     flex-direction: column;
+    overflow: hidden;
+    padding: 20px 20px 24px;
     background-color: $color-cream;
     border-radius: 8px;
-    padding: 20px 20px 24px;
 
     @include bp (sm) {
-        padding: 24px 32px;
+        padding: 24px 32px 32px;
     }
 
     // Heading
@@ -51,21 +52,10 @@
 
     // Content
     &__content {
+        position: relative;
         flex: 1;
     }
 
-    // Message
-    &__message {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 100%;
-        padding: 24px;
-        background: #fff;
-        color: $color-gray;
-        border-radius: 6px;
-    }
-
     // Total
     &__total {
         margin-top: auto;
@@ -73,7 +63,7 @@
         color: $color-gray;
 
         @include bp (md) {
-            margin: 32px 0;
+            margin: 32px 0 0;
         }
 
         // Sum
@@ -138,6 +128,67 @@
         }
     }
 
+
+    // Empty content
+    &__empty {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        padding: 24px;
+        font-size: rem(20px);
+        font-weight: 200;
+        background: #fff;
+        color: $color-gray;
+        border-radius: 6px;
+
+        // Icon
+        .icon {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 64px;
+            height: 64px;
+            margin-bottom: 16px;
+            color: #FF6C89;
+            background: $color-cream;
+            border-radius: 100%;
+        }
+    }
+
+    // Updating message
+    &__update {
+        position: absolute;
+        z-index: -1;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: rem(20px);
+        color: $color-secondary;
+        transition: opacity 0.6s var(--ease-quart), transform 0.6s var(--ease-quart);
+        opacity: 0;
+        transform: translate3d(0, -8px, 0);
+    }
+
+
+    // Updating state
+    &.is-updating {
+        .cart-item {
+            opacity: 0.1;
+            pointer-events: none;
+            user-select: none;
+        }
+        .cart__update {
+            opacity: 1;
+            transform: translate3d(0,0,0);
+        }
+    }
+
     // Overlay
     &-overlay {
         position: fixed;
diff --git a/src/style/pages/_shop.scss b/src/style/pages/_shop.scss
index d9a2e86..542556e 100644
--- a/src/style/pages/_shop.scss
+++ b/src/style/pages/_shop.scss
@@ -3,10 +3,8 @@
 
     // Cart
     .cart {
-        // display: flex;
-        // display: none;
         position: fixed;
-        z-index: 100;
+        z-index: 101;
         top: 72px;
         right: 0;
         width: 100%;
@@ -25,7 +23,7 @@
     .shop-location {
         display: flex;
         position: fixed;
-        z-index: 20;
+        z-index: 100;
         top: 18px;
         left: 20px;
         right: 20px;
diff --git a/src/utils/store.ts b/src/utils/store.ts
index e27300c..59f49d0 100644
--- a/src/utils/store.ts
+++ b/src/utils/store.ts
@@ -5,7 +5,7 @@ import { writable, derived } from 'svelte/store'
  * Shop
  */
 /** Open Cart state */
-export const cartOpen = writable(true)
+export const cartOpen = writable(false)
 
 /** Current Cart ID */
 export const cartId = writable(null)
@@ -21,6 +21,9 @@ if (typeof localStorage !== 'undefined') {
 /** Raw Cart data */
 export const cartData = writable(null)
 
+/** Cart data is being updated */
+export const cartIsUpdating = writable(false)
+
 /** Amount of products present in cart */
 export const cartAmount = derived(cartData, ($cart) => {
     return $cart && $cart.item_quantity > 0 ? $cart.item_quantity : 0
diff --git a/src/utils/swellFunctions.ts b/src/utils/swellFunctions.ts
index 943c418..fdc229f 100644
--- a/src/utils/swellFunctions.ts
+++ b/src/utils/swellFunctions.ts
@@ -9,7 +9,9 @@ swell.init(import.meta.env.VITE_SWELL_STORE_ID, import.meta.env.VITE_SWELL_API_T
  * Retrieve a product
  */
 export const getProduct = async (id: string) => {
-    const product = await swell.get(`/products/${id}`)
+    const product = await swell.get('/products/{id}', {
+        id
+    })
 
     if (product) {
         return product
@@ -21,7 +23,7 @@ export const getProduct = async (id: string) => {
  * Create a cart
  */
 export const createCart = async () => {
-    const cart = await swell.post('/carts', {})
+    const cart = await swell.post('/carts')
 
     if (cart) {
         return cart
@@ -32,9 +34,9 @@ export const createCart = async () => {
 /**
  * Retrieve cart
  */
-export const fetchCart = async (cartId: string) => {
+export const fetchCart = async (id: string) => {
     const cart = await swell.get('/carts/{id}', {
-        id: cartId,
+        id,
         expand: [
             'items.product',
             'items.variant',
@@ -51,21 +53,26 @@ export const fetchCart = async (cartId: string) => {
  * Add product to cart
  */
 export const addToCart = async (cartId: string, productId: string, quantity: number) => {
-    // TODO: Update current product quantity if adding again, otherwise add new product to existing items
+    // Fetch current cart data
+    const currentCart = await fetchCart(cartId)
+
+    // Updated cart with new items
     const updatedCart = await swell.put('/carts/{id}', {
         id: cartId,
-        items: [{
-            product_id: productId,
-            quantity: quantity,
-            expand: [
-                'items.product',
-                'items.variant',
-            ]
-        }],
+        items: [
+            ...currentCart.items || [],
+            {
+                product_id: productId,
+                quantity,
+            }
+        ],
     })
-
     if (updatedCart) {
-        return updatedCart
+        // Fetch latest cart with updates
+        const cart = await fetchCart(cartId)
+        if (cart) {
+            return cart
+        }
     }
 }
 
@@ -77,26 +84,54 @@ export const updateCartItem = async (cartId: string, productId: string, quantity
     // Fetch current cart data
     const currentCart = await fetchCart(cartId)
 
-    // Update cart
-    // const itemToUpdate = currentCart.items.find((item: any) => item.id === productId)
-    // itemToUpdate.quantity = quantity
-
     // Updated items with replacing new item quantity
     const updatedCartItems = currentCart.items.map((item: any) => {
-        console.log(item)
+        // Replace item quantity with selected one
+        if (item.id === productId) {
+            item.quantity = quantity
+        }
         return item
     })
 
-    // const updatedCart = await swell.put('/carts/{id}', {
-    //     id: cartId,
-    //     items: updatedItems,
-    // })
+    const updatedCart = await swell.put('/carts/{id}', {
+        id: cartId,
+        $set: {
+            items: updatedCartItems,
+        }
+    })
+    if (updatedCart) {
+        // Fetch latest cart with updates
+        const cart = await fetchCart(cartId)
+        if (cart) {
+            return cart
+        }
+    }
+}
 
-    // console.log(updatedCart)
 
-    return currentCart
-    // if (updatedCart) {
-    //     return {}
-    //     // return updatedCart
-    // }
+/**
+ * Remove cart item
+ */
+export const removeCartItem = async (cartId: string, productId: string) => {
+    // Fetch current cart data
+    const currentCart = await fetchCart(cartId)
+
+    // Updated items and remove selected item
+    const updatedCartItems = [...currentCart.items.filter((item: any) => {
+        return item.id !== productId
+    })]
+
+    const updatedCart = await swell.put('/carts/{id}', {
+        id: cartId,
+        $set: {
+            items: updatedCartItems,
+        }
+    })
+    if (updatedCart) {
+        // Fetch latest cart with updates
+        const cart = await fetchCart(cartId)
+        if (cart) {
+            return cart
+        }
+    }
 }
\ No newline at end of file