diff --git a/templates/forms/application_submit_form b/templates/forms/application_submit_form.html
similarity index 100%
rename from templates/forms/application_submit_form
rename to templates/forms/application_submit_form.html
diff --git a/templates/user/admin_settings.html b/templates/user/admin_settings.html
index eb9b54f..b9936dd 100644
--- a/templates/user/admin_settings.html
+++ b/templates/user/admin_settings.html
@@ -4,7 +4,8 @@
 {% load humanize %}
 
 {% block title %}{% trans "Admin Settings" %} - KAAUH ATS{% endblock %}
- {% block customCSS %}
+
+{% block customCSS %}
 
 <style>
     /* Theme Variables for Consistency */
@@ -12,17 +13,19 @@
         --kaauh-teal: #00636e;
         --kaauh-teal-dark: #004a53;
         --kaauh-light-bg: #f9fbfd;
-        /* Standard Bootstrap color overrides (for pagination/badges) */
+        --kaauh-border: #e9ecef;
+
+        /* Standardized Colors */
         --color-primary: var(--kaauh-teal);
         --color-primary-dark: var(--kaauh-teal-dark);
-        --color-background-light: #f4f6f9; /* Retaining this lighter shade for page background */
+        --color-success: #28a745;
+        --color-secondary: #6c757d;
     }
     
     /* Layout & Card Styling */
-    
     .dashboard-header {
         color: var(--color-primary-dark);
-        border-bottom: 1px solid #e9ecef;
+        border-bottom: 1px solid var(--kaauh-border);
         padding-bottom: 1rem;
         margin-bottom: 2rem;
     }
@@ -31,16 +34,6 @@
     .text-accent {
         color: var(--color-primary) !important;
     }
-    .feature-icon {
-        font-size: 2.5rem;
-        color: var(--color-primary);
-        margin-bottom: 1rem;
-    }
-    .feature-title {
-        color: var(--color-primary-dark);
-        font-weight: 600;
-        margin-bottom: 0.5rem;
-    }
 
     /* Table Specific Styling */
     .table-card {
@@ -49,71 +42,99 @@
         box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
         padding: 1.5rem;
     }
-    /* Adjusted table stripe color to use theme variable */
+    
+    /* Table Rows */
     .table-striped > tbody > tr:nth-of-type(odd) > * {
-        background-color: rgba(0, 99, 110, 0.05); /* Light kaauh-teal stripe */
+        background-color: rgba(0, 99, 110, 0.03); /* Very light kaauh-teal stripe */
     }
