diff --git a/inventory/templatetags/custom_filters.py b/inventory/templatetags/custom_filters.py
index b33cc5cf..d11dbb7b 100644
--- a/inventory/templatetags/custom_filters.py
+++ b/inventory/templatetags/custom_filters.py
@@ -652,11 +652,16 @@ def inventory_table(context, queryset):
 
 
 @register.filter
-<<<<<<< HEAD
-def count_checked(permissions):
-    """Count how many permissions are marked as checked"""
-    print(permissions)
-    return sum(1 for perm in permissions if getattr(perm, 'is_checked', False))
+def count_checked(permissions, group_permission_ids):
+    """Count how many permissions are checked from the allowed list"""
+    if not group_permission_ids:
+        return 0
+    return sum(1 for perm in permissions if perm.id in group_permission_ids)
+
+# @register.filter
+# def count_checked(permissions, group_permission_ids):
+#     """Count how many permissions are checked from the allowed list"""
+#     return sum(1 for perm in permissions if perm.id in group_permission_ids)
 
 
 
@@ -672,16 +677,4 @@ def subtract(value, arg):
         try:
             return float(value) - float(arg)
         except (ValueError, TypeError):
-            return '' # Or raise an error, or return value if conversion fails
-=======
-def count_checked(permissions, group_permission_ids):
-    """Count how many permissions are checked from the allowed list"""
-    if not group_permission_ids:
-        return 0
-    return sum(1 for perm in permissions if perm.id in group_permission_ids)
-
-# @register.filter
-# def count_checked(permissions, group_permission_ids):
-#     """Count how many permissions are checked from the allowed list"""
-#     return sum(1 for perm in permissions if perm.id in group_permission_ids)
->>>>>>> 68f7e3fb2c4f4aeb23ae96a9431dade25885d274
+            return '' # Or raise an error, or return value if conversion fails
\ No newline at end of file
diff --git a/templates/groups/group_permission_form.html b/templates/groups/group_permission_form.html
index b36ab961..6c1d437e 100644
--- a/templates/groups/group_permission_form.html
+++ b/templates/groups/group_permission_form.html
@@ -26,7 +26,6 @@
 <form method="post" novalidate>
         {% csrf_token %}
 
-        <!-- Filter and Summary Section -->
         <div class="row mb-4">
             <div class="col-md-6">
                 <div class="input-group">
@@ -43,84 +42,81 @@
             </div>
         </div>
 
