diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html
index 7b96cbebb..7f1480bf8 100644
--- a/leave/templates/leave/leave_request/leave_requests.html
+++ b/leave/templates/leave/leave_request/leave_requests.html
@@ -101,6 +101,7 @@
                                 <input
                                 type="checkbox"
                                 id="{{leave_request.id}}"
+                                onchange="highlightRow($(this))"
                                 class="oh-input holiday-checkbox oh-input__checkbox all-leave-requests-row"
                                 />
                             </div>
@@ -233,9 +234,9 @@
     $(".all-leave-requests").change(function (e) {
       var is_checked = $(this).is(":checked");
       if (is_checked) {
-        $(".all-leave-requests-row").prop("checked", true);
+        $(".all-leave-requests-row").prop("checked", true).closest(".oh-sticky-table__tr").addClass("highlight-selected");
       } else {
-        $(".all-leave-requests-row").prop("checked", false);
+        $(".all-leave-requests-row").prop("checked", false).closest(".oh-sticky-table__tr").removeClass("highlight-selected");
       }
     });
   
diff --git a/leave/templates/leave/user_leave/request_form.html b/leave/templates/leave/user_leave/request_form.html
index fb9ab2a11..4a1b0aafd 100644
--- a/leave/templates/leave/user_leave/request_form.html
+++ b/leave/templates/leave/user_leave/request_form.html
@@ -1,84 +1,4 @@
 {% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
 <form  hx-post="{% url 'leave-request-create' %}"  hx-encoding="multipart/form-data">
-  <div class="oh-general__tab-target oh-profile-section p-0" id="personal">
-    <div class="oh-profile-section__card">
-      <div class="row">
-        <div class="oh-modal__dialog-body pb-2" id="employee">
-          {{form.employee_id}}
-          {{form.employee_id.errors}}
-        </div>
-        <div class="col-12"></div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" style="width:110%" id="leaveType">
-              <label class="oh-label d-block ">{% trans "Leave types" %}</label>
-              {{form.leave_type_id}}
-              {{form.leave_type_id.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" style="width:110%;margin-left:-10%">
-              <label class="oh-label d-block">{% trans "Start Date" %}</label>
-              {{form.start_date}}
-              {{form.start_date.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" id="startDate" style="width:110%">
-              <label class="oh-label d-block">{% trans "Start Date Breakdown" %}</label>       
-              {{form.start_date_breakdown}}
-              {{form.start_date_breakdown.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" style="width:110%;margin-left:-10%">
-              <label class="oh-label d-block">{% trans "End Date" %}</label>
-              {{form.end_date}}
-              {{form.end_date.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" id="endDate" style="width:110%">  
-              <label class="oh-label d-block">{% trans "End Date Breakdown" %}</label>
-              {{form.end_date_breakdown}}
-              {{form.end_date_breakdown.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-6">
-            <div class="oh-modal__dialog-body pb-2" style="width:110%;margin-left:-10%">
-              <label class="oh-label d-block">{% trans "Attachment" %}</label>
-              {{form.attachment}}
-              {{form.attachment.errors}}
-            </div>
-          </div>
-          <div class="col-12 col-md-12">
-            <div class="oh-modal__dialog-body pb-2">
-              <label class="oh-label d-block">{% trans "Description" %}</label>
-              {{form.description}}
-              {{form.description.errors}}
-            </div>
-          </div>
-      </div>
-      <div class="d-flex flex-row-reverse">
-        <button
-          type="submit"
-          class="oh-btn oh-btn--secondary mt-4 me-4 mb-4 pl-4 pr-5 oh-btn--w-100-resp"
-        >
-          {% trans "Save" %}
-        </button>
-      </div>
-    </div>
-  </div>
-</form>
+    {{form.as_p}}
+</form>
\ No newline at end of file