diff --git a/templates/account/user_settings.html b/templates/account/user_settings.html
index 7b72fdfe..eec9dfc4 100644
--- a/templates/account/user_settings.html
+++ b/templates/account/user_settings.html
@@ -42,7 +42,7 @@
 
         <div class="text-start mb-6">
           <div>
-            <button type="submit" class="btn btn-phoenix-primary">Update</button>
+            <button type="submit" class="btn btn-primary">Update</button>
           </div>
         </div>
       </div>
diff --git a/templates/groups/group_form.html b/templates/groups/group_form.html
index 0193f321..2f6639c8 100644
--- a/templates/groups/group_form.html
+++ b/templates/groups/group_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 
 
-    <div class="row">
+    <div class="row mt-4">
         <div class="row">
             <div class="col-sm-9">
                 <div class="d-sm-flex justify-content-between">
@@ -32,9 +32,9 @@
                         <div class="text-danger">{{ error }}</div>
                     {% endfor %}
                     <div class="d-flex mb-3">
-                        <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6"><i class="fa-solid fa-ban"></i> {% trans "Cancel"|capfirst %}</a>
-                        <button class="btn btn-primary" type="submit">
-                            <i class="fa-solid fa-floppy-disk"></i>
+                        <a href="{{request.META.HTTP_REFERER}}" class="btn btn-danger me-2 "><i class="fa-solid fa-ban me-1"></i> {% trans "Cancel"|capfirst %}</a>
+                        <button class="btn btn-success" type="submit">
+                            <i class="fa-solid fa-floppy-disk me-1"></i>
                             {{ _("Save") }}
                         </button>
                     </div>
diff --git a/templates/plans/billing_info_create_or_update.html b/templates/plans/billing_info_create_or_update.html
index 2e7e673d..5dc24465 100644
--- a/templates/plans/billing_info_create_or_update.html
+++ b/templates/plans/billing_info_create_or_update.html
@@ -11,9 +11,9 @@
                 {% csrf_token %}
                 {{ form|crispy }}
                 {% if object %}
-                    <a class="btn btn-sm btn-phoenix-danger" href="{% url 'billing_info_delete' %}"><!--<span class="far fa-trash-alt"></span>--> {{ _("Delete") }}</a>
+                    <a class="btn btn-sm btn-danger" href="{% url 'billing_info_delete' %}"><!--<span class="far fa-trash-alt"></span>--> {{ _("Delete") }}</a>
                 {% endif %}
-                <button type="submit" class="btn btn-sm btn-phoenix-primary">
+                <button type="submit" class="btn btn-sm btn-success">
                     {{ _("Save") }}
                 </button>
             </form>
diff --git a/templates/sales/sales_list.html b/templates/sales/sales_list.html
index ffc70a8c..960735ab 100644
--- a/templates/sales/sales_list.html
+++ b/templates/sales/sales_list.html
@@ -214,7 +214,15 @@
             </table>
           </div>
         </div>
+           <div class="d-flex justify-content-between mt-3"><span class="d-none d-sm-inline-block" data-list-info="data-list-info">{{ page_obj.start_index }} {{ _("to") }} {{ page_obj.end_index }}<span class="text-body-tertiary"> {{ _("Items of")}} </span>{{ page_obj.paginator.count }}</span>
+            <div class="d-flex">
 
+                {% if is_paginated %}
+                    {% include 'partials/pagination.html' %}
+                {% endif %}
+
+            </div>
+        </div>
 
 
       </div>
diff --git a/templates/users/user_form.html b/templates/users/user_form.html
index b01d5e8e..84880a6f 100644
--- a/templates/users/user_form.html
+++ b/templates/users/user_form.html
@@ -38,9 +38,9 @@
             <div class="text-danger">{{ error }}</div>
           {% endfor %}
           <div class="d-flex mb-3">
-            <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6"><i class="fa-solid fa-ban"></i> {% trans "Cancel"|capfirst %}</a>
-            <button class="btn btn-primary" type="submit">
-              <i class="fa-solid fa-floppy-disk"></i>
+            <a href="{{request.META.HTTP_REFERER}}" class="btn btn-danger  me-2"><i class="fa-solid fa-ban me-1"></i> {% trans "Cancel"|capfirst %}</a>
+            <button class="btn btn-success " type="submit">
+              <i class="fa-solid fa-floppy-disk me-1"></i>
               {{ _("Save") }}
             </button>
           </div>
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index f673699f..06360a55 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -42,9 +42,7 @@
                                 <td class="align-middle white-space-nowrap ps-1">
                                     <div>
                                         <a class="fs-8 fw-bold" href="{% url 'user_detail' user.slug%}">{{ user.arabic_name }}</a>
-                                        <div class="d-flex align-items-center">
-                                            <p class="mb-0 text-body-highlight fw-semibold fs-9 me-2">{{ user.name }}</p>
-                                        </div>
+                                
                                     </div>
                                 </td>
                                 <td class="align-middle white-space-nowrap align-items-center">{{ user.email }}</td>