diff --git a/templates/groups/group_list.html b/templates/groups/group_list.html
index f20bc986..dafbbb28 100644
--- a/templates/groups/group_list.html
+++ b/templates/groups/group_list.html
@@ -11,7 +11,8 @@
             <div class="col-auto">
                 <div class="d-md-flex justify-content-between">
                     <div>
-                        <a href="{% url 'group_create' request.dealer.slug %}" class="btn btn-sm btn-phoenix-primary"><span class="fas fa-plus me-2"></span>{% trans "Add Group" %}</a>
+                        <a href="{% url 'group_create' request.dealer.slug %}" class="btn btn-sm btn-phoenix-primary me-5"><span class="fas fa-plus me-2"></span>{% trans "Add Group" %}</a>
+                         <a href="{% url 'user_list' request.dealer.slug %}" class="btn btn-sm btn-phoenix-secondary"><span class="fas fas fa-arrow-left me-2"></span>{% trans "Back to Staffs" %}</a>
 
                     </div>
                 </div>
diff --git a/templates/users/user_detail.html b/templates/users/user_detail.html
index 3f4127d8..54c96352 100644
--- a/templates/users/user_detail.html
+++ b/templates/users/user_detail.html
@@ -18,7 +18,15 @@
                     </div>
                     <div class="col-md-6">
                         <p><strong>{{ _("Phone Number") }}:</strong> {{ user_.phone_number }}</p>
-                        <p><strong>{{ _("Role") }}:</strong> {{ user_.staff_type }}</p>
+                        <div>
+                            <span><strong>{{ _("Roles") }}:</strong></span>
+                            {% for group in user_.groups %}
+                            <span><strong>{{ group.name }}</strong></span>
+                             {% if not forloop.last %}
+                               <span>&amp;</span>
+                             {% endif %}
+                            {% endfor %}
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/templates/users/user_list.html b/templates/users/user_list.html
index 846cdb75..a5e0813e 100644
--- a/templates/users/user_list.html
+++ b/templates/users/user_list.html
@@ -6,7 +6,6 @@
 
 {% block content %}
     <section class="">
-
         <div class="row mt-4">
             <div class="col-auto">
                 <div class="d-md-flex justify-content-between">
@@ -47,6 +46,7 @@
                                 <td class="align-middle white-space-nowrap align-items-center">{{ user.email }}</td>
                                 <td class="align-middle white-space-nowrap align-items-center justify-content-center">{{ user.phone_number }}</td>
                                 <td>
+                                   
                                     {% for group in user.groups %}
                                         <span class="badge badge-sm bg-primary text-center"><i class="fa-solid fa-scroll"></i> {% trans group.name|title %}</span>
                                     {% endfor %}