diff --git a/TestDB_Horilla.sqlite3 b/TestDB_Horilla.sqlite3
index 61c2bcb87..d33be1e48 100755
Binary files a/TestDB_Horilla.sqlite3 and b/TestDB_Horilla.sqlite3 differ
diff --git a/recruitment/templates/pipeline/components/pipeline_search_components.html b/recruitment/templates/pipeline/components/pipeline_search_components.html
index 291a89422..1df1c9705 100644
--- a/recruitment/templates/pipeline/components/pipeline_search_components.html
+++ b/recruitment/templates/pipeline/components/pipeline_search_components.html
@@ -17,7 +17,7 @@
       <div class="oh-tabs__content oh-tabs__content" id="tab_rec_{{ rec.id }}">
         {% if request.user|recruitment_manages:rec or perms.recruitment.add_stage %}
           <div class="d-flex" style="flex-direction: row-reverse;">
-            <button class="oh-btn oh-btn--secondary" data-target="#addStageModal" data-toggle="oh-modal-toggle" hx-get="{% url 'rec-stage-create' %}?recruitment_id={{ rec.id }}" hx-target="#addStageModalBody">
+            <button class="oh-btn oh-btn--secondary" data-target="#objectCreateModal" data-toggle="oh-modal-toggle" hx-get="{% url 'rec-stage-create' %}?recruitment_id={{ rec.id }}" hx-target="#objectCreateModalTarget">
               <ion-icon class="me-1" name="add-outline"></ion-icon>
               {% trans 'Stage' %}
             </button>
diff --git a/recruitment/templates/pipeline/kanban_components/kanban_stage_components.html b/recruitment/templates/pipeline/kanban_components/kanban_stage_components.html
index 33c79e60d..fc6db94cb 100644
--- a/recruitment/templates/pipeline/kanban_components/kanban_stage_components.html
+++ b/recruitment/templates/pipeline/kanban_components/kanban_stage_components.html
@@ -86,7 +86,7 @@
     
 {% if perms.recruitment.add_stage or request.user|recruitment_manages:rec %}
 <div class="oh-kanban__add-container">
-    <button class="oh-btn oh-btn--x-small oh-kanban__add-section"data-target="#addStageModal" data-toggle="oh-modal-toggle" hx-get="{% url "rec-stage-create" %}?recruitment_id={{rec.id}}" hx-target="#addStageModalBody">
+    <button class="oh-btn oh-btn--x-small oh-kanban__add-section"data-target="#objectCreateModal" data-toggle="oh-modal-toggle" hx-get="{% url "rec-stage-create" %}?recruitment_id={{rec.id}}" hx-target="#objectCreateModalTarget">
         <ion-icon class="me-1 md hydrated" name="add-outline" role="img" aria-label="add outline"></ion-icon>
         {% trans "Stage" %}
     </button>                        
diff --git a/recruitment/templates/pipeline/nav.html b/recruitment/templates/pipeline/nav.html
index 92bd1424b..721e4c9e7 100644
--- a/recruitment/templates/pipeline/nav.html
+++ b/recruitment/templates/pipeline/nav.html
@@ -158,28 +158,6 @@ x-data="{searchShow: false}"
   </div>
 </div>
 
-<div
-  class="oh-modal"
-  id="addStageModal"
-  role="dialog"
-  aria-labelledby="addStageModal"
-  aria-hidden="true"
->
-  <div class="oh-modal__dialog">
-    <div class="oh-modal__dialog-header">
-      <h5 class="oh-modal__dialog-title" id="addStageModalLabel"
-        >{% trans "Add Stage" %}</span
-      >
-      <button class="oh-modal__close" aria-label="Close" >
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    
-    <div class="oh-modal__dialog-body" id="addStageModalBody">
-
-    </div>
-  </div>
-</div>
 <div
   class="oh-modal"
   id="updateStageModal"
diff --git a/recruitment/templates/pipeline/pipeline_card.html b/recruitment/templates/pipeline/pipeline_card.html
index 9d980cbf6..f1d0d9502 100644
--- a/recruitment/templates/pipeline/pipeline_card.html
+++ b/recruitment/templates/pipeline/pipeline_card.html
@@ -357,13 +357,12 @@
     
     {% if perms.recruitment.add_stage or request.user|recruitment_manages:rec %}
     <div class="oh-kanban__add-container">
-      <button class="oh-btn oh-btn--x-small oh-kanban__add-section"data-target="#addStageModal" data-toggle="oh-modal-toggle" hx-get="{% url "rec-stage-create" %}?recruitment_id={{rec.id}}" hx-target="#addStageModalBody">
+      <button class="oh-btn oh-btn--x-small oh-kanban__add-section" data-target="#objectCreateModal" data-toggle="oh-modal-toggle" hx-get="{% url "rec-stage-create" %}?recruitment_id={{rec.id}}" hx-target="#objectCreateModalTarget">
           <ion-icon class="me-1 md hydrated" name="add-outline" role="img" aria-label="add outline"></ion-icon>
           {% trans "Stage" %}
       </button>                        
