diff --git a/inventory/views.py b/inventory/views.py
index bc209dc1..31132ebe 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -5229,7 +5229,7 @@ def lead_create(request,dealer_slug):
             if form.is_valid():
                 instance = form.save(commit=False)
                 instance.dealer = dealer
-                # instance.staff = form.cleaned_data.get("staff")
+                instance.staff = form.cleaned_data.get("staff")
 
                 if instance.lead_type == "customer":
                     customer = models.Customer.objects.filter(
@@ -5301,12 +5301,12 @@ def lead_create(request,dealer_slug):
             is_sa_import=True, pk__in=dealer_make_list
         )
         form.fields["staff"].queryset = form.fields["staff"].queryset.filter(
-            dealer=dealer
+            dealer=dealer, staff_type="sales"
         )
 
         if hasattr(request.user.staffmember, "staff"):
             form.initial["staff"] = request.user.staffmember.staff
-            form.fields["staff"].widget = HiddenInput()
+            form.fields["staff"].widget.attrs["disabled"] = True
         form.fields["id_car_make"].queryset = qs
         form.fields["id_car_make"].choices = [
             (obj.id_car_make, obj.get_local_name()) for obj in qs
@@ -5866,13 +5866,6 @@ class OpportunityCreateView(CreateView, SuccessMessageMixin, LoginRequiredMixin)
             initial["stage"] = models.Stage.QUALIFICATION
         return initial
 
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class)
-        dealer = get_object_or_404(models.Dealer,slug=self.kwargs.get("dealer_slug"))
-        form.fields['car'].queryset = models.Car.objects.filter(dealer=dealer)
-        form.fields['lead'].queryset = models.Lead.objects.filter(dealer=dealer)
-        return form
-
     def form_valid(self, form):
         dealer = get_object_or_404(models.Dealer,slug=self.kwargs.get("dealer_slug"))
         instance = form.save(commit=False)
@@ -5915,13 +5908,6 @@ class OpportunityUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView)
     template_name = "crm/opportunities/opportunity_form.html"
     success_message = "Opportunity updated successfully."
 
-    def get_form(self, form_class=None):
-        form = super().get_form(form_class)
-        dealer = get_object_or_404(models.Dealer,slug=self.kwargs.get("dealer_slug"))
-        form.fields['car'].queryset = models.Car.objects.filter(dealer=dealer)
-        form.fields['lead'].queryset = models.Lead.objects.filter(dealer=dealer)
-        return form
-
     def get_success_url(self):
         return reverse_lazy("opportunity_detail", kwargs={"dealer_slug":self.kwargs.get("dealer_slug"),"slug": self.object.slug})
 
diff --git a/templates/groups/group_permission_form.html b/templates/groups/group_permission_form.html
index acaeef1c..3a19188c 100644
--- a/templates/groups/group_permission_form.html
+++ b/templates/groups/group_permission_form.html
@@ -21,7 +21,7 @@
         </div>
     </div>
 
-    <form method="post" novalidate>
+<form method="post" novalidate>
         {% csrf_token %}
 
         <!-- Permissions Grid -->
@@ -92,7 +92,7 @@
             {% endfor %}
         </div>
 
-        <div class="row mt-4">
+        <div class="row mt-4 mb-4">
             <div class="col">
                 <div class="d-flex justify-content-between align-items-center">
                     <div>
@@ -104,14 +104,11 @@
                         </span>
                     </div>
                     <div>
-                        <a href="{% url 'group_detail' request.dealer.slug group.pk %}"
-                           class="btn btn-outline-secondary me-2">
-                            <i class="fas fa-ban me-2"></i>{% trans "Cancel" %}
-                        </a>
-                        <button type="submit" class="btn btn-primary">
-                            <i class="fas fa-save me-2"></i>{% trans "Save Changes" %}
+                       
+                        <button type="submit" class="btn btn-primary me-2">
+                            <i class="fas fa-save me-1"></i>{% trans "Save Changes" %}
                         </button>
-                        <a href="{% url 'group_detail' request.dealer.slug group.pk %}" class="btn btn-phoenix-secondary  "><i class="fa-solid fa-ban"></i> {% trans "Cancel"|capfirst %}</a>
+                        <a href="{% url 'group_detail' request.dealer.slug group.pk %}" class="btn btn-phoenix-secondary  "><i class="fa-solid fa-ban me-1"></i> {% trans "Cancel"|capfirst %}</a>
                         
                     </div>
                 </div>