diff --git a/attendance/templates/attendance/attendance/group_by.html b/attendance/templates/attendance/attendance/group_by.html
index 6a87fe215..1c2c040b0 100644
--- a/attendance/templates/attendance/attendance/group_by.html
+++ b/attendance/templates/attendance/attendance/group_by.html
@@ -77,8 +77,8 @@
                   <div class="oh-sticky-table__th">{% trans "At Work" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Pending Hours" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Overtime" %}</div>
-                  <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                  <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                 </div>
               </div>
               <div class="oh-sticky-table__tbody">
@@ -134,24 +134,6 @@
                   <div class="oh-sticky-table__td">
                     {{attendance.attendance_overtime}}
                   </div>
-                  <div class="oh-sticky-table__td oh-sticky-table__right">
-                      {% if attendance.attendance_overtime_approve %}
-                          <a type="submit" href="#" title="{% trans 'Approved' %}"
-                            class="oh-btn oh-btn--success oh-btn--disabled w-100"
-                            onclick="event.stopPropagation()"
-                          >
-                            <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                        </a>
-                      {% else %}
-                          <a type="submit" href="{% url 'approve-overtime' attendance.id %}" 
-                              title="{% trans 'Approve' %}"
-                              class="oh-btn oh-btn--success w-100"
-                              onclick="event.stopPropagation()"
-                              >
-                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                          </a>
-                      {% endif %}
-                  </div>
                   <div class="oh-sticky-table__td">
                     <div class="oh-btn-group">
                       {% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -176,6 +158,24 @@
                       {% endif %}
                     </div>
                   </div>
+                  <div class="oh-sticky-table__td oh-sticky-table__right">
+                      {% if attendance.attendance_overtime_approve %}
+                          <a type="submit" href="#" title="{% trans 'Approved' %}"
+                            class="oh-btn oh-btn--success oh-btn--disabled w-100"
+                            onclick="event.stopPropagation()"
+                          >
+                            <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                        </a>
+                      {% else %}
+                          <a type="submit" href="{% url 'approve-overtime' attendance.id %}" 
+                              title="{% trans 'Approve' %}"
+                              class="oh-btn oh-btn--success w-100"
+                              onclick="event.stopPropagation()"
+                              >
+                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                          </a>
+                      {% endif %}
+                  </div>
                 </div>
                 {% endfor %}
               </div>
@@ -341,8 +341,8 @@
                   <div class="oh-sticky-table__th">{% trans "At Work" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Pending Hours" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Overtime" %}</div>
-                  <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
                   <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                  <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                 </div>
               </div>
               <div class="oh-sticky-table__tbody">
@@ -398,19 +398,6 @@
                   <div class="oh-sticky-table__td">
                     {{attendance.attendance_overtime}}
                   </div>
-                  <div class="oh-sticky-table__td oh-sticky-table__right">
-                      {% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
-                          <a
-                            href='{% url "validate-this-attendance" attendance.id %}?vpage={{validate_attendances.number}}&{{attendance_list.dynamic_name}}={{ attendance_list.list.number }}'
-                            hx-target="#updateAttendanceBody"
-                            data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
-                            onclick="event.stopPropagation(); {% if attendance.is_validate_request %}  event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
-                            class="oh-btn oh-btn--info"
-                            >
-                            {% trans "Validate" %}
-                          </a>
-                      {% endif %}
-                  </div>
                   <div class="oh-sticky-table__td">
                     <div class="oh-btn-group">
                       {% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -435,6 +422,19 @@
                       {% endif %}
                     </div>
                   </div>
+                  <div class="oh-sticky-table__td oh-sticky-table__right">
+                      {% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
+                          <a
+                            href='{% url "validate-this-attendance" attendance.id %}?vpage={{validate_attendances.number}}&{{attendance_list.dynamic_name}}={{ attendance_list.list.number }}'
+                            hx-target="#updateAttendanceBody"
+                            data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
+                            onclick="event.stopPropagation(); {% if attendance.is_validate_request %}  event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
+                            class="oh-btn oh-btn--info"
+                            >
+                            {% trans "Validate" %}
+                          </a>
+                      {% endif %}
+                  </div>
                 </div>
                 {% endfor %}
               </div>
diff --git a/attendance/templates/attendance/attendance/tab_content.html b/attendance/templates/attendance/attendance/tab_content.html
index 9a6fa0997..ba19c4f16 100644
--- a/attendance/templates/attendance/attendance/tab_content.html
+++ b/attendance/templates/attendance/attendance/tab_content.html
@@ -346,8 +346,8 @@
                       >
                       {% trans "Overtime" %}
                     </div>
-                    <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
                     <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                    <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                 </div>
             </div>
             {% for attendance in validate_attendances %}
@@ -408,19 +408,6 @@
                         <div data-cell-index="32" class="oh-sticky-table__td">
                           {{attendance.attendance_overtime}}
                         </div>
-                        <div class="oh-sticky-table__td  oh-sticky-table__right">
-                            {% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
-                                <a
-                                  href='{% url "validate-this-attendance" attendance.id %}'
-                                  hx-target="#updateAttendanceBody"
-                                  data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
-                                  onclick="event.stopPropagation(); {% if attendance.is_validate_request %}  event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
-                                  class="oh-btn oh-btn--info"
-                                  >
-                                  {% trans "Validate" %}
-                                </a>
-                            {% endif %}
-                        </div>
                         <div class="oh-sticky-table__td">
                             <div class="oh-btn-group">
                                 {% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -453,6 +440,19 @@
                                 {% endif %}
                             </div>
                         </div>
+                        <div class="oh-sticky-table__td  oh-sticky-table__right">
+                            {% if request.user|is_reportingmanager or perms.attendance.change_attendance %}
+                                <a
+                                  href='{% url "validate-this-attendance" attendance.id %}'
+                                  hx-target="#updateAttendanceBody"
+                                  data-req="/attendance/request-attendance-view/?id={{attendance.id}}"
+                                  onclick="event.stopPropagation(); {% if attendance.is_validate_request %}  event.preventDefault(); showSweetAlert($(this).data('req')); {% endif %}"
+                                  class="oh-btn oh-btn--info"
+                                  >
+                                  {% trans "Validate" %}
+                                </a>
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
             {% endfor %}
@@ -603,8 +603,8 @@
                       >
                       {% trans "Overtime" %}
                     </div>
-                    <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Options" %}</div>
                     <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                    <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                 </div>
             </div>
             {% for attendance in overtime_attendances %}
@@ -665,24 +665,6 @@
                         <div data-cell-index="52" class="oh-sticky-table__td">
                           {{attendance.attendance_overtime}}
                         </div>
-                        <div class="oh-sticky-table__td  oh-sticky-table__right">
-                            {% if attendance.attendance_overtime_approve %}
-                                <a type="submit" href="#" title="{% trans 'Approved' %}"
-                                    class="oh-btn oh-btn--success oh-btn--disabled w-100"
-                                    onclick="event.stopPropagation()"
-                                  >
-                                    <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                </a>
-                            {% else %}
-                                <a type="submit" href="{% url 'approve-overtime' attendance.id %}" 
-                                    title="{% trans 'Approve Overtime' %}"
-                                    class="oh-btn oh-btn--success w-100"
-                                    onclick="event.stopPropagation()"
-                                    >
-                                    <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                </a>
-                            {% endif %}
-                        </div>
                         <div class="oh-sticky-table__td">
                             <div class="oh-btn-group">
                                 {% if perms.attendance.change_attendance or request.user|is_reportingmanager %}
@@ -715,6 +697,24 @@
                                 {% endif %}
                             </div>
                         </div>
+                        <div class="oh-sticky-table__td  oh-sticky-table__right">
+                            {% if attendance.attendance_overtime_approve %}
+                                <a type="submit" href="#" title="{% trans 'Approved' %}"
+                                    class="oh-btn oh-btn--success oh-btn--disabled w-100"
+                                    onclick="event.stopPropagation()"
+                                  >
+                                    <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                                </a>
+                            {% else %}
+                                <a type="submit" href="{% url 'approve-overtime' attendance.id %}" 
+                                    title="{% trans 'Approve Overtime' %}"
+                                    class="oh-btn oh-btn--success w-100"
+                                    onclick="event.stopPropagation()"
+                                    >
+                                    <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                                </a>
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
             {% endfor %}
diff --git a/base/templates/shift_request/htmx/requests.html b/base/templates/shift_request/htmx/requests.html
index 6fc9eb4cf..85c46b1e3 100755
--- a/base/templates/shift_request/htmx/requests.html
+++ b/base/templates/shift_request/htmx/requests.html
@@ -3,563 +3,556 @@
 {% load static %}
 {% load i18n %}
 {% include 'filter_tags.html' %}
-
-    {% if data or allocated_data%}
-    <div class="oh-tabs__contents">
-      <div class="oh-tabs__content oh-tabs__content--active" id=tab_1>
-        <div class="oh-table_sticky--wrapper">
-          <div class="oh-sticky-dropdown--header">
-            <div class="oh-dropdown" x-data="{open: false}">
-              <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
-                role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
-              <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
-              <ul class="oh-dropdown__items" id="shiftRequestCells">
-              </ul>
-              </div>
+<div class="oh-tabs__contents">
+  <!-- start of shift request tab -->
+  <div class="oh-tabs__content oh-tabs__content--active" id=tab_1>
+    {% if data %}
+      <div class="oh-table_sticky--wrapper">
+        <div class="oh-sticky-dropdown--header">
+          <div class="oh-dropdown" x-data="{open: false}">
+            <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
+              role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
+            <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
+            <ul class="oh-dropdown__items" id="shiftRequestCells">
+            </ul>
             </div>
           </div>
         </div>
-          <div id="shift-request-table" data-table-name="shift_request_tab"> 
-            <!-- start of sticky table -->
-            <div class="oh-sticky-table">
-              <div class="oh-sticky-table__table oh-table--sortable">
-                <div class="oh-sticky-table__thead">
-                  <div class="oh-sticky-table__tr">
-                    <div class="oh-sticky-table__th" style="width:10px">
-                      <div class="centered-div">
-                        <input
-                          type="checkbox"
-                          class="oh-input oh-input__checkbox all-shift-requests"
-                          title='{% trans "Select All" %}'
-                        />
-                      </div>
-                    </div>
-                    <div 
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_id__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
-                      hx-target="#view-container" 
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=employee_id__employee_first_name" 
-                    >
-                      {% trans "Employee" %}
-                    </div>
-                    <div data-cell-index="2" data-cell-title='{% trans "Requested Shift" %}' class="oh-sticky-table__th">{% trans "Requested Shift" %}</div>
-                    <div data-cell-index="3" data-cell-title='{% trans "Previous/Current Shift" %}' class="oh-sticky-table__th">{% trans "Previous/Current Shift" %}</div>
-                    <div data-cell-index="4" data-cell-title='{% trans "Requested Date" %}'
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-requested_date' %}arrow-up {% elif request.sort_option.order == 'requested_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_date" 
-                      hx-target="#view-container"
-                    >{% trans "Requested Date" %}</div>
-                    <div data-cell-index="5" data-cell-title='{% trans "Requested Till" %}'
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-requested_till' %}arrow-up {% elif request.sort_option.order == 'requested_till' %}arrow-down {% else %}arrow-up-down {% endif %}" 
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_till" 
-                      hx-target="#view-container"
-                    >{% trans "Requested Till" %}</div>
-                    <div data-cell-index="6" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
-                    <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
-                    <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
-                    {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %}
-                      <div class="oh-sticky-table__th oh-sticky-table__right " style="width:180px;">{% trans "Confirmation" %}</div>
-                    {% endif %}
-                  </div>
-                </div>
-                <div class="oh-sticky-table__tbody">
-                  {% for shift_request in data %}
-                      <div class="oh-sticky-table__tr" 
-                          draggable="true"
-                          hx-get="{% url 'shift-request-details' shift_request.id %}?instances_ids={{requests_ids}}" 
-                          hx-target="#shiftRequestDetailTarget" 
-                          data-toggle='oh-modal-toggle' 
-                          data-target = '#shiftRequestDetailModal' 
-                      >
-                        <div class="oh-sticky-table__sd
-                          {% if shift_request.approved %} row-status--yellow 
-                          {% elif  shift_request.canceled %} row-status--red
-                          {% endif %}"
-                          onclick="event.stopPropagation();"
-                        >
-                          <div class="centered-div">
-                            <input
-                              type="checkbox"
-                              id="{{shift_request.id}}"
-                              onchange="highlightRow($(this))"
-                              class="oh-input employee-checkbox oh-input__checkbox all-shift-requests-row"
-                            />
-                          </div>
-                        </div>
-                        <div class="oh-sticky-table__td" >
-                          <div class="oh-profile oh-profile--md">
-                            <div class="oh-profile__avatar mr-1">
-                              <img src="{{shift_request.employee_id.get_avatar}}" class="oh-profile__image" alt="Username">
-                            </div>
-                            <span class="oh-profile__name oh-text--dark">{{shift_request.employee_id}}</span>
-                          </div>
-                        </div>
-                        <div class="oh-sticky-table__td" data-cell-index="2">{{shift_request.shift_id}}</div>
-                        <div class="oh-sticky-table__td" data-cell-index="3">{{shift_request.previous_shift_id}}</div>
-                        <div class="oh-sticky-table__td dateformat_changer" data-cell-index="4">{{shift_request.requested_date}}</div>
-                        <div class="oh-sticky-table__td dateformat_changer" data-cell-index="5">{{shift_request.requested_till}}</div>
-                        <div class="oh-sticky-table__td" data-cell-index="6">{{shift_request.description}}</div>
-                        
-                        <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
-                          
-                          <div class="oh-btn-group" >
-                            <button type="button" hx-get="{% url 'shift-request-add-comment' shift_request.id %}" title="Add Comment" hx-target="#shiftRequestCommentForm"
-                                  hx-swap="innerHTML" class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle" data-target="#shiftcommentModal" 
-                                  style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;">
-                              <ion-icon name="newspaper-outline" role="img" class="md hydrated" aria-label="newspaper outline"></ion-icon>
-                            </button>
-        
-                            <button type="button" hx-get="{% url 'view-shift-comment' shift_request.id %}" hx-target="#commentContainer"
-                                    data-target = '#activitySidebar' title="View Comment"  class="oh-btn oh-btn--light oh-activity-sidebar__open" style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;" onclick="event.stopPropagation()">
-                              <ion-icon name="eye-outline" role="img" class="md hydrated" aria-label="eye outline"></ion-icon>
-                            </button>
-                        </div>
-                        
-                        </div>
-        
-                        <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
-                          <div class="oh-btn-group" >
-                            {% if shift_request.approved == False and not shift_request.canceled   %}
-                              <a hx-get="{% url 'shift-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
-                            {% else %}
-                              <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
-                            {% endif %}
-                            {% if shift_request.approved == False and shift_request.canceled == False %} 
-                              <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                {% csrf_token %}
-                                <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                              </form>
-                            {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                              <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                {% csrf_token %}
-                                <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                              </form>
-                            {% else %}
-                              <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
-                            {% endif %} 
-                          </div>
-                        </div>
-                        {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                          <div class="oh-sticky-table__td oh-sticky-table__right " onclick="event.stopPropagation();"> 
-                            <div class="oh-btn-group" >
-                                {% if shift_request.approved == False and shift_request.canceled == False %}
-                                  <a  href="{% url 'shift-request-approve' shift_request.id %}" 
-                                      title="{% trans 'Approve' %}"
-                                      onclick="return confirm('{% trans "Do you want to approve this request?" %}')"
-                                      class="oh-btn oh-btn--success w-100">
-                                      <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                  </a>
-                                {% else %}
-                                  <a  href="#" title="{% trans 'Approve' %}"
-                                      class="oh-btn oh-btn--success oh-btn--disabled w-100">
-                                      <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                  </a>
-                                {% endif %}
-        
-                                {% if shift_request.canceled == False %}
-                                  <a 
-                                      href="{% url 'shift-request-cancel' shift_request.id %}" 
-                                      title="{% trans 'Reject' %}"
-                                      onclick="return confirm('{% trans "Do you want to reject this request?" %}')"
-                                      class="oh-btn oh-btn--danger w-100">
-                                      <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-                                  </a>
-                                {% else %}
-                                  <a type="submit" href="#" title="{% trans 'Reject' %}"
-                                      class="oh-btn oh-btn--danger oh-btn--disabled
-                                      w-100" >
-                                      <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-                                  </a>
-                                {% endif %}
-                            </div>
-                          </div>
-                        {% endif %}
-                      </div>
-                  {% endfor %}
-                </div>
-              </div>
-            </div>
-            <!-- end of sticky table -->
-          </div>
-        
-          <!-- start of pagination -->
-          <div class="oh-pagination">
-            <span class="oh-pagination__page">
-              {% trans "Page" %} {{ data.number }} {% trans "of" %} {{ data.paginator.num_pages }}.
-            </span>
-            <nav class="oh-pagination__nav">
-              <div class="oh-pagination__input-container me-3">
-                <span class="oh-pagination__label me-1">{% trans "Page" %}</span>
-                <input type="number" name="page" class="oh-pagination__input" value="{{data.number}}"
-                  hx-get="{% url 'shift-request-search' %}?{{pd}}" hx-target="#view-container" min="1" />
-                <span class="oh-pagination__label">{% trans "of" %} {{data.paginator.num_pages}}</span>
-              </div>
-              <ul class="oh-pagination__items">
-                {% if data.has_previous %}
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container' hx-get="{% url 'shift-request-search' %}?{{pd}}&page=1"
-                    class="oh-pagination__link">{% trans "First" %}</a>
-                </li>
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.previous_page_number }}"
-                    class="oh-pagination__link">{% trans "Previous" %}</a>
-                </li>
-                {% endif %}
-                {% if data.has_next %}
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.next_page_number }}"
-                    class="oh-pagination__link">{% trans "Next" %}</a>
-                </li>
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.paginator.num_pages }}"
-                    class="oh-pagination__link">{% trans "Last" %}</a>
-                </li>
-                {% endif %}
-              </ul>
-            </nav>
-          </div>
-          <!-- end of pagination -->
-        </div>
-
-
-
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-        <!-- ################################################################### -->
-
-        <div class="oh-tabs__content" id=tab_2>
-          <div class="oh-table_sticky--wrapper">
-            <div class="oh-sticky-dropdown--header">
-              <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
-                  role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
-                <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
-                <ul class="oh-dropdown__items" id="shiftRequestCells2">
-                </ul>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div id="shift-allocation-request-table" data-table-name="shift_request_tab2"> 
-            <!-- start of sticky table -->
-            <div class="oh-sticky-table">
-              <div class="oh-sticky-table__table oh-table--sortable">
-                <div class="oh-sticky-table__thead">
-                  <div class="oh-sticky-table__tr">
-                    <div class="oh-sticky-table__th" style="width:10px">
-                      <div class="centered-div">
-                        <input
-                          type="checkbox"
-                          class="oh-input oh-input__checkbox all-shift-requests"
-                          title='{% trans "Select All" %}'
-                        />
-                      </div>
-                    </div>
-                    <div 
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_id__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
-                      hx-target="#view-container" 
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=employee_id__employee_first_name" 
-                    >
-                      {% trans "Employee" %}
-                    </div>
-                    <div 
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-reallocate_to__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'reallocate_to__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
-                      hx-target="#view-container" 
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=reallocate_to__employee_first_name"
-                      style="width:210px;"
-                    >
-                      {% trans "Allocated Employee" %}
-                    </div>
-                    <div class="oh-sticky-table__th">{% trans "User Availability" %}</div>
-                    <div data-cell-index="12" data-cell-title='{% trans "Requested Shift" %}' class="oh-sticky-table__th">{% trans "Requested Shift" %}</div>
-                    <div data-cell-index="13" data-cell-title='{% trans "Previous/Current Shift" %}' class="oh-sticky-table__th">{% trans "Previous/Current Shift" %}</div>
-                    <div data-cell-index="14" data-cell-title='{% trans "Requested Date" %}'
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-requested_date' %}arrow-up {% elif request.sort_option.order == 'requested_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_date" 
-                      hx-target="#view-container"
-                    >{% trans "Requested Date" %}</div>
-                    <div data-cell-index="15" data-cell-title='{% trans "Requested Till" %}'
-                      class="oh-sticky-table__th {% if request.sort_option.order == '-requested_till' %}arrow-up {% elif request.sort_option.order == 'requested_till' %}arrow-down {% else %}arrow-up-down {% endif %}" 
-                      hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_till" 
-                      hx-target="#view-container"
-                    >{% trans "Requested Till" %}</div>
-                    <div data-cell-index="16" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
-                    <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
-                    {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %}
-                      <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
-                    {% endif %}
-                    <div class="oh-sticky-table__th oh-sticky-table__right" style="width:180px;">{% trans "Confirmation" %}</div>
-                  </div>
-                </div>
-                <div class="oh-sticky-table__tbody">
-                  {% for shift_request in allocated_data %}
-                      <div class="oh-sticky-table__tr" 
-                          draggable="true"
-                          hx-get="{% url 'shift-allocation-request-details' shift_request.id %}?instances_ids={{allocated_ids}}" 
-                          hx-target="#shiftRequestDetailTarget" 
-                          data-toggle='oh-modal-toggle' 
-                          data-target = '#shiftRequestDetailModal' 
-                      >
-                        <div class="oh-sticky-table__sd
-                          {% if shift_request.approved %} row-status--yellow 
-                          {% elif  shift_request.canceled %} row-status--red
-                          {% endif %}"
-                          onclick="event.stopPropagation();"
-                        >
-                          <div class="centered-div">
-                            <input
-                              type="checkbox"
-                              id="{{shift_request.id}}"
-                              onchange="highlightRow($(this))"
-                              class="oh-input employee-checkbox oh-input__checkbox all-shift-requests-row"
-                            />
-                          </div>
-                        </div>
-                        <div class="oh-sticky-table__td" >
-                          <div class="oh-profile oh-profile--md">
-                            <div class="oh-profile__avatar mr-1">
-                              <img src="{{shift_request.employee_id.get_avatar}}" class="oh-profile__image" alt="Username">
-                            </div>
-                            <span class="oh-profile__name oh-text--dark">{{shift_request.employee_id}}</span>
-                          </div>
-                        </div>
-                        <div class="oh-sticky-table__td">
-                          <div class="oh-profile oh-profile--md">
-                            <div class="oh-profile__avatar mr-1">
-                              <img src="{{shift_request.reallocate_to.get_avatar}}" class="oh-profile__image">
-                            </div>
-                            <span class="oh-profile__name oh-text--dark">{{shift_request.reallocate_to}}</span>
-                          </div>
-                        </div>
-                        <div class="oh-sticky-table__td">
-                          {% if shift_request.reallocate_approved == True %}
-                            <div class="d-flex align-items-center">
-                              <span class="oh-dot oh-dot--small me-1 oh-dot--color  oh-dot--success "></span><span class=" link-success ">{% trans "Available" %}</span>
-                            </div>
-                          {% elif shift_request.reallocate_canceled == True %}
-                            <div class="d-flex align-items-center">
-                              <span class="oh-dot oh-dot--small me-1 oh-dot--color  oh-dot--danger "></span><span class=" link-danger ">{% trans "Not Available" %}</span>
-                            </div>
-                          {% else %}
-                            <div class="d-flex align-items-center">
-                              <span class="oh-dot oh-dot--small me-1 oh-dot--color" style="background-color:grey;"></span><span class=" link-secondary ">{% trans "Not Marked" %}</span>
-                            </div>
-                          {% endif %}
-                        </div>
-                        <div class="oh-sticky-table__td" data-cell-index="12">{{shift_request.shift_id}}</div>
-                        <div class="oh-sticky-table__td" data-cell-index="13">{{shift_request.previous_shift_id}}</div>
-                        <div class="oh-sticky-table__td dateformat_changer" data-cell-index="14">{{shift_request.requested_date}}</div>
-                        <div class="oh-sticky-table__td dateformat_changer" data-cell-index="15">{{shift_request.requested_till}}</div>
-                        <div class="oh-sticky-table__td" data-cell-index="16">{{shift_request.description}}</div>
-                        
-                        <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
-                          
-                          <div class="oh-btn-group" >
-                            <button type="button" hx-get="{% url 'shift-request-add-comment' shift_request.id %}" title="Add Comment" hx-target="#shiftRequestCommentForm"
-                                  hx-swap="innerHTML" class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle" data-target="#shiftcommentModal" 
-                                  style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;">
-                              <ion-icon name="newspaper-outline" role="img" class="md hydrated" aria-label="newspaper outline"></ion-icon>
-                            </button>
-        
-                            <button type="button" hx-get="{% url 'view-shift-comment' shift_request.id %}" hx-target="#commentContainer"
-                                    data-target = '#activitySidebar' title="View Comment"  class="oh-btn oh-btn--light oh-activity-sidebar__open" style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;" onclick="event.stopPropagation()">
-                              <ion-icon name="eye-outline" role="img" class="md hydrated" aria-label="eye outline"></ion-icon>
-                            </button>
-                        </div>
-                        
-                        </div>
-        
-                        {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                          <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
-                            <div class="oh-btn-group" >
-                              {% if shift_request.approved == False and not shift_request.canceled   %}
-                                <a hx-get="{% url 'shift-allocation-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
-                              {% else %}
-                                <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
-                              {% endif %}
-                              {% if shift_request.approved == False and shift_request.canceled == False %} 
-                                <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                  {% csrf_token %}
-                                  <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                                </form>
-                              {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                                <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                  {% csrf_token %}
-                                  <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                                </form>
-                              {% else %}
-                                <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
-                              {% endif %} 
-                            </div>
-                          </div>
-                        {% endif %}
-
-                        <div class="oh-sticky-table__td oh-sticky-table__right" onclick="event.stopPropagation();">
-
-                          <div class="oh-btn-group" >
-
-                            {% if request.user.employee_get == shift_request.reallocate_to %}
-                              {% if shift_request.approved == True or shift_request.canceled == True or shift_request.reallocate_approved == True %}
-                                <button class='oh-btn oh-btn--success w-100' disabled>
-                                  <ion-icon name="checkmark-outline"></ion-icon>
-                                </button></td>
-                              {% else %}
-                                <a href="/shift-allocation-request-approve/{{shift_request.id}}/" onclick="return confirm('{% trans "Are you available for this shift reallocation?" %}')" class='oh-btn oh-btn--success w-100' title='{% trans "Available" %}'>
-                                  <ion-icon name="checkmark-outline"></ion-icon>
-                                </a></td>
-                              {% endif %}
-                            {% endif %}
-
-                            {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                              {% if shift_request.approved == False and shift_request.canceled == False %}
-                                <a href="/shift-request-approve/{{shift_request.id}}/" onclick="return confirm('{% trans "Do you want to approve this request?" %}')" class='oh-btn oh-btn--success w-100' title='{% trans "Approve" %}'>
-                                  <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                </a>
-
-                              {% else %}
-                                <button class='oh-btn oh-btn--success w-100' disabled>
-                                  <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                </button></td>
-                              {% endif %}
-                            {% endif %}
-
-                            {% if request.user.employee_get == shift_request.reallocate_to %}
-                              {% if shift_request.reallocate_canceled == True or shift_request.approved == True %}
-                                <button class='oh-btn oh-btn--danger w-100' disabled>
-                                  <ion-icon name="close-circle-outline"></ion-icon>
-                                </button></td>
-                              {% else %}
-                                <a href="/shift-allocation-request-cancel/{{shift_request.id}}/" onclick="return confirm('{% trans "Are you not available for this shift reallocation?" %}')" class='oh-btn oh-btn--danger w-100' title='{% trans "Not available" %}'>
-                                  <ion-icon name="close-circle-outline"></ion-icon>
-                                </a></td>
-                              {% endif %}
-                            {% endif %}
-
-                            {% if request.user.employee_get == shift_request.employee_id and not request.user|is_reportingmanager %}
-
-                              {% if shift_request.approved == False and not shift_request.canceled   %}
-                                <a hx-get="{% url 'shift-allocation-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
-                              {% else %}
-                                <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
-                              {% endif %}
-                              {% if shift_request.approved == False and shift_request.canceled == False %} 
-                                <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                  {% csrf_token %}
-                                  <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                                </form>
-                              {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
-                                <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
-                                  {% csrf_token %}
-                                  <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
-                                </form>
-                              {% else %}
-                                <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
-                              {% endif %} 
-                            {% endif %}
-
-
-                            {% if request.user|is_reportingmanager %}
-                              {% if shift_request.canceled == True %}
-                                <button disabled class='oh-btn oh-btn--danger w-100'>
-                                  <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-                                </button></td>
-                              {% else %}
-                                <a href="/shift-allocation-request-cancel/{{shift_request.id}}/" onclick="return confirm('{% trans "Do you want to reject this request?" %}')" class='oh-btn oh-btn--danger w-100' title='{% trans "Reject" %}'>
-                                  <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-                                </a></td>
-                              {% endif %}
-                            {% endif %}
-                          </div>
-
-                        </div>
-
-
-                      </div>
-                  {% endfor %}
-                </div>
-              </div>
-            </div>
-            <!-- end of sticky table -->
-          </div>
-        
-          <!-- start of pagination -->
-          <div class="oh-pagination">
-            <span class="oh-pagination__page">
-              {% trans "Page" %} {{ allocated_data.number }} {% trans "of" %} {{ allocated_data.paginator.num_pages }}.
-            </span>
-            <nav class="oh-pagination__nav">
-              <div class="oh-pagination__input-container me-3">
-                <span class="oh-pagination__label me-1">{% trans "Page" %}</span>
-                <input type="number" name="page" class="oh-pagination__input" value="{{allocated_data.number}}"
-                  hx-get="{% url 'shift-request-search' %}?{{pd}}" hx-target="#view-container" min="1" />
-                <span class="oh-pagination__label">{% trans "of" %} {{allocated_data.paginator.num_pages}}</span>
-              </div>
-              <ul class="oh-pagination__items">
-                {% if allocated_data.has_previous %}
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container' hx-get="{% url 'shift-request-search' %}?{{pd}}&page=1"
-                    class="oh-pagination__link">{% trans "First" %}</a>
-                </li>
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.previous_page_number }}"
-                    class="oh-pagination__link">{% trans "Previous" %}</a>
-                </li>
-                {% endif %}
-                {% if data.has_next %}
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.next_page_number }}"
-                    class="oh-pagination__link">{% trans "Next" %}</a>
-                </li>
-                <li class="oh-pagination__item oh-pagination__item--wide">
-                  <a hx-target='#view-container'
-                    hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.paginator.num_pages }}"
-                    class="oh-pagination__link">{% trans "Last" %}</a>
-                </li>
-                {% endif %}
-              </ul>
-            </nav>
-          </div>
-          <!-- end of pagination -->
-        </div>
       </div>
