diff --git a/base/templates/base/rotating_shift/htmx/group_by.html b/base/templates/base/rotating_shift/htmx/group_by.html
index fe07527af..ea5a14211 100644
--- a/base/templates/base/rotating_shift/htmx/group_by.html
+++ b/base/templates/base/rotating_shift/htmx/group_by.html
@@ -72,7 +72,7 @@
                   </div>
                   <div class="oh-sticky-table__tbody">
                       {% for rshift in rshift_request_list.list %}
-                      <div class="oh-sticky-table__tr" draggable="true" hx-get="{% url "rshift-individual-view" rshift.id %}?instances_ids={{assign_ids}}" hx-target="#rotatingShiftAssignDetail" data-toggle="oh-modal-toggle" data-target="#rotatingShiftAssignDetailModal">
+                      <div class="oh-sticky-table__tr" draggable="true" hx-get="{% url "rshift-individual-view" rshift.id %}?instances_ids={{assign_ids}}" hx-target="#objectDetailsModalTarget" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal">
                       <div class="oh-sticky-table__sd" onclick="event.stopPropagation();">
                           <div class="centered-div">
                           <input
diff --git a/base/templates/base/rotating_shift/individual_view.html b/base/templates/base/rotating_shift/individual_view.html
index 785b416ed..1938dbcc4 100644
--- a/base/templates/base/rotating_shift/individual_view.html
+++ b/base/templates/base/rotating_shift/individual_view.html
@@ -13,12 +13,12 @@
 <div class="oh-modal__dialog-body oh-modal__dialog-relative" >
 {% if request.GET.instances_ids %}
 <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
-    <button hx-get="{% url 'rshift-individual-view' previous %}?instances_ids={{assign_ids}}" hx-target = "#rotatingShiftAssignDetail" class="oh-modal__diaglog-nav oh-modal__nav-prev">
+    <button hx-get="{% url 'rshift-individual-view' previous %}?instances_ids={{assign_ids}}" hx-target = "#objectDetailsModalTarget" class="oh-modal__diaglog-nav oh-modal__nav-prev">
         <ion-icon name="chevron-back-outline" class="md hydrated" role="img"
         aria-label="chevron back outline"></ion-icon>
     </button>
 
-    <button hx-get="{% url 'rshift-individual-view' next  %}?instances_ids={{assign_ids}}" hx-target = "#rotatingShiftAssignDetail" class="oh-modal__diaglog-nav oh-modal__nav-next">
+    <button hx-get="{% url 'rshift-individual-view' next  %}?instances_ids={{assign_ids}}" hx-target = "#objectDetailsModalTarget" class="oh-modal__diaglog-nav oh-modal__nav-next">
         <ion-icon name="chevron-forward-outline" class="md hydrated" role="img"
         aria-label="chevron forward outline"></ion-icon>
     </button>
diff --git a/base/templates/base/rotating_shift/rotating_shift_assign.html b/base/templates/base/rotating_shift/rotating_shift_assign.html
index 4ef0dee74..79c36ce32 100644
--- a/base/templates/base/rotating_shift/rotating_shift_assign.html
+++ b/base/templates/base/rotating_shift/rotating_shift_assign.html
@@ -49,15 +49,6 @@
   </div>
 </div>
 
-<div
-  class="oh-modal" style="z-index: 60;"
-  id="rotatingShiftAssignDetailModal"
-  role="dialog"
-  aria-labelledby="rotating-shift-detail-modal"
-  aria-hidden="true"
->
-  <div class="oh-modal__dialog" id="rotatingShiftAssignDetail"></div>
-</div>
 <div class="oh-checkpoint-badge mb-2" id="selectedRShifts" data-ids="[]" data-clicked="" style="display:none;" >
   {% trans "Selected Shifts" %}
 </div>
diff --git a/base/templates/base/rotating_shift/rotating_shift_assign_view.html b/base/templates/base/rotating_shift/rotating_shift_assign_view.html
index 26144fef4..a6516ef50 100644
--- a/base/templates/base/rotating_shift/rotating_shift_assign_view.html
+++ b/base/templates/base/rotating_shift/rotating_shift_assign_view.html
@@ -73,7 +73,7 @@
         </div>
         <div class="oh-sticky-table__tbody">
           {% for rshift in rshift_assign %}
-          <div class="oh-sticky-table__tr" draggable="true" hx-get="{% url "rshift-individual-view" rshift.id %}?instances_ids={{assign_ids}}" hx-target="#rotatingShiftAssignDetail" data-toggle="oh-modal-toggle" data-target="#rotatingShiftAssignDetailModal">
+          <div class="oh-sticky-table__tr" draggable="true" hx-get="{% url "rshift-individual-view" rshift.id %}?instances_ids={{assign_ids}}" hx-target="#objectDetailsModalTarget" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal">
             <div class="oh-sticky-table__sd" onclick="event.stopPropagation();">
               <div class="centered-div">
                 <input
