diff --git a/core/templates/base.html b/core/templates/base.html
index 1939b64..245a880 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -71,7 +71,7 @@
                             </a>
                         </li>
                         {% endif %}
-                        {% if user.is_staff or perms.core.view_sales %}
+                        {% if user.is_staff or perms.core.view_sales or perms.core.view_sale %}
                         <li>
                             <a href="{% url 'invoice_create' %}" class="{% if url_name == 'invoice_create' %}active{% endif %}">
                                 <i class="bi bi-plus-circle"></i> {% trans "New Sales" %}
@@ -83,14 +83,14 @@
                             </a>
                         </li>
                         {% endif %}
-                        {% if user.is_staff or perms.core.view_quotations %}
+                        {% if user.is_staff or perms.core.view_quotations or perms.core.view_quotation %}
                         <li>
                             <a href="{% url 'quotations' %}" class="{% if url_name == 'quotations' or url_name == 'quotation_create' or url_name == 'quotation_detail' %}active{% endif %}">
                                 <i class="bi bi-file-earmark-spreadsheet"></i> {% trans "Quotation" %}
                             </a>
                         </li>
                         {% endif %}
-                        {% if user.is_staff or perms.core.view_sales %}
+                        {% if user.is_staff or perms.core.view_sales or perms.core.view_sale or perms.core.view_salereturn %}
                         <li>
                             <a href="{% url 'sales_returns' %}" class="{% if 'sales/returns' in path %}active{% endif %}">
                                 <i class="bi bi-arrow-return-left"></i> {% trans "Sales Return" %}
@@ -107,14 +107,14 @@
                         <i class="bi bi-chevron-down chevron"></i>
                     </a>
                     <ul class="collapse list-unstyled sub-menu {% if url_name == 'purchases' or url_name == 'purchase_create' or url_name == 'purchase_detail' or url_name == 'supplier_payments' or 'purchases/returns' in path %}show{% endif %}" id="purchasesSubmenu">
-                        {% if user.is_staff or perms.core.view_lpo %}
+                        {% if user.is_staff or perms.core.view_lpo or perms.core.view_purchaseorder %}
                         <li>
                             <a href="{% url 'lpo_list' %}" class="{% if url_name == 'lpo_list' or url_name == 'lpo_create' or url_name == 'lpo_detail' %}active{% endif %}">
                                 <i class="bi bi-file-earmark-text"></i> {% trans "Purchase Orders (LPO)" %}
                             </a>
                         </li>
                         {% endif %}
-                        {% if user.is_staff or perms.core.view_purchases %}
+                        {% if user.is_staff or perms.core.view_purchases or perms.core.view_purchase %}
                         <li>
                             <a href="{% url 'purchase_create' %}" class="{% if url_name == 'purchase_create' %}active{% endif %}">
                                 <i class="bi bi-plus-circle"></i> {% trans "New Purchase" %}
@@ -146,7 +146,7 @@
                         <i class="bi bi-chevron-down chevron"></i>
                     </a>
                     <ul class="collapse list-unstyled sub-menu {% if url_name == 'inventory' or url_name == 'barcode_labels' or url_name == 'reports' %}show{% endif %}" id="inventorySubmenu">
-                        {% if user.is_staff or perms.core.view_inventory %}
+                        {% if user.is_staff or perms.core.view_inventory or perms.core.view_product %}
                         <li>
                             <a href="{% url 'inventory' %}" class="{% if url_name == 'inventory' %}active{% endif %}">
                                 <i class="bi bi-box-seam"></i> {% trans "Products" %}
@@ -168,7 +168,7 @@
                         <i class="bi bi-chevron-down chevron"></i>
                     </a>
                     <ul class="collapse list-unstyled sub-menu {% if url_name == 'expenses' or url_name == 'expense_categories' %}show{% endif %}" id="expensesSubmenu">