-
-
-
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-      <!-- ################################################################### -->
-
-
+      <div id="shift-request-table" data-table-name="shift_request_tab"> 
+        <!-- start of sticky table -->
+        <div class="oh-sticky-table">
+          <div class="oh-sticky-table__table oh-table--sortable">
+            <div class="oh-sticky-table__thead">
+              <div class="oh-sticky-table__tr">
+                <div class="oh-sticky-table__th" style="width:10px">
+                  <div class="centered-div">
+                    <input
+                      type="checkbox"
+                      class="oh-input oh-input__checkbox all-shift-requests"
+                      title='{% trans "Select All" %}'
+                    />
+                  </div>
+                </div>
+                <div 
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_id__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
+                  hx-target="#view-container" 
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=employee_id__employee_first_name" 
+                >
+                  {% trans "Employee" %}
+                </div>
+                <div data-cell-index="2" data-cell-title='{% trans "Requested Shift" %}' class="oh-sticky-table__th">{% trans "Requested Shift" %}</div>
+                <div data-cell-index="3" data-cell-title='{% trans "Previous/Current Shift" %}' class="oh-sticky-table__th">{% trans "Previous/Current Shift" %}</div>
+                <div data-cell-index="4" data-cell-title='{% trans "Requested Date" %}'
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-requested_date' %}arrow-up {% elif request.sort_option.order == 'requested_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_date" 
+                  hx-target="#view-container"
+                >{% trans "Requested Date" %}</div>
+                <div data-cell-index="5" data-cell-title='{% trans "Requested Till" %}'
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-requested_till' %}arrow-up {% elif request.sort_option.order == 'requested_till' %}arrow-down {% else %}arrow-up-down {% endif %}" 
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_till" 
+                  hx-target="#view-container"
+                >{% trans "Requested Till" %}</div>
+                <div data-cell-index="6" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
+                <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
+                <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %}
+                  <div class="oh-sticky-table__th oh-sticky-table__right " style="width:180px;">{% trans "Confirmation" %}</div>
+                {% endif %}
+              </div>
+            </div>
+            <div class="oh-sticky-table__tbody">
+              {% for shift_request in data %}
+                  <div class="oh-sticky-table__tr" 
+                      draggable="true"
+                      hx-get="{% url 'shift-request-details' shift_request.id %}?instances_ids={{requests_ids}}" 
+                      hx-target="#shiftRequestDetailTarget" 
+                      data-toggle='oh-modal-toggle' 
+                      data-target = '#shiftRequestDetailModal' 
+                  >
+                    <div class="oh-sticky-table__sd
+                      {% if shift_request.approved %} row-status--yellow 
+                      {% elif  shift_request.canceled %} row-status--red
+                      {% endif %}"
+                      onclick="event.stopPropagation();"
+                    >
+                      <div class="centered-div">
+                        <input
+                          type="checkbox"
+                          id="{{shift_request.id}}"
+                          onchange="highlightRow($(this))"
+                          class="oh-input employee-checkbox oh-input__checkbox all-shift-requests-row"
+                        />
+                      </div>
+                    </div>
+                    <div class="oh-sticky-table__td" >
+                      <div class="oh-profile oh-profile--md">
+                        <div class="oh-profile__avatar mr-1">
+                          <img src="{{shift_request.employee_id.get_avatar}}" class="oh-profile__image" alt="Username">
+                        </div>
+                        <span class="oh-profile__name oh-text--dark">{{shift_request.employee_id}}</span>
+                      </div>
+                    </div>
+                    <div class="oh-sticky-table__td" data-cell-index="2">{{shift_request.shift_id}}</div>
+                    <div class="oh-sticky-table__td" data-cell-index="3">{{shift_request.previous_shift_id}}</div>
+                    <div class="oh-sticky-table__td dateformat_changer" data-cell-index="4">{{shift_request.requested_date}}</div>
+                    <div class="oh-sticky-table__td dateformat_changer" data-cell-index="5">{{shift_request.requested_till}}</div>
+                    <div class="oh-sticky-table__td" data-cell-index="6">{{shift_request.description}}</div>
+                    
+                    <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
+                      
+                      <div class="oh-btn-group" >
+                        <button type="button" hx-get="{% url 'shift-request-add-comment' shift_request.id %}" title="Add Comment" hx-target="#shiftRequestCommentForm"
+                              hx-swap="innerHTML" class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle" data-target="#shiftcommentModal" 
+                              style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;">
+                          <ion-icon name="newspaper-outline" role="img" class="md hydrated" aria-label="newspaper outline"></ion-icon>
+                        </button>
+    
+                        <button type="button" hx-get="{% url 'view-shift-comment' shift_request.id %}" hx-target="#commentContainer"
+                                data-target = '#activitySidebar' title="View Comment"  class="oh-btn oh-btn--light oh-activity-sidebar__open" style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;" onclick="event.stopPropagation()">
+                          <ion-icon name="eye-outline" role="img" class="md hydrated" aria-label="eye outline"></ion-icon>
+                        </button>
+                    </div>
+                    
+                    </div>
+    
+                    <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
+                      <div class="oh-btn-group" >
+                        {% if shift_request.approved == False and not shift_request.canceled   %}
+                          <a hx-get="{% url 'shift-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
+                        {% else %}
+                          <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
+                        {% endif %}
+                        {% if shift_request.approved == False and shift_request.canceled == False %} 
+                          <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                            {% csrf_token %}
+                            <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                          </form>
+                        {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                          <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                            {% csrf_token %}
+                            <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                          </form>
+                        {% else %}
+                          <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
+                        {% endif %} 
+                      </div>
+                    </div>
+                    {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                      <div class="oh-sticky-table__td oh-sticky-table__right " onclick="event.stopPropagation();"> 
+                        <div class="oh-btn-group" >
+                            {% if shift_request.approved == False and shift_request.canceled == False %}
+                              <a  href="{% url 'shift-request-approve' shift_request.id %}" 
+                                  title="{% trans 'Approve' %}"
+                                  onclick="return confirm('{% trans "Do you want to approve this request?" %}')"
+                                  class="oh-btn oh-btn--success w-100">
+                                  <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                              </a>
+                            {% else %}
+                              <a  href="#" title="{% trans 'Approve' %}"
+                                  class="oh-btn oh-btn--success oh-btn--disabled w-100">
+                                  <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                              </a>
+                            {% endif %}
+    
+                            {% if shift_request.canceled == False %}
+                              <a 
+                                  href="{% url 'shift-request-cancel' shift_request.id %}" 
+                                  title="{% trans 'Reject' %}"
+                                  onclick="return confirm('{% trans "Do you want to reject this request?" %}')"
+                                  class="oh-btn oh-btn--danger w-100">
+                                  <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
+                              </a>
+                            {% else %}
+                              <a type="submit" href="#" title="{% trans 'Reject' %}"
+                                  class="oh-btn oh-btn--danger oh-btn--disabled
+                                  w-100" >
+                                  <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
+                              </a>
+                            {% endif %}
+                        </div>
+                      </div>
+                    {% endif %}
+                  </div>
+              {% endfor %}
+            </div>
+          </div>
+        </div>
+        <!-- end of sticky table -->
+      </div>
+    
+      <!-- start of pagination -->
+      <div class="oh-pagination">
+        <span class="oh-pagination__page">
+          {% trans "Page" %} {{ data.number }} {% trans "of" %} {{ data.paginator.num_pages }}.
+        </span>
+        <nav class="oh-pagination__nav">
+          <div class="oh-pagination__input-container me-3">
+            <span class="oh-pagination__label me-1">{% trans "Page" %}</span>
+            <input type="number" name="page" class="oh-pagination__input" value="{{data.number}}"
+              hx-get="{% url 'shift-request-search' %}?{{pd}}" hx-target="#view-container" min="1" />
+            <span class="oh-pagination__label">{% trans "of" %} {{data.paginator.num_pages}}</span>
+          </div>
+          <ul class="oh-pagination__items">
+            {% if data.has_previous %}
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container' hx-get="{% url 'shift-request-search' %}?{{pd}}&page=1"
+                class="oh-pagination__link">{% trans "First" %}</a>
+            </li>
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.previous_page_number }}"
+                class="oh-pagination__link">{% trans "Previous" %}</a>
+            </li>
+            {% endif %}
+            {% if data.has_next %}
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.next_page_number }}"
+                class="oh-pagination__link">{% trans "Next" %}</a>
+            </li>
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ data.paginator.num_pages }}"
+                class="oh-pagination__link">{% trans "Last" %}</a>
+            </li>
+            {% endif %}
+          </ul>
+        </nav>
+      </div>
+      <!-- end of pagination -->
     {% else %}
       <!-- start of empty page -->
