diff --git a/Controllers/OrderController.cs b/Controllers/OrderController.cs
index b495e8c..9030aaf 100644
--- a/Controllers/OrderController.cs
+++ b/Controllers/OrderController.cs
@@ -125,7 +125,7 @@ public class OrderController : Controller
         _context.OrderItems.Add(orderItem);
         await _context.SaveChangesAsync();
 
-        return RedirectToAction("Join", new { code = order.OrderCode });
+        return RedirectToAction("Details" , new { code = order.OrderCode });
     }
 
     [HttpPost]
diff --git a/Views/Order/Details.cshtml b/Views/Order/Details.cshtml
index f2181db..4bad2d5 100644
--- a/Views/Order/Details.cshtml
+++ b/Views/Order/Details.cshtml
@@ -93,7 +93,7 @@
                 </div>
             </div>
 
-            <div class="card shadow">
+            <div class="card shadow mb-4">
                 <div class="card-header bg-info text-white">
                     <h5 class="mb-0">@Localizer.Get("Orders") (@Model.OrderItems.Count)</h5>
                 </div>
@@ -176,6 +176,7 @@
                     }
                 </div>
             </div>
+            <partial name="PlaceOrder" model="Model" />
         </div>
 
         <div class="col-md-4">
diff --git a/Views/Order/Join.cshtml b/Views/Order/Join.cshtml
index 6cda1fa..70d1070 100644
--- a/Views/Order/Join.cshtml
+++ b/Views/Order/Join.cshtml
@@ -28,51 +28,7 @@
                 </div>
             </div>
 
-            <div class="card shadow mb-4">
-                <div class="card-header bg-primary text-white">
-                    <h5 class="mb-0">@Localizer["MenuItems"]</h5>
-                </div>
-                <div class="card-body">
-                    @if (Model.MenuItems.Any())
-                    {
-                        <form method="post" action="/order/additem">
-                            <input type="hidden" name="orderId" value="@Model.Id">
-
-                            <div class="mb-3">
-                                <label for="menuItemId" class="form-label">@Localizer["SelectItem"]</label>
-                                <select class="form-select" id="menuItemId" name="menuItemId" required onchange="updatePrice()">
-                                    <option value="">-- @Localizer["ChooseAnItem"] --</option>
-                                    @foreach (var item in Model.MenuItems)
-                                    {
-                                        <option value="@item.Id" data-price="@item.Price.ToString("F2")">@item.Name - @Localizer["Currency", item.Price.ToString("F2")]</option>
-                                    }
-                                </select>
-                            </div>
-
-                            <div class="mb-3">
-                                <label for="quantity" class="form-label">@Localizer["Qty"]</label>
-                                <input type="number" class="form-control" id="quantity" name="quantity" value="1" min="1" step="1" required>
-                            </div>
-
-                            <div class="mb-3">
-                                <label for="comments" class="form-label">@Localizer["Comments"]</label>
-                                <input class="form-control" id="comments" name="comments"></input>
-                            </div>
-
-                            <div class="alert alert-info">
-                                <strong>@Localizer["Total"]:</strong> @Html.Raw(Localizer["Currency", "<span id=\"totalPrice\">0.00</span>"])
-                            </div>
-
-                            <button type="submit" class="btn btn-success">@Localizer["AddToOrder"]</button>
-                            <a href="/Home/Dashboard" class="btn btn-secondary">@Localizer["BackToDashboard"]</a>
-                        </form>
-                    }
-                    else
-                    {
-                        <p class="text-muted">@Localizer["NoItemsAvailable"]</p>
-                    }
-                </div>
-            </div>
+            <partial name="PlaceOrder" model="Model" />
         </div>
 
         <div class="col-md-4">
diff --git a/Views/Shared/PlaceOrder.cshtml b/Views/Shared/PlaceOrder.cshtml
new file mode 100644
index 0000000..1673ce4
--- /dev/null
+++ b/Views/Shared/PlaceOrder.cshtml
@@ -0,0 +1,67 @@
+@using OneForMe.Services
+@inject LocalizationService Localizer
+
+@model OneForMe.Models.Order
+
+<div class="card shadow mb-4">
+    <div class="card-header bg-primary text-white">
+        <h5 class="mb-0">@Localizer["MenuItems"]</h5>
+    </div>
+    <div class="card-body">
+        @if (Model.MenuItems.Any())
+        {
+            <form method="post" action="/order/additem">
+                <input type="hidden" name="orderId" value="@Model.Id">
+
+                <div class="mb-3">
+                    <label for="menuItemId" class="form-label">@Localizer["SelectItem"]</label>
+                    <select class="form-select" id="menuItemId" name="menuItemId" required onchange="updatePrice()">
+                        <option value="">-- @Localizer["ChooseAnItem"] --</option>
+                        @foreach (var item in Model.MenuItems)
+                        {
+                            <option value="@item.Id" data-price="@item.Price.ToString("F2")">@item.Name - @Localizer["Currency", item.Price.ToString("F2")]</option>
+                        }
+                    </select>
+                </div>
+
+                <div class="mb-3">
+                    <label for="quantity" class="form-label">@Localizer["Qty"]</label>
+                    <input type="number" class="form-control" id="quantity" name="quantity" value="1" min="1" step="1" required>
+                </div>
+
+                <div class="mb-3">
+                    <label for="comments" class="form-label">@Localizer["Comments"]</label>
+                    <input class="form-control" id="comments" name="comments"></input>
+                </div>
+
+                <div class="alert alert-info">
+                    <strong>@Localizer["Total"]:</strong> @Html.Raw(Localizer["Currency", "<span id=\"totalPrice\">0.00</span>"])
+                </div>
+
+                <button type="submit" class="btn btn-success">@Localizer["AddToOrder"]</button>
+                <a href="/Home/Dashboard" class="btn btn-secondary">@Localizer["BackToDashboard"]</a>
+            </form>
+        }
+        else
+        {
+            <p class="text-muted">@Localizer["NoItemsAvailable"]</p>
+        }
+    </div>
+</div>
+
+@section Scripts {
+    <script defer>
+        function updatePrice() {
+            const select = document.getElementById('menuItemId');
+            const quantity = document.getElementById('quantity').value;
+            const selectedOption = select.options[select.selectedIndex];
+            const price = parseFloat(selectedOption.dataset.price.replace(",", ".")) || 0;
+            const total = (price * quantity).toFixed(2);
+            document.getElementById('totalPrice').textContent = total;
+        }
+
+        document.getElementById('quantity').addEventListener('change', updatePrice);
+        document.getElementById('quantity').addEventListener('input', updatePrice);
+        document.getElementById('menuItemId').addEventListener('change', updatePrice);
+    </script>
+}
\ No newline at end of file