-                        {% if user.is_staff or perms.core.view_expenses %}
+                        {% if user.is_staff or perms.core.view_expenses or perms.core.view_expense %}
                         <li>
                             <a href="{% url 'expenses' %}" class="{% if url_name == 'expenses' %}active{% endif %}">
                                 <i class="bi bi-receipt"></i> {% trans "Expense List" %}
@@ -190,14 +190,14 @@
                         <i class="bi bi-chevron-down chevron"></i>
                     </a>
                     <ul class="collapse list-unstyled sub-menu {% if url_name == 'customers' or url_name == 'suppliers' %}show{% endif %}" id="contactsSubmenu">
-                        {% if user.is_staff or perms.core.view_customers %}
+                        {% if user.is_staff or perms.core.view_customers or perms.core.view_customer %}
                         <li>
                             <a href="{% url 'customers' %}" class="{% if url_name == 'customers' %}active{% endif %}">
                                 <i class="bi bi-people"></i> {% trans "Customers" %}
                             </a>
                         </li>
                         {% endif %}
-                        {% if user.is_staff or perms.core.view_suppliers %}
+                        {% if user.is_staff or perms.core.view_suppliers or perms.core.view_supplier %}
                         <li>
                             <a href="{% url 'suppliers' %}" class="{% if url_name == 'suppliers' %}active{% endif %}">
                                 <i class="bi bi-truck"></i> {% trans "Suppliers" %}
@@ -207,7 +207,7 @@
                     </ul>
                 </li>
                 
-                {% if user.is_staff or perms.core.view_accounting %}
+                {% if user.is_staff or perms.core.view_accounting or perms.accounting.view_account %}
                 <!-- Accounting Group -->
                 <li class="sidebar-group-header mt-1">
                     <a href="#accountingSubmenu" data-bs-toggle="collapse" aria-expanded="{% if 'accounting' in path %}true{% else %}false{% endif %}" class="dropdown-toggle-custom">
@@ -249,7 +249,7 @@
                 </li>
                 {% endif %}
 
-                {% if user.is_staff or perms.core.view_hr %}
+                {% if user.is_staff or perms.core.view_hr or perms.hr.view_employee %}
                 <!-- HR Group -->
                 <li class="sidebar-group-header mt-1">
                     <a href="#hrSubmenu" data-bs-toggle="collapse" aria-expanded="{% if 'hr/' in path %}true{% else %}false{% endif %}" class="dropdown-toggle-custom">
diff --git a/core/templates/core/users.html b/core/templates/core/users.html
index 3616eba..a27b877 100644
--- a/core/templates/core/users.html
+++ b/core/templates/core/users.html
@@ -324,8 +324,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "view" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input perm-check module-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -333,8 +336,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "add" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input perm-check module-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -342,8 +348,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "change" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input perm-check module-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -351,8 +360,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "delete" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input perm-check module-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -419,8 +431,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "view" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input edit-group-perm module-edit-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="edit_perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="edit_perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -428,8 +443,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "add" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input edit-group-perm module-edit-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="edit_perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="edit_perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -437,8 +455,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "change" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input edit-group-perm module-edit-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="edit_perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="edit_perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}
@@ -446,8 +467,11 @@
                                         <td class="text-center">
                                             {% for perm in g.list %}
                                                 {% if "delete" in perm.codename %}
-                                                <div class="form-check d-inline-block">
+                                                <div class="form-check text-start mb-1" style="min-width: 120px;">
                                                     <input class="form-check-input edit-group-perm module-edit-{{ g.grouper.id }}" type="checkbox" name="permissions" value="{{ perm.id }}" id="edit_perm_{{ perm.id }}">
+                                                    <label class="form-check-label small text-muted" for="edit_perm_{{ perm.id }}" style="font-size: 0.75rem;">
+                                                        {{ perm.name }}
+                                                    </label>
                                                 </div>
                                                 {% endif %}
                                             {% endfor %}