-        <div class="oh-404">
-          <img
-            style="width: 150px; height: 150px"
-            src="{% static 'images/ui/no_request.png' %}"
-            class="oh-404__image mb-4"
-          />
-          <h5 class="oh-404__subtitle">
-            {% trans "There are currently no shift requests to consider." %}
-          </h5>
+      <div style="display: flex;justify-content: center; align-items: center; height: 100%;" >
+        <img
+          style="width: 150px; height: 150px"
+          src="{% static 'images/ui/no-results.png' %}"
+          class="oh-404__image mb-4"
+        />
+        <h5 class="oh-404__subtitle">
+          {% trans "No search result found!" %}
+        </h5>
+      </div>
+      <!-- end of empty page -->
+    {% endif %} 
+  </div>
+  <!-- end of shift request tab -->
+
+  
+  <!-- start of shift allocation tab -->
+  <div class="oh-tabs__content" id=tab_2>
+    {% if allocated_data %}
+      <div class="oh-table_sticky--wrapper">
+        <div class="oh-sticky-dropdown--header">
+          <div class="oh-dropdown" x-data="{open: false}">
+            <button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
+              role="img" class="md hydrated" aria-label="ellipsis vertical sharp"></ion-icon></button>
+            <div class="oh-dropdown__menu oh-sticky-table_dropdown" x-show="open" @click.outside="open = false">
+            <ul class="oh-dropdown__items" id="shiftRequestCells2">
+            </ul>
+            </div>
+          </div>
         </div>