-    .page-link {
-        color: var(--color-primary-dark);
+    .table thead th {
+        border-bottom: 2px solid var(--kaauh-border);
+        font-weight: 600;
+        color: var(--kaauh-primary-text, #343a40);
     }
-    .page-item.active .page-link {
-        background-color: var(--color-primary) !important;
-        border-color: var(--color-primary) !important;
-        color: #fff;
+
+    /* Status Badges */
+    .badge-active {
+        background-color: rgba(0, 99, 110, 0.1); /* Light Teal background */
+        color: var(--kaauh-teal);
+        font-weight: 600;
+        padding: 0.4em 0.8em;
+    }
+    .badge-inactive {
+        background-color: rgba(108, 117, 125, 0.1); /* Light Gray background */
+        color: var(--color-secondary);
+        font-weight: 600;
+        padding: 0.4em 0.8em;
     }
     
     /* Action button container for better alignment and spacing */
     .action-btns {
         display: flex;
         justify-content: center;
-        gap: 5px; /* Small space between icons */
+        gap: 0.5rem; /* Increased space between buttons */
     }
     
-    /* --- Main Action Button Style (Teal Theme) --- */
+    /* --- Main Action Button (Create User) --- */
     .btn-main-action {
-        /* Use standard Bootstrap button styles as a base */
         background-color: var(--kaauh-teal);
         border: 1px solid var(--kaauh-teal);
         color: white;
         font-weight: 600;
-        transition: all 0.2s ease;
         display: inline-flex;
         align-items: center;
-        gap: 0.5rem; /* Standard Bootstrap gap for icon/text */
+        gap: 0.5rem;
         padding: 0.5rem 1rem;
-        border-radius: 0.375rem; /* Standard Bootstrap border radius */
-        text-decoration: none;
     }
-
-    /* Functional Hover State */
     .btn-main-action:hover {
         background-color: var(--kaauh-teal-dark);
         border-color: var(--kaauh-teal-dark);
-        color: white;
-        text-decoration: none;
-    }
-    
-    /* Active/Focus State (optional but good for accessibility) */
-    .btn-main-action:focus,
-    .btn-main-action:active {
-        box-shadow: 0 0 0 0.25rem rgba(0, 99, 110, 0.5); /* Teal focus ring */
-        background-color: var(--kaauh-teal-dark);
-        border-color: var(--kaauh-teal-dark);
-        color: white;
+        color: white; /* Ensure text remains white on hover */
     }
 
-    button i.fa-solid {
-  /* Re-enable display if it was hidden */
-  display: inline-block;
-  /* Ensure the correct font family is applied */
-  font-family: "Font Awesome 6 Free";
-  /* Inherit button color */
-  color: inherit;
-}
-.text-primary{
-    color:var(--kaauh-teal) !important;
+    /* --- Secondary Action Buttons (Table Row) --- */
+    .btn-table-action {
+        background: none;
+        border: none;
+        padding: 0.5rem; /* Make the click area larger */
+        color: var(--kaauh-teal); /* Default icon color */
+        transition: color 0.2s ease;
+    }
+    .btn-table-action:hover {
+        color: var(--kaauh-teal-dark);
+        box-shadow: none;
+    }
 
-}
+    /* Toggle Status Button Styling */
+    .btn-toggle-status {
+        font-size: 0.85rem;
+        font-weight: 500;
+        padding: 0.375rem 0.75rem;
+        border-radius: 0.375rem;
+        transition: all 0.2s ease;
+        display: flex;
+        align-items: center;
+        gap: 0.3rem;
+    }
+
+    /* Deactivate (Red/Danger) */
+    .btn-deactivate {
+        background-color: #f8d7da; /* Light Red */
+        color: #721c24; /* Dark Red Text */
+        border: 1px solid #f5c6cb;
+    }
+    .btn-deactivate:hover {
+        background-color: #f5c6cb;
+    }
+
+    /* Activate (Teal/Primary) */
+    .btn-activate {
+        background-color: rgba(0, 99, 110, 0.15); /* Light Teal */
+        color: var(--kaauh-teal-dark); 
+        border: 1px solid rgba(0, 99, 110, 0.2);
+    }
+    .btn-activate:hover {
+        background-color: rgba(0, 99, 110, 0.25);
+    }
     
 </style>
 {% endblock %}
@@ -121,11 +142,11 @@
 
 {% block content %}
 
-<div class="container-fluid mt-5">
+<div class="container-fluid py-4">
     <div class="row px-lg-4">
         <div class="col-12">
             <h1 class="h3 fw-bold dashboard-header">
-                <i class="fas fa-cogs me-2 text-accent"></i>{% trans "Admin Settings Dashboard" %}
+                <i class="fas fa-cogs me-3 text-accent"></i>{% trans "Admin Settings Dashboard" %}
             </h1>
         </div>
     </div>
@@ -133,7 +154,7 @@
     {# --- Paged User Table Section --- #}
     <div class="row px-lg-4" id="user-list">
        
-        <div class="d-flex align-items-center justify-content-between mb-3">
+        <div class="d-flex align-items-center justify-content-between mb-4">
         
             <h4 class="text-secondary fw-bold mb-0">{% trans "Staff User List" %}</h4>
         
@@ -155,7 +176,7 @@
                             <th scope="col" class="text-center">{% trans "Status" %}</th>
                             <th scope="col" class="text-center">{% trans "First Join" %}</th>
                             <th scope="col" class="text-center">{% trans "Last Login" %}</th>
-                            <th scope="col" class="text-center">{% trans "Actions" %}</th>
+                            <th scope="col" class="text-center" style="min-width: 250px;">{% trans "Actions" %}</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -164,11 +185,13 @@
                             <td>{{ user.pk }}</td>
                             <td>{{ user.get_full_name|default:user.first_name }}</td>
                             <td>{{ user.email }}</td>
+                            
+                            {# Column: Status Badge (Improved Styling) #}
                             <td class="text-center">
                                 {% if user.is_active %}
-                                    <span class="badge rounded-pill bg-success-subtle text-success border border-success-subtle">{% trans "Active" %}</span>
+                                    <span class="badge rounded-pill badge-active">{% trans "Active" %}</span>
                                 {% else %}
-                                    <span class="badge rounded-pill bg-secondary-subtle text-secondary border border-secondary-subtle">{% trans "Inactive" %}</span>
+                                    <span class="badge rounded-pill badge-inactive">{% trans "Inactive" %}</span>
                                 {% endif %}
                             </td>
                             
@@ -182,63 +205,54 @@
                                 {% if user.last_login %}
                                     <span title="{{ user.last_login|date:'DATETIME_FORMAT' }}">{{ user.last_login|naturaltime }}</span>
                                 {% else %}
-                                    {% trans "Never" %}
+                                    —
                                 {% endif %}
                             </td>
                             
+                            {# Column: Actions #}
                             <td class="text-center">
                                 <div class="action-btns">
                                    
+                                    {% comment %} {# 1. Edit/Detail Button (Pencil Icon) - Added common action #}
+                                    <a href="{% url 'edit_staff_user' user.pk %}" class="btn btn-sm btn-outline-secondary" title="{% trans 'Edit User' %}">
+                                        <i class="fas fa-pencil"></i>
+                                    </a> {% endcomment %}
 
                                     {# 2. Change Password Button (Key Icon) #}
                                     <a href="{% url 'set_staff_password' user.pk %}" class="btn btn-sm btn-outline-info" title="{% trans 'Change Password' %}">
                                         <i class="fas fa-key"></i>
-                                        {% trans 'Change Password' %}
                                     </a>
 
-                                    {# 3. Delete Button (Trash Icon) #}
-                                       
+                                    {# 3. Toggle Status Button (Improved Button Styling) #}
                                     {% if user.is_active %}
-                                        
-                                        
-                                        <form method="post" action="{% url 'account_toggle_status' user.pk %}">
+                                        <form method="post" action="{% url 'account_toggle_status' user.pk %}" class="d-inline">
                                             {% csrf_token %}
-                                            
-                                            {# The button for DEACTIVATION #}
-                                            <button type="submit" >
-                                                  <i class="fas fa-times-circle text-danger"></i> Deactivate
+                                            <button type="submit" class="btn-toggle-status btn-deactivate" title="{% trans 'Deactivate User' %}">
+                                                  <i class="fas fa-times-circle"></i> {% trans "Deactivate" %}
                                             </button>
                                         </form>
-                                        
                                     {% else %}
-                                       
-                                        <form method="post" action="{% url 'account_toggle_status' user.pk %}">
+                                        <form method="post" action="{% url 'account_toggle_status' user.pk %}" class="d-inline">
                                             {% csrf_token %}
-                                            
-                                            {# The button for REACTIVATION #}
-                                            
-                                            
-                                                 <button type="submit bg-primary" >
-                                                        <i class="fas fa-check-circle text-primary"></i> Activate
-                                                 </button>
-                                            
-                                            
+                                            <button type="submit" class="btn-toggle-status btn-activate" title="{% trans 'Activate User' %}">
+                                                <i class="fas fa-check-circle"></i> {% trans "Activate" %}
+                                            </button>
                                         </form>
-                                        
                                     {% endif %}
                                 </div>
                             </td>
                         </tr>
                         {% empty %}
                         <tr>
-                            <td colspan="8" class="text-center text-muted py-4">{% trans "No staff users found." %}</td>
+                            <td colspan="7" class="text-center text-muted py-4">{% trans "No staff users found." %}</td>
                         </tr>
                         {% endfor %}
                     </tbody>
                 </table>
             </div>
             
-           
+            {# NOTE: Add Pagination links here if the `staffs` object is a Paginator object #}
+            
         </div>
     </div>
 </div>