diff --git a/base/templates/base/rotating_work_type/htmx/group_by.html b/base/templates/base/rotating_work_type/htmx/group_by.html
index c249e5aed..b4de6d447 100644
--- a/base/templates/base/rotating_work_type/htmx/group_by.html
+++ b/base/templates/base/rotating_work_type/htmx/group_by.html
@@ -71,7 +71,7 @@ style="cursor: pointer; display: none"
 						  </div>
 						  <div class="oh-sticky-table__tbody">
 							{% for rwork_type in rwork_type_list.list %}
-							<div class="oh-sticky-table__tr" hx-get="{% url "rwork-individual-view" rwork_type.id %}?instances_ids={{assign_ids}}" data-toggle="oh-modal-toggle" data-target="#rotatingWorkTypeDetailModal" hx-target="#rotatingWorkTypeAssignDetail" draggable="true">
+							<div class="oh-sticky-table__tr" hx-get="{% url "rwork-individual-view" rwork_type.id %}?instances_ids={{assign_ids}}" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" hx-target="#objectDetailsModalTarget" draggable="true">
 							  <div class="oh-sticky-table__sd" onclick="event.stopPropagation();">
 								<div class="centered-div">
 								  <input
diff --git a/base/templates/base/rotating_work_type/individual_view.html b/base/templates/base/rotating_work_type/individual_view.html
index 60c6c87f3..a19b07f38 100644
--- a/base/templates/base/rotating_work_type/individual_view.html
+++ b/base/templates/base/rotating_work_type/individual_view.html
@@ -2,7 +2,7 @@
 <div class="oh-modal__dialog-header">
     <span
       class="oh-modal__dialog-title"
-      id="rotatingWorkTypeDetailModalLabel"
+      id="objectDetailsModalLabel"
         >
       {% trans "Details" %}
     </span>
@@ -13,12 +13,12 @@
 <div class="oh-modal__dialog-body oh-modal__dialog-relative">
 {% if request.GET.instances_ids %}
 <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
-    <button hx-get="{% url 'rwork-individual-view' previous %}?instances_ids={{assign_ids}}" hx-target = "#rotatingWorkTypeAssignDetail" class="oh-modal__diaglog-nav oh-modal__nav-prev">
+    <button hx-get="{% url 'rwork-individual-view' previous %}?instances_ids={{assign_ids}}" hx-target = "#objectDetailsModalTarget" class="oh-modal__diaglog-nav oh-modal__nav-prev">
         <ion-icon name="chevron-back-outline" class="md hydrated" role="img"
         aria-label="chevron back outline"></ion-icon>
     </button>
 
-    <button hx-get="{% url 'rwork-individual-view' next  %}?instances_ids={{assign_ids}}" hx-target = "#rotatingWorkTypeAssignDetail" class="oh-modal__diaglog-nav oh-modal__nav-next">
+    <button hx-get="{% url 'rwork-individual-view' next  %}?instances_ids={{assign_ids}}" hx-target = "#objectDetailsModalTarget" class="oh-modal__diaglog-nav oh-modal__nav-next">
         <ion-icon name="chevron-forward-outline" class="md hydrated" role="img"
         aria-label="chevron forward outline"></ion-icon>
     </button>
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign.html b/base/templates/base/rotating_work_type/rotating_work_type_assign.html
index f3a0818a4..8b8bfd7b1 100644
--- a/base/templates/base/rotating_work_type/rotating_work_type_assign.html
+++ b/base/templates/base/rotating_work_type/rotating_work_type_assign.html
@@ -62,15 +62,5 @@
 </div>
 
 
-<div
-  class="oh-modal" style="z-index: 60;"
-  id="rotatingWorkTypeDetailModal"
-  role="dialog"
-  aria-labelledby="rotatingWorkTypeDetailModal"
-  aria-hidden="true"
-  >
-  <div class="oh-modal__dialog" id="rotatingWorkTypeAssignDetail"> </div>
-</div>
-
 <script src="{% static 'basedOn.js' %}"></script>
 {% endblock content %}
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
index 293e0249e..85a927cc9 100644
--- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
+++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html
@@ -71,7 +71,7 @@
         </div>
         <div class="oh-sticky-table__tbody">
           {% for rwork_type in rwork_type_assign %}
-          <div class="oh-sticky-table__tr" hx-get="{% url "rwork-individual-view" rwork_type.id %}?instances_ids={{assign_ids}}" data-toggle="oh-modal-toggle" data-target="#rotatingWorkTypeDetailModal" hx-target="#rotatingWorkTypeAssignDetail" draggable="true">
+          <div class="oh-sticky-table__tr" hx-get="{% url "rwork-individual-view" rwork_type.id %}?instances_ids={{assign_ids}}" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" hx-target="#objectDetailsModalTarget" draggable="true">
             <div class="oh-sticky-table__sd" onclick="event.stopPropagation();">
               <div class="centered-div">
                 <input