diff --git a/inventory/management/commands/seed.py b/inventory/management/commands/seed.py
index 27bfe1fe..14f97f88 100644
--- a/inventory/management/commands/seed.py
+++ b/inventory/management/commands/seed.py
@@ -20,7 +20,7 @@ class Command(BaseCommand):
         count = opts['count']
         client = Client()  # lives inside management command
 
-        for n in range(1, 10):
+        for n in range(6, 9):
             self.stdout.write(f"🚗 Seeding dealer #{n}")
             self._create_dealer(client, n)
             # self._create_cars(client, n)
diff --git a/inventory/signals.py b/inventory/signals.py
index 9d8008cc..ca596175 100644
--- a/inventory/signals.py
+++ b/inventory/signals.py
@@ -500,7 +500,7 @@ def create_item_service(sender, instance, created, **kwargs):
     """
     if created:
         entity = instance.dealer.entity
-        uom = entity.get_uom_all().get(unit_abbr=instance.uom)
+        uom = entity.get_uom_all().get(name=str(instance.uom).lower())
         cogs = (
             entity.get_all_accounts()
             .filter(role=roles.COGS, active=True, role_default=True)
diff --git a/inventory/tasks.py b/inventory/tasks.py
index fd09ef66..c285443e 100644
--- a/inventory/tasks.py
+++ b/inventory/tasks.py
@@ -1157,7 +1157,7 @@ def create_user_dealer(email, password, name, arabic_name, phone, crn, vrn, addr
         user = User.objects.create(username=email, email=email)
         user.set_password(password)
         user.save()
-        EmailAddress.objects.create(user=user, email=email, verified=True, primary=True)
+        # EmailAddress.objects.create(user=user, email=email, verified=True, primary=True)
         group = Group.objects.create(name=f"{user.pk}-Admin")
         user.groups.add(group)
         for perm in Permission.objects.filter(
diff --git a/inventory/views.py b/inventory/views.py
index 630a5594..502ccb9c 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -6125,7 +6125,7 @@ def lead_tracking(request, dealer_slug):
         qs = models.Lead.objects.filter(dealer=dealer, staff=staff)
     else:
         qs = models.Lead.objects.filter(dealer=dealer)
-
+    leads=qs
     won = qs.filter(status="won")
     new = qs.filter(status="new")
     lose = qs.filter(status="lose")
@@ -6138,6 +6138,7 @@ def lead_tracking(request, dealer_slug):
         "won": won,
         "lose": lose,
         "negotiation": negotiation,
+        "leads":leads
     }
     return render(request, "crm/leads/lead_tracking.html", context)
 
diff --git a/static/images/default-user-image/customer-logo.png b/static/images/default-user-image/customer-logo.png
new file mode 100644
index 00000000..177e8dff
Binary files /dev/null and b/static/images/default-user-image/customer-logo.png differ
diff --git a/static/images/default-user-image/dealer.png b/static/images/default-user-image/dealer.png
new file mode 100644
index 00000000..7127aa86
Binary files /dev/null and b/static/images/default-user-image/dealer.png differ
diff --git a/static/images/default-user-image/staff.png b/static/images/default-user-image/staff.png
new file mode 100644
index 00000000..167ab34d
Binary files /dev/null and b/static/images/default-user-image/staff.png differ
diff --git a/static/images/default-user-image/vendor.png b/static/images/default-user-image/vendor.png
new file mode 100644
index 00000000..9f98dc1c
Binary files /dev/null and b/static/images/default-user-image/vendor.png differ
diff --git a/templates/account/login.html b/templates/account/login.html
index 03ea4fdc..0c82f862 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -6,9 +6,10 @@
     {% trans "Sign In" %}
 {% endblock head_title %}
 {% block content %}
-    <section class="main mt-2">
-        <div class="row flex-center ">
-            <div class="col-sm-10 col-md-8 col-lg-5 col-xl-5 col-xxl-3">
+ 
+    <section class="main my-2">
+        <div class="container" style="max-width:40rem;">
+            <div class="class="row form-container" id="form-container"">
                 <a class="d-flex flex-center text-decoration-none mb-4"
                    href="{% url 'home' %}">
                     <div class="d-flex align-items-center fw-bolder fs-3 d-inline-block">
@@ -77,9 +78,9 @@
                 </div>
             </div>
         </section>
-        <section class="pt-lg-0 pt-xl-8">
-            {% include 'footer.html' %}
-        </section>
+        
+        {% include 'footer.html' %} 
+      
         {% if LOGIN_BY_CODE_ENABLED or PASSKEY_LOGIN_ENABLED %}
             <hr>
             {% element button_group vertical=True %}
diff --git a/templates/account/signup-wizard.html b/templates/account/signup-wizard.html
index ef2e8791..a23d1d16 100644
--- a/templates/account/signup-wizard.html
+++ b/templates/account/signup-wizard.html
@@ -282,9 +282,9 @@
             </div>
         </div>
     </section>
-    <section class="pt-lg-0 pt-xl-8">
+   
         {% include 'footer.html' %}
-    </section>
+   
     <script src="{% static 'js/phoenix.js' %}"></script>
 {% endblock content %}
 {% block customJS %}
diff --git a/templates/crm/leads/lead_tracking.html b/templates/crm/leads/lead_tracking.html
index 54d62cf9..bc93cb84 100644
--- a/templates/crm/leads/lead_tracking.html
+++ b/templates/crm/leads/lead_tracking.html
@@ -65,6 +65,8 @@
     </style>
 {% endblock customCSS %}
 {% block content %}
+
+{% if leads %}
     <div class="container-fluid my-4">
         <div class="row justify-content-center">
             <div class="col">
@@ -168,13 +170,14 @@
                             {% endfor %}
                         </div>
                     </div>
-                    {% if not new and  not follow_up and not negotiation %}
-                         {% url 'lead_create' request.dealer.slug as create_lead_url %}
-                         {% include "empty-illustration-page.html" with value="lead" url=create_lead_url %}
-                    {% endif %}
+                   
                     
                 </div>
             </div>
         </div>
     </div>
+     {% else %}
+                {% url 'lead_create' request.dealer.slug as create_lead_url %}
+                {% include "empty-illustration-page.html" with value="lead" url=create_lead_url %}
+    {% endif %}
 {% endblock %}
diff --git a/templates/customers/view_customer.html b/templates/customers/view_customer.html
index ad1884a5..cbd38052 100644
--- a/templates/customers/view_customer.html
+++ b/templates/customers/view_customer.html
@@ -147,20 +147,20 @@
                                     <tbody class="list" id="customer-order-table-body">
                                        {% for lead in leads %}
                                             <tr>
-                                                <td><a href="#">{{lead}} ({{ forloop.counter }})<a></td>
-                                                <td>{{lead.opportunity}} ({{ forloop.counter }})</td>
+                                                <td><a href="{% url 'lead_detail' request.dealer.slug lead.slug%}">{{lead}} ({{ forloop.counter }})<a></td>
+                                                <td><a href="{$ url 'opportunity_detail'   lead.opportunity.slug  request.dealer.slug}">{{lead.opportunity}} ({{ forloop.counter }})</a></td>
                                                
                                                 <td>
                                                   
                                                     {% for estimate in  lead.customer.customer_model.estimatemodel_set.all %}
-                                                      <div class="me-2">{{estimate}}</div>
+                                                      <div class="me-2"><a href="{% url 'estimate_detail' request.dealer.slug estimate.pk %}">{{estimate}}</a></div>
                                                        <hr>
                                                      {% endfor %}
                                                 </td>
 
                                                 <td>
                                                     {% for estimate in  lead.customer.customer_model.estimatemodel_set.all %}
-                                                      <div>{{estimate.sale_orders.first}}</div>
+                                                      <div><a href={% url 'order_detail' request.dealer.slug estimate.sale_orders.first.pk%}>{{estimate.sale_orders.first}}</a></div>
                                                       <hr>
                                                      {% endfor %}
                                                 </td>
@@ -169,11 +169,11 @@
                                                       
                                                       {% if invoice.is_paid %}
                                                         <span class="badge badge-phoenix fs-10 badge-phoenix-success">
-                                                            <div>{{invoice}}</div>
+                                                            <div><a href="{% url 'invoice_detail' request.dealer.slug  request.entity.slug invoice.pk %}">{{invoice}}</a></div>
                                                         </span>
                                                       {%else%}
                                                         <span class="badge badge-phoenix fs-10 badge-phoenix-info">
-                                                            <div>{{invoice}}</div>
+                                                             <div><a href="{% url 'invoice_detail' request.dealer.slug request.entity.slug invoice.pk %}">{{invoice}}</a></div>
                                                         </span>
                                                       {% endif %}
 
@@ -182,7 +182,7 @@
                                                 </td>
                                                <td>
                                                   {% for estimate in  lead.customer.customer_model.invoicemodel_set.all %}
-                                                      <div>{{estimate.itemtransactionmodel_set.first.item_model.name}}</div>
+                                                      <div><a href="#">{{estimate.itemtransactionmodel_set.first.item_model.name}}</a></div>
                                                       <hr>
                                                    {% endfor %}
                                                 <td>
diff --git a/templates/empty-illustration-page.html b/templates/empty-illustration-page.html
index e9bc7315..d185b106 100644
--- a/templates/empty-illustration-page.html
+++ b/templates/empty-illustration-page.html
@@ -42,16 +42,19 @@
     <img src="{% static 'images/logos/no-content-new.jpg' %}" alt="No-empty-state-image" class="empty-state-image">
 
     <!-- Title -->
-    <h3 class="empty-state-title">{% trans "No" %} {{ value|capfirst }} {% trans "Yet" %}</h3>
+    <h3 class="empty-state-title">
+        {% blocktrans %}No {{ value}} Yet{% endblocktrans %}
+    </h3>
 
     <!-- Description -->
     <p class="empty-state-text">
-        {% trans "It looks like you haven't added any {{ value }} to your account.
-        Click the button below to get started and add your first {{ value }}!" %}
+        {% blocktrans %}It looks like you haven't added any {{ value }} to your account.
+        Click the button below to get started and add your first {{ value }}!{% endblocktrans %}
     </p>
 
     <!-- Call to Action Button -->
     <a class="btn btn-lg btn-primary" href="{{ url }}">
-        <i class="fa fa-plus me-2"></i>{% trans "Create New " %}{{ value|capfirst }}
+        <i class="fa fa-plus me-2"></i>
+         {% blocktrans %}Create New {{value}}{% endblocktrans %}
     </a>
 </div>
diff --git a/templates/inventory/inventory_stats.html b/templates/inventory/inventory_stats.html
index aa9d07ab..892ce9ea 100644
--- a/templates/inventory/inventory_stats.html
+++ b/templates/inventory/inventory_stats.html
@@ -5,7 +5,7 @@
 {% endblock %}
 {% block content %}
 
-{% if inventory %}
+{% if inventory.total_cars > 0 %}
     <div class="row justify-content-between">
         <div class="col-sm-12 ">
             <div class="card border h-100 w-100 p-lg-10">
diff --git a/templates/ledger/bills/bill_list.html b/templates/ledger/bills/bill_list.html
index 7b8d8fb5..c3041657 100644
--- a/templates/ledger/bills/bill_list.html
+++ b/templates/ledger/bills/bill_list.html
@@ -90,7 +90,7 @@
 
     
     {% else %}
-       {% url "bill-create" request.dealer.slug as create_bill_url %}
+       {% url "bill-create" request.dealer.slug request.entity.slug  as create_bill_url %}
        {% include "empty-illustration-page.html" with value="bill" url=create_bill_url %}
     {% endif %}
 {% endblock %}
diff --git a/templates/ledger/ledger/ledger_list.html b/templates/ledger/ledger/ledger_list.html
index bfeb7123..ff655496 100644
--- a/templates/ledger/ledger/ledger_list.html
+++ b/templates/ledger/ledger/ledger_list.html
@@ -131,7 +131,7 @@
     </div>
 
     {% else %}
-        {% url 'ledger_create' request.dealer.slug as create_ledger_url %}
+        {% url 'ledger_create' request.dealer.slug request.entity.slug as create_ledger_url %}
         {% include "empty-illustration-page.html" with value="ledger" url=create_ledger_url %}
     {% endif %}
 {% endblock %}
diff --git a/templates/sales/estimates/estimate_list.html b/templates/sales/estimates/estimate_list.html
index 7e4d692b..adb0bd5e 100644
--- a/templates/sales/estimates/estimate_list.html
+++ b/templates/sales/estimates/estimate_list.html
@@ -79,7 +79,7 @@
 
     {% else %}
        {% url "estimate_create" request.dealer.slug as create_estimate_url %}
-      {% include "empty-illustration-page.html" with value="customer" url=create_estimate_url %}
+      {% include "empty-illustration-page.html" with value="estimate" url=create_estimate_url %}
 
     {% endif %}
 {% endblock %}
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index 5ca9ca57..0da15b7d 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -91,8 +91,28 @@
     </section>
 
     {% else %}
-       {% url "user_create" request.dealer.slug as create_staff_url %}
-       {% include "empty-illustration-page.html" with value="staff" url=create_staff_url %}
+      
+                {% if request.user.userplan %}
+                    {% url "user_create" request.dealer.slug as create_staff_url %}
+                    {% include "empty-illustration-page.html" with value="staff" url=create_staff_url %}
+                            
+                {% else %}
+                            <div class="alert alert-outline-warning d-flex align-items-center"
+                                 role="alert">
+                                <i class="fa-solid fa-circle-info fs-6"></i>
+                                <p class="mb-0 flex-1">
+                                    {{ _("No Active Subscription,please activate your subscription.") }}<a href="{% url 'pricing_page' request.dealer.slug %}"
+                                          class="ms-3 text-body-primary fs-9">Manage Subscription</a>
+                                </p>
+                                <button class="btn-close"
+                                        type="button"
+                                        data-bs-dismiss="alert"
+                                        aria-label="Close"></button>
+                            </div>
+                {% endif %}
     {% endif %}
 
+
+                        
+
 {% endblock %}
diff --git a/templates/welcome_base.html b/templates/welcome_base.html
index 2c3dc611..e5cd4464 100644
--- a/templates/welcome_base.html
+++ b/templates/welcome_base.html
@@ -2,11 +2,11 @@
 <!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{ LANGUAGE_CODE }}"
-      dir="{% if LANGUAGE_CODE == 'ar' %}
-               rtl
+      {% if LANGUAGE_CODE == 'ar' %}
+               dir="rtl"
            {% else %}
-               ltr
-           {% endif %}"
+               dir="ltr"
+           {% endif %}
       data-bs-theme="dark"
       data-navigation-type="default"
       data-navbar-horizontal-shape="default">
@@ -78,6 +78,9 @@
         {% include 'welcome_header.html' %}
         {% block content %}
         {% endblock content %}
+        
+       
+   
         {% comment %}
     <script src="{% static 'vendors/anchorjs/anchor.min.js' %}"></script>
     <script src="{% static 'vendors/is/is.min.js' %}"></script>