-        <!-- Permissions Grid -->
-       <!-- Permissions Grid -->
-    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4" id="permissionsGrid">
-        {% for app_label, models in grouped_permissions.items %}
-<div class="col">
-    <div class="card h-100 border-{% if app_label in group_permission_apps %}primary{% else %}light{% endif %}">
-        <div class="card-header bg-{% if app_label in group_permission_apps %}primary text-white{% else %}light{% endif %}">
-            <div class="d-flex justify-content-between align-items-center">
-                <h5 class="card-title mb-0">
-                    <i class="fas fa-{% if app_label in group_permission_apps %}check-circle{% else %}cube{% endif %} me-2"></i>
-                    {{ app_label|capfirst }}
-                </h5>
-                <span class="badge bg-{% if app_label in group_permission_apps %}light text-primary{% else %}secondary{% endif %}">
-                    {{ models|length }} {% trans "categories" %}
-                </span>
-            </div>
-        </div>
-        <div class="card-body">
-            <div class="accordion" id="accordion-{{ app_label|slugify }}">
-                {% for model, perms in models.items %}
-                <div class="accordion-item border-0 mb-2">
-                    <h6 class="accordion-header" id="heading-{{ app_label|slugify }}-{{ model|slugify }}">
-                        <button class="accordion-button collapsed bg-white shadow-none py-2"
-                                type="button"
-                                data-bs-toggle="collapse"
-                                data-bs-target="#collapse-{{ app_label|slugify }}-{{ model|slugify }}"
-                                aria-expanded="false"
-                                aria-controls="collapse-{{ app_label|slugify }}-{{ model|slugify }}">
-                            <i class="fas fa-{% if model == 'Custom' %}star{% else %}table{% endif %} me-2"></i>
-                            {{ model|capfirst }}
-                            <span class="badge bg-{% if model in group_permission_models %}primary{% else %}secondary{% endif %} rounded-pill ms-2">
-                                {{ perms|length }} / {{ perms|count_checked:group_permission_ids }}
+        <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4" id="permissionsGrid">
+            {% for app_label, models in grouped_permissions.items %}
+            <div class="col"> {# This div opens for each app_label #}
+                <div class="card h-100 border-{% if app_label in group_permission_apps %}primary{% else %}light{% endif %}">
+                    <div class="card-header bg-{% if app_label in group_permission_apps %}primary text-white{% else %}light{% endif %}">
+                        <div class="d-flex justify-content-between align-items-center">
+                            <h5 class="card-title mb-0">
+                                <i class="fas fa-{% if app_label in group_permission_apps %}check-circle{% else %}cube{% endif %} me-2"></i>
+                                {{ app_label|capfirst }}
+                            </h5>
+                            <span class="badge bg-{% if app_label in group_permission_apps %}light text-primary{% else %}secondary{% endif %}">
+                                {{ models|length }} {% trans "categories" %}
                             </span>
-                        </button>
-                    </h6>
-                    <div id="collapse-{{ app_label|slugify }}-{{ model|slugify }}"
-                         class="accordion-collapse collapse"
-                         aria-labelledby="heading-{{ app_label|slugify }}-{{ model|slugify }}"
-                         data-bs-parent="#accordion-{{ app_label|slugify }}">
-                        <div class="accordion-body pt-0 px-0">
-                            <div class="list-group list-group-flush">
-                                {% for perm in perms %}
-                                <label class="list-group-item d-flex gap-2 {% if perm.id in group_permission_ids %}bg-light-primary{% endif %}">
-                                    <input class="form-check-input flex-shrink-0 mt-0"
-                                           type="checkbox"
-                                           name="permissions"
-                                           value="{{ perm.id }}"
-                                           id="perm_{{ perm.id }}"
-                                           {% if perm.id in group_permission_ids %}checked{% endif %}>
-                                    <span>
-                                        <span class="d-block fw-bold">{{ perm.name|capfirst }}</span>
-                                        <small class="d-block text-muted">{{ perm.codename }}</small>
-                                        {% if model == 'Custom' %}
-                                        <span class="badge bg-info mt-1">
-                                            <i class="fas fa-star me-1"></i>{% trans "Custom" %}
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <div class="accordion" id="accordion-{{ app_label|slugify }}">
+                            {% for model, perms in models.items %}
+                            <div class="accordion-item border-0 mb-2">
+                                <h6 class="accordion-header" id="heading-{{ app_label|slugify }}-{{ model|slugify }}">
+                                    <button class="accordion-button collapsed bg-white shadow-none py-2"
+                                            type="button"
+                                            data-bs-toggle="collapse"
+                                            data-bs-target="#collapse-{{ app_label|slugify }}-{{ model|slugify }}"
+                                            aria-expanded="false"
+                                            aria-controls="collapse-{{ app_label|slugify }}-{{ model|slugify }}">
+                                        <i class="fas fa-{% if model == 'Custom' %}star{% else %}table{% endif %} me-2"></i>
+                                        {{ model|capfirst }}
+                                        <span class="badge bg-{% if model in group_permission_models %}primary{% else %}secondary{% endif %} rounded-pill ms-2">
+                                            {# This is where you might need the custom filter 'count_checked' #}
+                                            {{ perms|length }} / {{ perms|count_checked:group_permission_ids }}
                                         </span>
-                                        {% elif perm.id in group_permission_ids %}
-                                        <span class="badge bg-success mt-1">
-                                            <i class="fas fa-check me-1"></i>{% trans "Assigned" %}
-                                        </span>
-                                        {% endif %}
-                                    </span>
-                                </label>
-                                {% endfor %}
+                                    </button>
+                                </h6>
+                                <div id="collapse-{{ app_label|slugify }}-{{ model|slugify }}"
+                                     class="accordion-collapse collapse"
+                                     aria-labelledby="heading-{{ app_label|slugify }}-{{ model|slugify }}"
+                                     data-bs-parent="#accordion-{{ app_label|slugify }}">
+                                    <div class="accordion-body pt-0 px-0">
+                                        <div class="list-group list-group-flush">
+                                            {% for perm in perms %}
+                                            <label class="list-group-item d-flex gap-2 {% if perm.id in group_permission_ids %}bg-light-primary{% endif %}">
+                                                <input class="form-check-input flex-shrink-0 mt-0"
+                                                       type="checkbox"
+                                                       name="permissions"
+                                                       value="{{ perm.id }}"
+                                                       id="perm_{{ perm.id }}"
+                                                       {% if perm.id in group_permission_ids %}checked{% endif %}>
+                                                <span>
+                                                    <span class="d-block fw-bold">{{ perm.name|capfirst }}</span>
+                                                    <small class="d-block text-muted">{{ perm.codename }}</small>
+                                                    {% if model == 'Custom' %}
+                                                    <span class="badge bg-info mt-1">
+                                                        <i class="fas fa-star me-1"></i>{% trans "Custom" %}
+                                                    </span>
+                                                    {% elif perm.id in group_permission_ids %}
+                                                    <span class="badge bg-success mt-1">
+                                                        <i class="fas fa-check me-1"></i>{% trans "Assigned" %}
+                                                    </span>
+                                                    {% endif %}
+                                                </span>
+                                            </label>
+                                            {% endfor %}
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
+                            {% endfor %} 
                         </div>
                     </div>
                 </div>
-                {% endfor %}
-            </div>
+            </div> 
+            {% endfor %} 
         </div>
-    </div>
-</div>
-{% endfor %}
-    </div>
 
-    <!-- Footer section remains the same -->
-</div>
 
         <div class="row mt-4 mb-4">
             <div class="col">
@@ -134,7 +130,7 @@
                         </span>
                     </div>
                     <div>
-                       
+
                         <button type="submit" class="btn btn-primary me-2">
                             <i class="fas fa-save me-1"></i>{% trans "Save Changes" %}
                         </button>
@@ -194,7 +190,7 @@ document.addEventListener('DOMContentLoaded', function() {
                 if (button) {
                     const hasVisible = collapse.querySelector('.list-group-item[style=""]');
                     const bsCollapse = bootstrap.Collapse.getInstance(collapse) ||
-                                      new bootstrap.Collapse(collapse);
+                                     new bootstrap.Collapse(collapse);
 
                     if (hasVisible) {
                         bsCollapse.show();