+      </div>
+      <div id="shift-allocation-request-table" data-table-name="shift_request_tab2"> 
+        <!-- start of sticky table -->
+        <div class="oh-sticky-table">
+          <div class="oh-sticky-table__table oh-table--sortable">
+            <div class="oh-sticky-table__thead">
+              <div class="oh-sticky-table__tr">
+                <div class="oh-sticky-table__th" style="width:10px">
+                  <div class="centered-div">
+                    <input
+                      type="checkbox"
+                      class="oh-input oh-input__checkbox all-shift-requests"
+                      title='{% trans "Select All" %}'
+                    />
+                  </div>
+                </div>
+                <div 
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_id__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
+                  hx-target="#view-container" 
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=employee_id__employee_first_name" 
+                >
+                  {% trans "Employee" %}
+                </div>
+                <div 
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-reallocate_to__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'reallocate_to__employee_first_name' %}arrow-down {% else %}arrow-up-down {% endif %}"
+                  hx-target="#view-container" 
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=reallocate_to__employee_first_name"
+                  style="width:210px;"
+                >
+                  {% trans "Allocated Employee" %}
+                </div>
+                <div class="oh-sticky-table__th">{% trans "User Availability" %}</div>
+                <div data-cell-index="12" data-cell-title='{% trans "Requested Shift" %}' class="oh-sticky-table__th">{% trans "Requested Shift" %}</div>
+                <div data-cell-index="13" data-cell-title='{% trans "Previous/Current Shift" %}' class="oh-sticky-table__th">{% trans "Previous/Current Shift" %}</div>
+                <div data-cell-index="14" data-cell-title='{% trans "Requested Date" %}'
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-requested_date' %}arrow-up {% elif request.sort_option.order == 'requested_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_date" 
+                  hx-target="#view-container"
+                >{% trans "Requested Date" %}</div>
+                <div data-cell-index="15" data-cell-title='{% trans "Requested Till" %}'
+                  class="oh-sticky-table__th {% if request.sort_option.order == '-requested_till' %}arrow-up {% elif request.sort_option.order == 'requested_till' %}arrow-down {% else %}arrow-up-down {% endif %}" 
+                  hx-get="{% url 'shift-request-search' %}?{{pd}}&sortby=requested_till" 
+                  hx-target="#view-container"
+                >{% trans "Requested Till" %}</div>
+                <div data-cell-index="16" data-cell-title='{% trans "Description" %}' class="oh-sticky-table__th">{% trans "Description" %}</div>
+                <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
+                {% if perms.base.change_shiftrequest and shift_request.approved == False or request.user|is_reportingmanager %}
+                  <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
+                {% endif %}
+                <div class="oh-sticky-table__th oh-sticky-table__right" style="width:180px;">{% trans "Confirmation" %}</div>
+              </div>
+            </div>
+            <div class="oh-sticky-table__tbody">
+              {% for shift_request in allocated_data %}
+                  <div class="oh-sticky-table__tr" 
+                      draggable="true"
+                      hx-get="{% url 'shift-allocation-request-details' shift_request.id %}?instances_ids={{allocated_ids}}" 
+                      hx-target="#shiftRequestDetailTarget" 
+                      data-toggle='oh-modal-toggle' 
+                      data-target = '#shiftRequestDetailModal' 
+                  >
+                    <div class="oh-sticky-table__sd
+                      {% if shift_request.approved %} row-status--yellow 
+                      {% elif  shift_request.canceled %} row-status--red
+                      {% endif %}"
+                      onclick="event.stopPropagation();"
+                    >
+                      <div class="centered-div">
+                        <input
+                          type="checkbox"
+                          id="{{shift_request.id}}"
+                          onchange="highlightRow($(this))"
+                          class="oh-input employee-checkbox oh-input__checkbox all-shift-requests-row"
+                        />
+                      </div>
+                    </div>
+                    <div class="oh-sticky-table__td" >
+                      <div class="oh-profile oh-profile--md">
+                        <div class="oh-profile__avatar mr-1">
+                          <img src="{{shift_request.employee_id.get_avatar}}" class="oh-profile__image" alt="Username">
+                        </div>
+                        <span class="oh-profile__name oh-text--dark">{{shift_request.employee_id}}</span>
+                      </div>
+                    </div>
+                    <div class="oh-sticky-table__td">
+                      <div class="oh-profile oh-profile--md">
+                        <div class="oh-profile__avatar mr-1">
+                          <img src="{{shift_request.reallocate_to.get_avatar}}" class="oh-profile__image">
+                        </div>
+                        <span class="oh-profile__name oh-text--dark">{{shift_request.reallocate_to}}</span>
+                      </div>
+                    </div>
+                    <div class="oh-sticky-table__td">
+                      {% if shift_request.reallocate_approved == True %}
+                        <div class="d-flex align-items-center">
+                          <span class="oh-dot oh-dot--small me-1 oh-dot--color  oh-dot--success "></span><span class=" link-success ">{% trans "Available" %}</span>
+                        </div>
+                      {% elif shift_request.reallocate_canceled == True %}
+                        <div class="d-flex align-items-center">
+                          <span class="oh-dot oh-dot--small me-1 oh-dot--color  oh-dot--danger "></span><span class=" link-danger ">{% trans "Not Available" %}</span>
+                        </div>
+                      {% else %}
+                        <div class="d-flex align-items-center">
+                          <span class="oh-dot oh-dot--small me-1 oh-dot--color" style="background-color:grey;"></span><span class=" link-secondary ">{% trans "Not Marked" %}</span>
+                        </div>
+                      {% endif %}
+                    </div>
+                    <div class="oh-sticky-table__td" data-cell-index="12">{{shift_request.shift_id}}</div>
+                    <div class="oh-sticky-table__td" data-cell-index="13">{{shift_request.previous_shift_id}}</div>
+                    <div class="oh-sticky-table__td dateformat_changer" data-cell-index="14">{{shift_request.requested_date}}</div>
+                    <div class="oh-sticky-table__td dateformat_changer" data-cell-index="15">{{shift_request.requested_till}}</div>
+                    <div class="oh-sticky-table__td" data-cell-index="16">{{shift_request.description}}</div>
+                    
+                    <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
+                      
+                      <div class="oh-btn-group" >
+                        <button type="button" hx-get="{% url 'shift-request-add-comment' shift_request.id %}" title="Add Comment" hx-target="#shiftRequestCommentForm"
+                              hx-swap="innerHTML" class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle" data-target="#shiftcommentModal" 
+                              style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;">
+                          <ion-icon name="newspaper-outline" role="img" class="md hydrated" aria-label="newspaper outline"></ion-icon>
+                        </button>
+    
+                        <button type="button" hx-get="{% url 'view-shift-comment' shift_request.id %}" hx-target="#commentContainer"
+                                data-target = '#activitySidebar' title="View Comment"  class="oh-btn oh-btn--light oh-activity-sidebar__open" style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;" onclick="event.stopPropagation()">
+                          <ion-icon name="eye-outline" role="img" class="md hydrated" aria-label="eye outline"></ion-icon>
+                        </button>
+                    </div>
+                    
+                    </div>
+    
+                    {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                      <div class="oh-sticky-table__td" onclick="event.stopPropagation();">
+                        <div class="oh-btn-group" >
+                          {% if shift_request.approved == False and not shift_request.canceled   %}
+                            <a hx-get="{% url 'shift-allocation-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
+                          {% else %}
+                            <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
+                          {% endif %}
+                          {% if shift_request.approved == False and shift_request.canceled == False %} 
+                            <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                              {% csrf_token %}
+                              <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                            </form>
+                          {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                            <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                              {% csrf_token %}
+                              <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                            </form>
+                          {% else %}
+                            <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
+                          {% endif %} 
+                        </div>
+                      </div>
+                    {% endif %}
+
+                    <div class="oh-sticky-table__td oh-sticky-table__right" onclick="event.stopPropagation();">
+
+                      <div class="oh-btn-group" >
+
+                        {% if request.user.employee_get == shift_request.reallocate_to %}
+                          {% if shift_request.approved == True or shift_request.canceled == True or shift_request.reallocate_approved == True %}
+                            <button class='oh-btn oh-btn--success w-100' disabled>
+                              <ion-icon name="checkmark-outline"></ion-icon>
+                            </button></td>
+                          {% else %}
+                            <a href="/shift-allocation-request-approve/{{shift_request.id}}/" onclick="return confirm('{% trans "Are you available for this shift reallocation?" %}')" class='oh-btn oh-btn--success w-100' title='{% trans "Available" %}'>
+                              <ion-icon name="checkmark-outline"></ion-icon>
+                            </a></td>
+                          {% endif %}
+                        {% endif %}
+
+                        {% if perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                          {% if shift_request.approved == False and shift_request.canceled == False %}
+                            <a href="/shift-request-approve/{{shift_request.id}}/" onclick="return confirm('{% trans "Do you want to approve this request?" %}')" class='oh-btn oh-btn--success w-100' title='{% trans "Approve" %}'>
+                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                            </a>
+
+                          {% else %}
+                            <button class='oh-btn oh-btn--success w-100' disabled>
+                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                            </button></td>
+                          {% endif %}
+                        {% endif %}
+
+                        {% if request.user.employee_get == shift_request.reallocate_to %}
+                          {% if shift_request.reallocate_canceled == True or shift_request.approved == True %}
+                            <button class='oh-btn oh-btn--danger w-100' disabled>
+                              <ion-icon name="close-circle-outline"></ion-icon>
+                            </button></td>
+                          {% else %}
+                            <a href="/shift-allocation-request-cancel/{{shift_request.id}}/" onclick="return confirm('{% trans "Are you not available for this shift reallocation?" %}')" class='oh-btn oh-btn--danger w-100' title='{% trans "Not available" %}'>
+                              <ion-icon name="close-circle-outline"></ion-icon>
+                            </a></td>
+                          {% endif %}
+                        {% endif %}
+
+                        {% if request.user.employee_get == shift_request.employee_id and not request.user|is_reportingmanager %}
+
+                          {% if shift_request.approved == False and not shift_request.canceled   %}
+                            <a hx-get="{% url 'shift-allocation-request-update' shift_request.id %}" hx-target='#shiftRequestModalUpdateBody' data-toggle="oh-modal-toggle" data-target='#shiftRequestModalUpdate' class="oh-btn oh-btn--light-bkg w-50" title="{% trans 'Edit' %}"><ion-icon name="create-outline"></ion-icon></a>
+                          {% else %}
+                            <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="create-outline" ></ion-icon></button></td>
+                          {% endif %}
+                          {% if shift_request.approved == False and shift_request.canceled == False %} 
+                            <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                              {% csrf_token %}
+                              <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                            </form>
+                          {% elif perms.base.change_shiftrequest or request.user|is_reportingmanager %}
+                            <form action="{% url 'shift-request-delete' shift_request.id  %}" onsubmit="return confirm('{% trans "Are you sure you want to delete this shift request?" %}');" method='post' class="w-50">
+                              {% csrf_token %}
+                              <button type='submit' class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Remove' %}"><ion-icon name="trash-outline"></ion-icon></button>
+                            </form>
+                          {% else %}
+                            <button class="oh-btn oh-btn--light-bkg w-50" disabled><ion-icon name="trash-outline"></ion-icon></button></td>
+                          {% endif %} 
+                        {% endif %}
+
+
+                        {% if request.user|is_reportingmanager %}
+                          {% if shift_request.canceled == True %}
+                            <button disabled class='oh-btn oh-btn--danger w-100'>
+                              <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
+                            </button></td>
+                          {% else %}
+                            <a href="/shift-allocation-request-cancel/{{shift_request.id}}/" onclick="return confirm('{% trans "Do you want to reject this request?" %}')" class='oh-btn oh-btn--danger w-100' title='{% trans "Reject" %}'>
+                              <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
+                            </a></td>
+                          {% endif %}
+                        {% endif %}
+                      </div>
+
+                    </div>
+
+
+                  </div>
+              {% endfor %}
+            </div>
+          </div>
+        </div>
+        <!-- end of sticky table -->
+      </div>
+    
+      <!-- start of pagination -->
+      <div class="oh-pagination">
+        <span class="oh-pagination__page">
+          {% trans "Page" %} {{ allocated_data.number }} {% trans "of" %} {{ allocated_data.paginator.num_pages }}.
+        </span>
+        <nav class="oh-pagination__nav">
+          <div class="oh-pagination__input-container me-3">
+            <span class="oh-pagination__label me-1">{% trans "Page" %}</span>
+            <input type="number" name="page" class="oh-pagination__input" value="{{allocated_data.number}}"
+              hx-get="{% url 'shift-request-search' %}?{{pd}}" hx-target="#view-container" min="1" />
+            <span class="oh-pagination__label">{% trans "of" %} {{allocated_data.paginator.num_pages}}</span>
+          </div>
+          <ul class="oh-pagination__items">
+            {% if allocated_data.has_previous %}
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container' hx-get="{% url 'shift-request-search' %}?{{pd}}&page=1"
+                class="oh-pagination__link">{% trans "First" %}</a>
+            </li>
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.previous_page_number }}"
+                class="oh-pagination__link">{% trans "Previous" %}</a>
+            </li>
+            {% endif %}
+            {% if data.has_next %}
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.next_page_number }}"
+                class="oh-pagination__link">{% trans "Next" %}</a>
+            </li>
+            <li class="oh-pagination__item oh-pagination__item--wide">
+              <a hx-target='#view-container'
+                hx-get="{% url 'shift-request-search' %}?{{pd}}&page={{ allocated_data.paginator.num_pages }}"
+                class="oh-pagination__link">{% trans "Last" %}</a>
+            </li>
+            {% endif %}
+          </ul>
+        </nav>
+      </div>
+      <!-- end of pagination -->
+    {% else %}
+      <!-- start of empty page -->
+      <div style="display: flex;justify-content: center; align-items: center; height: 100%;" >
+        <img
+          style="width: 150px; height: 150px"
+          src="{% static 'images/ui/no-results.png' %}"
+          class="oh-404__image mb-4"
+        />
+        <h5 class="oh-404__subtitle">
+          {% trans "No search result found!" %}
+        </h5>
+      </div>
       <!-- end of empty page -->
     {% endif %}