-  </div>
+    </div>
     {% endif %}
-
   </div>
 </div>
 </div>
diff --git a/recruitment/templates/stage/nav.html b/recruitment/templates/stage/nav.html
index 510ca4232..02805630e 100644
--- a/recruitment/templates/stage/nav.html
+++ b/recruitment/templates/stage/nav.html
@@ -60,11 +60,11 @@ x-data="{searchShow: false}"
       <div class="oh-dropdown" x-data="{open: false}">
         {% if perms.recruitment.add_stage %}
           <button 
-            data-target='#addStageModal'
+            data-target='#objectCreateModal'
             data-toggle='oh-modal-toggle'
             class="oh-btn oh-btn--secondary ml-2"
             hx-get="{% url 'rec-stage-create' %}" 
-            hx-target="#addStageModalBody"
+            hx-target="#objectCreateModalTarget"
             >
             <ion-icon name="add" class="mr-1"></ion-icon>{% trans "Create" %}
           </button>
@@ -73,25 +73,4 @@ x-data="{searchShow: false}"
     </div>
   </div>
 </form>
-</section>
-
-
-<div
-  class="oh-modal"
-  id="addStageModal"
-  role="dialog"
-  aria-labelledby="addStageModal"
-  aria-hidden="true"
->
-  <div class="oh-modal__dialog">
-    <div class="oh-modal__dialog-header">
-      <h5 class="oh-modal__dialog-title" id="addStageModalLabel"
-        >{% trans "Add Stage" %}</span
-      >
-      <button class="oh-modal__close" aria-label="Close">
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div class="oh-modal__dialog-body" id="addStageModalBody"></div>
-  </div>
-</div>
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/recruitment/templates/stage/stage_component.html b/recruitment/templates/stage/stage_component.html
index cf373ce28..c03cae46e 100644
--- a/recruitment/templates/stage/stage_component.html
+++ b/recruitment/templates/stage/stage_component.html
@@ -156,9 +156,9 @@
                         {% if perms.recruitment.change_stage %}
                           <a
                             hx-get="{% url 'rec-stage-duplicate' stage.id %}"
-                            hx-target="#addStageModalBody"
+                            hx-target="#objectCreateModalTarget"
                             data-toggle="oh-modal-toggle"
-                            data-target="#addStageModal"
+                            data-target="#objectCreateModal"
                             class="oh-btn oh-btn--light-bkg w-50"
                             title="{% trans 'Duplicate' %}"
                           >
diff --git a/recruitment/templates/stage/stage_empty.html b/recruitment/templates/stage/stage_empty.html
index 4c875c248..91158dc4d 100644
--- a/recruitment/templates/stage/stage_empty.html
+++ b/recruitment/templates/stage/stage_empty.html
@@ -1,71 +1,49 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-<section
-class="oh-wrapper oh-main__topbar"
-x-data="{searchShow: false}"
->
-<div class="oh-main__titlebar oh-main__titlebar--left">
-  <div  class="oh-main__titlebar-title fw-bold mb-0 text-dark" style="cursor:pointer;">{% trans "Stage" %} </div>
-</div>
-
-<div class="oh-main__titlebar oh-main__titlebar--right">
-  
-  <div class="oh-main__titlebar-button-container">
-
-    <div class="oh-dropdown" x-data="{open: false}">
-      {% if perms.recruitment.add_stage %}
-      <button hx-get="{% url 'rec-stage-create' %}" 
-      hx-target="#stageCreateModalBody"
-      class="oh-btn oh-btn--secondary ml-2" 
-      data-toggle='oh-modal-toggle'
-      data-target='#addStageModal'
-      >
-      <ion-icon name="add" class="mr-1"></ion-icon>{% trans "Create" %}
-      </button>
-      {% endif %}
-    
-      </div>
-    
+{% extends 'index.html' %} {% block content %} {% load static %} {% load i18n %}
+<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
+  <div class="oh-main__titlebar oh-main__titlebar--left">
+    <div
+      class="oh-main__titlebar-title fw-bold mb-0 text-dark"
+      style="cursor: pointer"
+    >
+      {% trans "Stage" %}
+    </div>
+  </div>
+
+  <div class="oh-main__titlebar oh-main__titlebar--right">
+    <div class="oh-main__titlebar-button-container">
+      <div class="oh-dropdown" x-data="{open: false}">
+        {% if perms.recruitment.add_stage %}
+        <button
+          hx-get="{% url 'rec-stage-create' %}"
+          hx-target="#objectCreateModalTarget"
+          class="oh-btn oh-btn--secondary ml-2"
+          data-toggle="oh-modal-toggle"
+          data-target="#objectCreateModal"
+        >
+          <ion-icon name="add" class="mr-1"></ion-icon>{% trans "Create" %}
+        </button>
+        {% endif %}
+      </div>
+    </div>
   </div>
-</div>
 </section>
 
