diff --git a/inventory/views.py b/inventory/views.py
index 37e3adb4..9195727d 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -1573,12 +1573,25 @@ class CarDeleteView(
 
     model = models.Car
     template_name = "inventory/car_confirm_delete.html"
-    success_url = reverse_lazy("inventory_stats")
+   
     permission_required = ["inventory.delete_car"]
 
     def delete(self, request, *args, **kwargs):
         messages.success(request, _("Car deleted successfully"))
         return super().delete(request, *args, **kwargs)
+    def get_success_url(self):
+        """
+        Returns the URL to redirect to after a successful car deletion.
+        It dynamically includes the dealer_slug from the URL.
+        """
+        
+        dealer_slug = self.kwargs.get('dealer_slug')
+        if dealer_slug:
+            return reverse_lazy("car_list", kwargs={'dealer_slug': dealer_slug})
+        else:
+           
+            messages.error(self.request, _("Could not determine dealer for redirection."))
+            return reverse_lazy("home") 
 
 
 class CarLocationCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateView):
diff --git a/templates/purchase_orders/po_detail.html b/templates/purchase_orders/po_detail.html
index 7455e398..672fa591 100644
--- a/templates/purchase_orders/po_detail.html
+++ b/templates/purchase_orders/po_detail.html
@@ -7,7 +7,7 @@
 {% block content %}
     <div class="container-fluid mt-4">
         <div class="row g-1">
-            
+
             <div class="col-lg-12">
                 <div class="d-flex flex-column gap-3">
                     <div class="card">
@@ -23,8 +23,7 @@
                 </div>
             </div>
 
-            
-            <div class="col-lg-12">
+            <div class="col-lg-12"> 
                 <div class="card mb-4">
                     <div class="card-body">
                         <div class="row text-center">
@@ -47,42 +46,20 @@
                         </div>
                     </div>
                 </div>
-            </div>
-<<<<<<< HEAD
-        </div> 
-        
-        <div class="row">
-            <div class="col-lg-12">
-                <div class="card">
-                    <div class="card-body">
-                        <h3 class="h4 fw-light mb-2">{{ po_model.po_title }}</h3>
-=======
+            </div> 
 
->>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7
-
-                        <div class="table-responsive">
-                            {% po_item_table1 po_items %}
-                        </div>
-                    </div>
+            <div class="col-lg-12"> 
+                <div class="table-responsive">
+                    {% po_item_table1 po_items %}
                 </div>
-                
             </div>
-<<<<<<< HEAD
+
+            
+
         </div> 
-
-    </div> 
-
-=======
-                <!--POS list-->
-            <a class="btn btn-phoenix-primary w-100 py-2 mt-2"
-               href="{% url 'purchase_order_list' request.dealer.slug %}">
-                <i class="fas fa-list me-2"></i>{% trans 'PO List' %}
-            </a>
-        </div>
     </div>
->>>>>>> c9fad7b79c346875a636122fdc7514814180dbc7
+
     {% include "purchase_orders/includes/mark_as.html" %}
-</div>
 
 {% endblock %}
 
diff --git a/templates/sales/estimates/estimate_detail.html b/templates/sales/estimates/estimate_detail.html
index cf2ca8b9..a4df4d64 100644
--- a/templates/sales/estimates/estimate_detail.html
+++ b/templates/sales/estimates/estimate_detail.html
@@ -74,12 +74,6 @@
           </div>
         </div>
         <div class="d-flex align-items-center gap-2">
-          {% if estimate.invoicemodel_set.first %}
-            <a href="{% url 'invoice_detail' request.dealer.slug estimate.invoicemodel_set.first.pk %}" class="btn btn-phoenix-primary btn-sm" type="button"><i class="fa-solid fa-receipt"></i>
-              {{ _("View Invoice")}}</a>
-            <button class="btn btn-phoenix-primary" data-bs-toggle="modal" data-bs-target="#POModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-receipt"></i>  {% trans 'View Purchase Order' %}</span></button>
-          {% endif %}
-
           {% if estimate.status == 'draft' %}
             <a href="{% url 'send_email' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary me-2"><span class="fa-regular fa-paper-plane me-sm-2"></span><span class="d-none d-sm-inline-block">{% trans 'Send Quotation' %}</span></a>
             <button id="mark_as_sent_estimate" class="btn btn-phoenix-secondary" onclick="setFormAction('review')" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Sent' %}</span></button>
@@ -87,16 +81,23 @@
             <button id="accept_estimate" onclick="setFormAction('approved')" class="btn btn-phoenix-secondary" data-bs-toggle="modal" data-bs-target="#confirmModal"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-check-double"></i> {% trans 'Mark As Accept' %}</span></button>
           {% elif estimate.status == 'approved' %}
 
-            {% if estimate.sale_orders.first %}
-              <a href="{% url 'invoice_create' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-receipt"></i>  {% trans 'Create Invoice' %}</span></a>
-              <a href="{% url 'preview_sale_order' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block">{{ _("Preview Sale Order") }}</span></a>
-            {% else %}
+              {% if estimate.sale_orders.first %}
+              <!--if sale order exist-->
+             
+              <a href="{% url 'order_detail' request.dealer.slug estimate.sale_orders.first.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block">{{ _("Preview Sale Order") }}</span></a>
+                   
+              {% else %}
               <a href="{% url 'create_sale_order' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block"><i class="fa-solid fa-file-import"></i> {% trans 'Create Sale Order' %}</span></a>
                         {% comment %}                      {% endcomment %}
-            {% endif %}
-          {% elif estimate.status == 'in_review' %}
-            <a href="{% url 'estimate_preview' request.dealer.slug estimate.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block"><i class="fa-regular fa-eye"></i> {% trans 'Preview' %}</span></a>
+              {% endif %}
+
+         
+          {% elif estimate.status == 'completed' %}
+                        <a href="{% url 'order_detail' request.dealer.slug estimate.sale_orders.first.pk %}" class="btn btn-phoenix-primary"><span class="d-none d-sm-inline-block">{{ _("Preview Sale Order") }}</span></a>
+                        <a href="{% url 'invoice_detail' request.dealer.slug estimate.invoicemodel_set.first.pk %}" class="btn btn-phoenix-primary btn-sm" type="button"><i class="fa-solid fa-receipt"></i>
+                         {{ _("View Invoice")}}</a>
           {% endif %}
+
           {% if estimate.can_cancel %}
             {% if perms.django_ledger.change_estimatemodel %}
               <button class="btn btn-phoenix-danger" data-bs-toggle="modal" data-bs-target="#CancelModal"><i class="fa-solid fa-ban"></i> {% trans "Cancel" %}</button>