+    </div>
+    <!-- end of shift allocation tab -->
+</div>
 
     <!-- start of comment modal -->
     <div
diff --git a/leave/templates/leave/leave_allocation_request/leave_allocation_request_group_by.html b/leave/templates/leave/leave_allocation_request/leave_allocation_request_group_by.html
index 408550341..c003e2e7a 100644
--- a/leave/templates/leave/leave_allocation_request/leave_allocation_request_group_by.html
+++ b/leave/templates/leave/leave_allocation_request/leave_allocation_request_group_by.html
@@ -215,7 +215,7 @@
                                                     <div class="oh-sticky-table__th">{% trans "Description" %}</div>
                                                     <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
                                                     <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
-                                                    <div class="oh-sticky-table__th">{% trans "Options" %}</div>
+                                                    <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                                                 </div>
                                             </div>
                                             <div class="oh-sticky-table__tbody">
@@ -296,7 +296,7 @@
                                                                 {% endif %}
                                                             </div>
                                                         </div>
-                                                        <div class="oh-sticky-table__td {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
+                                                        <div class="oh-sticky-table__td oh-sticky-table__right {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
                                                             <div class="oh-btn-group" >
                                                                 {% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %}
                                                                     {% if leave_allocation_request.status == 'requested' %}
diff --git a/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html b/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html
index c4b08dea9..4ab9036b5 100644
--- a/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html
+++ b/leave/templates/leave/leave_allocation_request/leave_allocation_request_list.html
@@ -173,7 +173,7 @@
                                 <div class="oh-sticky-table__th">{% trans "Description" %}</div>
                                 <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
                                 <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
