diff --git a/onboarding/cbv/pipeline.py b/onboarding/cbv/pipeline.py
index c903ab549..8bd5f2f76 100644
--- a/onboarding/cbv/pipeline.py
+++ b/onboarding/cbv/pipeline.py
@@ -65,15 +65,6 @@ class PipelineNav(HorillaNavView):
 
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
-        if self.request.user.has_perm("recruitment.add_recruitment"):
-            self.create_attrs = f"""
-                hx-get="{reverse_lazy('recruitment-create')}?closed=false"
-                hx-target="#genericModalBody"
-                data-target="#genericModal"
-                data-toggle="oh-modal-toggle"
-            """
-        else:
-            self.create_attrs = None
 
         self.view_types = [
             {
diff --git a/onboarding/templates/cbv/dashboard/my_onboarding_task.html b/onboarding/templates/cbv/dashboard/my_onboarding_task.html
index 2fac920c8..eebb82e02 100644
--- a/onboarding/templates/cbv/dashboard/my_onboarding_task.html
+++ b/onboarding/templates/cbv/dashboard/my_onboarding_task.html
@@ -2,5 +2,5 @@
     <div class="oh-main__titlebar oh-main__titlebar--left">
         <span class="oh-main__titlebar-title fw-bold mb-0 text-dark">{{ candidate_tasks.first.onboarding_task_id.task_title }}</span>
       </div>
-    {% include "generic/horilla_list.html" %}
+    {% include "generic/horilla_list_table.html" %}
 </div>
diff --git a/onboarding/templates/onboarding/candidates.html b/onboarding/templates/onboarding/candidates.html
index d304ba789..7c6236f84 100644
--- a/onboarding/templates/onboarding/candidates.html
+++ b/onboarding/templates/onboarding/candidates.html
@@ -120,9 +120,9 @@
                                     href="{% url 'rec-candidate-update' candidate.id %}?onboarding=True"><ion-icon
                                         name="create-outline"></ion-icon></a>
                                 {% if perms.recruitment.change_candidate %}
-                                    <button type="button" hx-get="{% url 'send-mail' candidate.id %}" title="{% trans 'Send Mail' %}" hx-target="#objectDetailsModalTarget" hx-swap="innerHTML"
+                                    <button type="button" hx-get="{% url 'send-mail' candidate.id %}" title="{% trans 'Send Mail' %}" hx-target="#objectCreateModalTarget" hx-swap="innerHTML"
                                         class="oh-btn oh-btn--light w-100" data-toggle="oh-modal-toggle"
-                                        data-target="#objectDetailsModal">
+                                        data-target="#objectCreateModal">
                                         <ion-icon name="mail-open-outline" role="img" class="md hydrated"
                                             aria-label="mail open outline">
                                         </ion-icon>
diff --git a/onboarding/templates/onboarding/group_by.html b/onboarding/templates/onboarding/group_by.html
index a7f277df5..656ff2560 100644
--- a/onboarding/templates/onboarding/group_by.html
+++ b/onboarding/templates/onboarding/group_by.html
@@ -104,7 +104,7 @@
                                         href="{% url 'rec-candidate-update' candidate.id %}?onboarding=True"><ion-icon
                                           name="create-outline"></ion-icon></a>
                                       {% if perms.recruitment.change_candidate %}
-                                      <button type="button" hx-get="{% url 'send-mail' candidate.id %}" title="{% trans "Send Mail" %}" hx-target="#objectDetailsModalTarget" hx-swap="innerHTML" class="oh-btn oh-btn--light w-100" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" >
+                                      <button type="button" hx-get="{% url 'send-mail' candidate.id %}" title="{% trans "Send Mail" %}" hx-target="#objectCreateModalTarget" hx-swap="innerHTML" class="oh-btn oh-btn--light w-100" data-toggle="oh-modal-toggle" data-target="#objectCreateModal" >
                                         <ion-icon name="mail-open-outline" role="img" class="md hydrated" aria-label="mail open outline"></ion-icon>
                                       </button>
                                       {% endif %}
diff --git a/onboarding/templates/onboarding/kanban/kanban.html b/onboarding/templates/onboarding/kanban/kanban.html
index 693ffdb95..5b2ee4123 100644
--- a/onboarding/templates/onboarding/kanban/kanban.html
+++ b/onboarding/templates/onboarding/kanban/kanban.html
@@ -109,7 +109,7 @@
                                                             <a href="#" class="oh-dropdown__link oh-dropdown__link--danger oh-kanban__card-delete">Delete</a>
                                                         </li> {% endcomment %}
                                                         <li class="oh-dropdown__item">
-                                                            <a href="#" data-toggle="oh-modal-toggle" data-target="#sendMailModal" hx-get="{% url 'onboarding-send-mail' candidate.candidate_id.id %}" hx-target="#sendMailModalBody" class="oh-dropdown__link">{% trans "Send Mail" %}</a>
+                                                            <a href="#" data-toggle="oh-modal-toggle" data-target="#objectCreateModal" hx-get="{% url 'onboarding-send-mail' candidate.candidate_id.id %}" hx-target="#objectCreateModalTarget" class="oh-dropdown__link">{% trans "Send Mail" %}</a>
                                                         </li>
                                                     </ul>
                                                 </div>
diff --git a/onboarding/templates/onboarding/onboarding_table.html b/onboarding/templates/onboarding/onboarding_table.html
index 1c7f3ad31..69f6b6b7f 100644
--- a/onboarding/templates/onboarding/onboarding_table.html
+++ b/onboarding/templates/onboarding/onboarding_table.html
@@ -261,7 +261,7 @@
                      {% endif %}
                   </div>
                   <div class="oh-sticky-table__td" onclick="event.stopPropagation()">
-                     <button class="oh-checkpoint-badge text-success" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" hx-get="{% url 'send-mail' candidate.candidate_id.id %}" hx-target="#objectDetailsModalTarget">
+                     <button class="oh-checkpoint-badge text-success" data-toggle="oh-modal-toggle" data-target="#objectCreateModal" hx-get="{% url 'send-mail' candidate.candidate_id.id %}" hx-target="#objectCreateModalTarget">
                      {% trans "Send mail" %}
                      </button>
                   </div>
diff --git a/onboarding/templates/onboarding/send_mail_form.html b/onboarding/templates/onboarding/send_mail_form.html
index fe10cbd11..228112d71 100644
--- a/onboarding/templates/onboarding/send_mail_form.html
+++ b/onboarding/templates/onboarding/send_mail_form.html
@@ -1,15 +1,14 @@
 {% load i18n %}
-<div class="p-2 mb-3" style="background-color:#6089d54e;
-color:#6089d5fd;border-radius: 5px;">
+<div class="p-2 mb-3" style="background-color:#6089d54e;color:#6089d5fd;border-radius: 5px;">
     Mail to {{candidate.email}}
 </div>
 <form hx-post="{% url 'onboarding-send-mail' candidate.id %}" hx-target="#sendMailModalBody" method="post">
     {% csrf_token %}
     <label for="subject" class="mb-1">Subject</label>
-<input type="text" class="oh-input w-100" id="subject{{candidate.id}}" name="subject">
-<label for="Body" class="mt-3 mb-1">Body</label>
-<textarea name="body" class="w-100 oh-input" id="Body{{candidate.id}}" cols="30" rows="2"></textarea>
-<button type="submit" class="oh-btn oh-btn--secondary w-100">
-    {% trans "Send" %}
-</button>
+    <input type="text" class="oh-input w-100" id="subject{{candidate.id}}" name="subject">
+    <label for="Body" class="mt-3 mb-1">Body</label>
+    <textarea name="body" class="w-100 oh-input" id="Body{{candidate.id}}" cols="30" rows="2"></textarea>
+    <button type="submit" class="oh-btn oh-btn--secondary w-100">
+        {% trans "Send" %}
+    </button>
 </form>