diff --git a/templates/groups/group_detail.html b/templates/groups/group_detail.html
index d4f269c8..0800b8f0 100644
--- a/templates/groups/group_detail.html
+++ b/templates/groups/group_detail.html
@@ -36,7 +36,8 @@
         <div class="card rounded ">
             <div class="card-header ">
                 <p class="mb-2">{{ _("Group Details") }}</p>
-                <a class="btn btn-phoenix-secondary " href="{% url 'group_list' request.dealer.slug %}">{% trans "Group List" %}</a>
+                <a class="btn btn-phoenix-secondary me-2" href="{% url 'group_list' request.dealer.slug %}">{% trans "Groups List" %}</a>
+                 <a class="btn btn-phoenix-secondary " href="{% url 'user_list' request.dealer.slug %}">{% trans "Staffs List" %}</a>
             </div>
             <div class="card-body">
                 <div class="row">
diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html
index 98087fb9..7e7ad146 100644
--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@@ -55,7 +55,7 @@
                                                 <a class="btn btn-phoenix-secondary btn-sm"
                                                    href="{% url 'group_detail' request.dealer.slug group.id %}">
                                                     <i class="fa-solid fa-eye me-1"></i>
-                                                    {% trans 'view'|capfirst %}
+                                                    {% trans 'view Permissions'|capfirst %}
                                                 </a>
                                             </td>
                                         </tr>
diff --git a/templates/header.html b/templates/header.html
index 5a39dc54..2698966d 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -194,7 +194,7 @@
                                         data-bs-parent="#navbarVerticalCollapse"
                                         id="nv-sales">
                                         <li class="collapsed-nav-item-title d-none">{% trans 'sales'|capfirst %}</li>
-                                        {% if perms.django_ledger.add_estimatemodel %}
+                                        {% comment %} {% if perms.django_ledger.add_estimatemodel %}
                                             <li class="nav-item">
                                                 <a
                                                    class="nav-link"
@@ -204,7 +204,7 @@
                                                     </div>
                                                 </a>
                                             </li>
-                                        {% endif %}
+                                        {% endif %} {% endcomment %}
                                         {% if perms.django_ledger.view_estimatemodel %}
                                             <li class="nav-item">
                                                 <a class="nav-link" href="{% url 'estimate_list' request.dealer.slug %}">
diff --git a/templates/plans/order_detail.html b/templates/plans/order_detail.html
index 1fed37be..82eb1c53 100644
--- a/templates/plans/order_detail.html
+++ b/templates/plans/order_detail.html
@@ -60,15 +60,15 @@
             <h2 class="text-xl font-semibold text-gray-800 mb-4">
                 <i class="fas fa-credit-card text-gray-400 mr-2"></i> {% trans "Payment" %}
             </h2>
+           
             {% if object.completed %}
                 <div class="bg-green-50 text-green-700 px-4 py-3 rounded-lg flex items-center">
                     <i class="fas fa-check-circle mr-3 text-lg"></i>
                     <p class="text-sm font-medium">
-                        {% blocktrans with object.completed as completed %}
-                        Payment completed on: {{ completed|date:"F j, Y" }}
-                        {% endblocktrans %}
+                      {% trans "Payment completed on : "%}{{object.completed}}
                     </p>
                 </div>
+                 
             {% else %}
                 {% if object.is_ready_for_payment %}
                     <p class="text-gray-600 mb-4">