-                                <div class="oh-sticky-table__th">{% trans "Options" %}</div>
+                                <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                             </div>
                         </div>
                         <div class="oh-sticky-table__tbody">
@@ -254,7 +254,7 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="oh-sticky-table__td {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
+                                    <div class="oh-sticky-table__td oh-sticky-table__right {% if leave_allocation_request.status == 'rejected' %} diff-cell{% endif %}" onclick="event.stopPropagation()">
                                         <div class="oh-btn-group" >
 
                                             {% if perms.leave.change_leaveallocationrequest or request.user|is_reportingmanager %}
diff --git a/leave/templates/leave/leave_request/group_by.html b/leave/templates/leave/leave_request/group_by.html
index 6cca56d00..f8c666b4e 100644
--- a/leave/templates/leave/leave_request/group_by.html
+++ b/leave/templates/leave/leave_request/group_by.html
@@ -58,11 +58,11 @@
                                     <div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=status" hx-target="#leaveRequest">{% trans "Status" %}</div>
                                     {% if  not dashboard %}
                                         <div class="oh-sticky-table__th">{% trans "Comment" %}</div>
-                                        <div class="oh-sticky-table__th">{% trans "Options" %}</div>
                                         {% if request.user|is_reportingmanager or perms.leave.chanage_leaverequest or perms.leave.delete_leaverequest or request.user|is_leave_approval_manager %}
                                         <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
                                         <div class="oh-sticky-table__th" >{% trans "Penalties" %}</div>
                                         {% endif %}