-
-<div
-  class="oh-modal"
-  id="addStageModal"
-  role="dialog"
-  aria-labelledby="addStageModal"
-  aria-hidden="true"
->
-  <div class="oh-modal__dialog">
-    <div class="oh-modal__dialog-header">
-      <h5 class="oh-modal__dialog-title" id="addStageModalLabel"
-        >{% trans "Add Stage" %}</span
-      >
-      <button class="oh-modal__close" aria-label="Close">
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div class="oh-modal__dialog-body" id="stageCreateModalBody"></div>
-  </div>
-</div>
-
-<div
-class="oh-wrapper-main"
->
+<div class="oh-wrapper-main">
   <main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-    
     <div class="oh-wrapper">
       <div class="oh-404">
-          <img style="    width: 190px;height: 190px;" src="{% static 'images/ui/interview.png' %}" class="oh-404__image mb-4" alt="Page not found. 404."/>
-          <h5 class="oh-404__subtitle">{% trans "No recruitment stages currently available." %}</h5>
+        <img
+          style="width: 190px; height: 190px"
+          src="{% static 'images/ui/interview.png' %}"
+          class="oh-404__image mb-4"
+          alt="Page not found. 404."
+        />
+        <h5 class="oh-404__subtitle">
+          {% trans "No recruitment stages currently available." %}
+        </h5>
       </div>
     </div>
   </main>
 </div>
-</div>
 
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/recruitment/templates/stage/stage_form.html b/recruitment/templates/stage/stage_form.html
index c107d4881..9aba971f5 100644
--- a/recruitment/templates/stage/stage_form.html
+++ b/recruitment/templates/stage/stage_form.html
@@ -1,48 +1,53 @@
 {% load i18n %}
-<form
-  hx-post="{% url 'rec-stage-create' %}"
-  class="oh-general__tab-target oh-profile-section"
-  hx-target="#addStageModalBody"
->
-  <div>
-    {% csrf_token %}
-    <div class="row" id="stageFormCreate">
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-        <label class="oh-label" for="">{% trans "Stage" %} *</label>
-        {{form.stage}} {{form.stage.errors}}
-      </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-        <label class="oh-label" for="">{% trans "Recruitment" %} *</label>
-        {{form.recruitment_id}} {{form.recruitment_id.errors}}
-      </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6" id="stage_manager">
-        <label class="oh-label" for="">{% trans "Stage Managers" %} *</label>
-        {{form.stage_managers}} {{form.stage_managers.errors}}
-        <ul id="error-list" class="errorlist" style="display: none">
-          <li>{% trans "This field is requied" %}</li>
-        </ul>
-      </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-        <label class="oh-label" for="">{% trans "Stage Type" %} *</label>
-        {{form.stage_type}} {{form.stage_type.errors}}
-      </div>
-      <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-        <label class="oh-label" for="">{% trans "Is Active" %}?</label>
-        <div class="oh-switch">
-          {{form.is_active}} {{form.is_active.errors}}
+<div class="oh-modal__dialog-header">
+  <span class="oh-modal__dialog-title" id="objectCreateModalLabel"
+    >{% trans "Add Stage" %}</span
+  >
+  <button class="oh-modal__close" aria-label="Close">
+    <ion-icon name="close-outline"></ion-icon>
+  </button>
+</div>
+
+<div class="oh-modal__dialog-body" id="objectCreateModalBody">
+  <form
+    hx-post="{% url 'rec-stage-create' %}"
+    class="oh-general__tab-target oh-profile-section"
+    hx-target="#objectCreateModalTarget"
+  >
+    <div>
+      {% csrf_token %}
+      <div class="row" id="stageFormCreate">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <label class="oh-label" for="">{% trans "Stage" %} *</label>
+          {{form.stage}} {{form.stage.errors}}
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <label class="oh-label" for="">{% trans "Recruitment" %} *</label>
+          {{form.recruitment_id}} {{form.recruitment_id.errors}}
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6" id="stage_manager">
+          <label class="oh-label" for="">{% trans "Stage Managers" %} *</label>
+          {{form.stage_managers}} {{form.stage_managers.errors}}
+          <ul id="error-list" class="errorlist" style="display: none">
+            <li>{% trans "This field is requied" %}</li>
+          </ul>
+        </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <label class="oh-label" for="">{% trans "Stage Type" %} *</label>
+          {{form.stage_type}} {{form.stage_type.errors}}
         </div>
       </div>
     </div>
-  </div>
-  <div class="d-flex flex-row-reverse w-100 align-items-right mt-4">
-    <button type="submit" class="oh-btn oh-btn--secondary pl-5 pr-5">
-      {% trans "Save" %}
-    </button>
-  </div>
-</form>
+    <div class="d-flex flex-row-reverse w-100 align-items-right mt-4">
+      <button type="submit" class="oh-btn oh-btn--secondary pl-5 pr-5">
+        {% trans "Save" %}
+      </button>
+    </div>
+  </form>
 
-<script>
-  $(document).ready(function () {
-    $("#stageFormCreate [name=stage_managers]").removeAttr("required");
-  });
-</script>
+  <script>
+    $(document).ready(function () {
+      $("#stageFormCreate [name=stage_managers]").removeAttr("required");
+    });
+  </script>
+</div>