diff --git a/views/cart.ejs b/views/cart.ejs
index 6fbc958f3e4a4e4c447e5bcce308bcb4799e9888..c1e44313f5377447a465436ea09356c978e77c98 100644
--- a/views/cart.ejs
+++ b/views/cart.ejs
@@ -8,41 +8,31 @@
                 <a href="/" class="continue-shopping">Continue Shopping</a>
             </div>
         <% } else { %>
-            <div class="cart-items">
-                <% cartItems.forEach(item => { %>
-                    <div class="cart-item">
-                        <div class="item-info">
-                            <h3><%= item.name %></h3>
-                            <p>Price: ฿<%= item.price.toLocaleString() %></p>
-                            <p class="price">
-                                Total: ฿<%= (item.price * item.quantity).toLocaleString() %>
-                            </p>
-                            <% if (item.stock < 5) { %>
-                                <p style="color: var(--primary);">Only <%= item.stock %> items left!</p>
-                            <% } %>
-                        </div>
-
-                        <form method="POST" action="/cart/update" style="display: flex; gap: 0.8rem; align-items: center;">
-                            <input type="hidden" name="cartItemId" value="<%= item.id %>">
-                            <input type="number" 
-                                   name="quantity" 
-                                   value="<%= item.quantity %>" 
-                                   min="1" 
-                                   max="<%= item.stock %>"
-                                   style="width: 70px;">
-                            <button type="button" class="update-btn" style="margin: 0; padding: 0.5rem 1rem;">
-                                Update
-                            </button>
-                        </form>
-
-                        <form action="/cart/remove" method="POST" style="text-align: right;">
-                            <input type="hidden" name="cartItemId" value="<%= item.id %>">
-                            <button type="submit" class="back-btn" style="margin: 0; padding: 0.5rem 1rem; background-color: red;">
-                                Remove
-                            </button>
-                        </form>
-                    </div>
-                <% }); %>
+            <div class="cart-item">
+                <div class="item-info">
+                    <h3><%= item.name %></h3>
+                    <p>Price: ฿<%= item.price.toLocaleString() %></p>
+                    <p class="price">Total: ฿<%= (item.price * item.quantity).toLocaleString() %></p>
+                    <% if (item.stock < 5) { %>
+                        <p style="color: var(--primary);">Only <%= item.stock %> items left!</p>
+                    <% } %>
+                </div>
+            
+                <form method="POST" action="/cart/update" style="display: flex; gap: 0.8rem; align-items: center;">
+                    <input type="hidden" name="cartItemId" value="<%= item.id %>">
+                    <input type="number" name="quantity" value="<%= item.quantity %>" min="1" max="<%= item.stock %>" style="width: 70px;">
+                    <button type="button" class="update-btn" style="margin: 0; padding: 0.5rem 1rem;">
+                        Update
+                    </button>
+                </form>
+            
+                <div class="cart-actions">
+                    <a href="/edit-cart/<%= item.id %>" class="edit-btn">Edit</a> <!-- ปุ่ม Edit -->
+                    <form action="/cart/remove" method="POST">
+                        <input type="hidden" name="cartItemId" value="<%= item.id %>">
+                        <button type="submit" class="remove-btn">Remove</button>
+                    </form>
+                </div>
             </div>
 
             <div class="cart-summary">
diff --git a/views/order-history.ejs b/views/order-history.ejs
index a2da233d8f5d417437d879a8734665d0c28acea9..6bedd5583e91e3849c603576812ea5f7156c6c66 100644
--- a/views/order-history.ejs
+++ b/views/order-history.ejs
@@ -22,11 +22,6 @@
                         <p class="order-total">Total: ฿<%= order.total_amount.toLocaleString() %></p>
                         <a href="/order/detail/<%= order.id %>" class="view-detail-btn">View Details</a>
                     </div>
-                    <div class="order-footer">
-                        <p class="order-total">Total: ฿<%= order.total_amount.toLocaleString() %></p>
-                        <a href="/order/detail/<%= order.id %>" class="view-detail-btn">View Details</a>
-                        <a href="/" class="edit-order-btn">Edit</a> <!-- ปุ่ม Edit -->
-                    </div>
                 </div>
             <% }); %>
         </div>