+                                        <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                                     {% endif %}
                                 </div>
                             </div>
@@ -119,39 +119,6 @@
                                           </button>
                                        </div>
                                     </div>
-
-                                    
-
-                                    <div class="oh-sticky-table__td" onclick="event.stopPropagation()">
-                                        <div class="oh-btn-group" >
-                                            {% if leave_request.status == 'requested' or leave_request.status == 'rejected' %}
-                                            <a type="submit" href="{% url 'request-approve' leave_request.id %}" title="{% trans 'Approve' %}"
-                                                class="oh-btn oh-btn--success w-100">
-                                                <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                            </a>
-                                            {% else %}
-                                            <a type="submit" href="#" title="{% trans 'Approve' %}"
-                                                class="oh-btn oh-btn--success oh-btn--disabled
-                                                w-100">
-                                                <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-                                            </a>
-                                            {% endif %}
-                                            {% if leave_request.status != 'rejected' %}
-                                            <a type="submit" data-toggle="oh-modal-toggle"
-                                                data-target="#rejectModal" hx-get="{% url 'request-cancel' leave_request.id %}" hx-target="#rejectForm" title="{% trans 'Reject' %}"
-                                                class="oh-btn oh-btn--danger w-100">
-                                                <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-                
-                                            </a>
-                                            {% else %}
-                                            <a type="submit" href="#" title="{% trans 'Reject' %}"
-                                                class="oh-btn oh-btn--danger oh-btn--disabled
-                                                w-100" >
-                                                <ion-icon class="me-1" name="close-circle-outline"></ion-icon>            
-                                            </a>
-                                            {% endif %}
-                                        </div>
-                                    </div>
                                     <div class="oh-sticky-table__td" onclick="event.stopPropagation()">
                                         <div class="oh-btn-group">
                                             {% if request.user|is_reportingmanager or perms.attendance.chanage_penaltyaccount or request.user|is_leave_approval_manager %}
@@ -186,6 +153,36 @@
                                           </div>
                                       {% endif %}
                                     </div>
+                                    <div class="oh-sticky-table__td oh-sticky-table__right" onclick="event.stopPropagation()">
+                                      <div class="oh-btn-group" >
+                                          {% if leave_request.status == 'requested' or leave_request.status == 'rejected' %}
+                                          <a type="submit" href="{% url 'request-approve' leave_request.id %}" title="{% trans 'Approve' %}"
+                                              class="oh-btn oh-btn--success w-100">
+                                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                                          </a>
+                                          {% else %}
+                                          <a type="submit" href="#" title="{% trans 'Approve' %}"
+                                              class="oh-btn oh-btn--success oh-btn--disabled
+                                              w-100">
+                                              <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
+                                          </a>
+                                          {% endif %}
+                                          {% if leave_request.status != 'rejected' %}
+                                          <a type="submit" data-toggle="oh-modal-toggle"
+                                              data-target="#rejectModal" hx-get="{% url 'request-cancel' leave_request.id %}" hx-target="#rejectForm" title="{% trans 'Reject' %}"
+                                              class="oh-btn oh-btn--danger w-100">
+                                              <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
+              
+                                          </a>
+                                          {% else %}
+                                          <a type="submit" href="#" title="{% trans 'Reject' %}"
+                                              class="oh-btn oh-btn--danger oh-btn--disabled
+                                              w-100" >
+                                              <ion-icon class="me-1" name="close-circle-outline"></ion-icon>            
+                                          </a>
+                                          {% endif %}
+                                      </div>
+                                  </div>
                                     {% endif %}
                                 </div>
                                 {% endfor %}
diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html
index fa2fee216..ca5f48398 100644
--- a/leave/templates/leave/leave_request/leave_requests.html
+++ b/leave/templates/leave/leave_request/leave_requests.html
@@ -76,7 +76,7 @@
                         <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
                         {% endif %}
                         <div class="oh-sticky-table__th" >{% trans "Penalties" %}</div>
-                        <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Conformation" %}</div>
+                        <div class="oh-sticky-table__th oh-sticky-table__right">{% trans "Confirmation" %}</div>
                     {% endif %}
                 </div>
             </div>
diff --git a/offboarding/templates/offboarding/stage/offboarding_body.html b/offboarding/templates/offboarding/stage/offboarding_body.html
index 7b189fe77..59a7eab6e 100644
--- a/offboarding/templates/offboarding/stage/offboarding_body.html
+++ b/offboarding/templates/offboarding/stage/offboarding_body.html
@@ -65,7 +65,7 @@
                 {% if request.user.employee_get|is_any_stage_manager or perms.offboarding.change_offboarding or perms.offboarding.change_offboardingemployee %}
                 <div class="oh-sticky-table__th">{% trans "Stage" %}</div>
                 {% endif %}
-                <div class="oh-sticky-table__th">{% trans "Options" %}</div>
+                <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
                 {% for task in stage.offboardingtask_set.all %}
                 <div class="oh-sticky-table__th" style="width: 200px;" hx-get="{% url "offboarding-add-task" %}?stage_id={{stage.id}}&instance_id={{task.id}}" hx-target="#offboardingModalBody" data-toggle="oh-modal-toggle" data-target="#offboardingModal">
                   <div class="d-flex justify-content-between">