diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..2125666142e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
\ No newline at end of file
diff --git a/cypress/e2e/patient_spec/PatientRegistration.cy.ts b/cypress/e2e/patient_spec/PatientRegistration.cy.ts
index c3647ceac3a..2da35c840e0 100644
--- a/cypress/e2e/patient_spec/PatientRegistration.cy.ts
+++ b/cypress/e2e/patient_spec/PatientRegistration.cy.ts
@@ -40,10 +40,12 @@ describe("Patient Creation with consultation", () => {
   const patientDateOfBirth = "01012001";
   const patientMenstruationStartDate = getRelativeDateString(-10);
   const patientDateOfDelivery = getRelativeDateString(-20);
-  const patientOneName = "Patient With No Consultation";
+  const patientOneName = "Great Napolean 14";
   const patientOneGender = "Male";
   const patientOneUpdatedGender = "Female";
-  const patientOneAddress = "Test Patient Address";
+  const patientOneAddress = `149/J, 3rd Block,
+  Aluva
+  Ernakulam, Kerala - 682001`;
   const patientOnePincode = "682001";
   const patientOneState = "Kerala";
   const patientOneDistrict = "Ernakulam";
@@ -130,6 +132,7 @@ describe("Patient Creation with consultation", () => {
       "Middle Class",
       "Family member",
     );
+
     patientMedicalHistory.verifyPatientMedicalDetails(
       patientOnePresentHealth,
       patientOneOngoingMedication,
@@ -214,11 +217,9 @@ describe("Patient Creation with consultation", () => {
     patientMedicalHistory.verifyNoSymptosPresent("Diabetes");
     // verify insurance details and dedicatd page
     cy.get("[data-testid=patient-details]")
-      .contains("member id")
+      .contains("Member ID")
       .scrollIntoView();
     cy.wait(2000);
-    patientInsurance.clickPatientInsuranceViewDetail();
-    cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(
       patientOneFirstSubscriberId,
       patientOneFirstPolicyId,
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index c8046a39a9e..edd8ae135a4 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -122,9 +122,10 @@ export class PatientConsultationPage {
   }
 
   clickViewConsultationButton() {
+    cy.get("a").contains("Encounters").click();
     cy.verifyAndClickElement(
       "#view_consultation_and_log_updates",
-      "View Consultation / Log Updates",
+      "View Updates",
     );
   }
 
diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
index a38b8ab6a5c..1f915f5474e 100644
--- a/cypress/pageobject/Patient/PatientCreation.ts
+++ b/cypress/pageobject/Patient/PatientCreation.ts
@@ -181,7 +181,7 @@ export class PatientPage {
       expect($dashboard).to.contain(patientName);
       expect($dashboard).to.contain(phoneNumber);
       expect($dashboard).to.contain(emergencyPhoneNumber);
-      expect($dashboard).to.contain(yearOfBirth);
+      //expect($dashboard).to.contain(yearOfBirth); //Commented out because new proposed UI does not have DOB. Can change later.
       expect($dashboard).to.contain(bloodGroup);
       expect($dashboard).to.contain(occupation);
       socioeconomicStatus && expect($dashboard).to.contain(socioeconomicStatus);
@@ -221,7 +221,7 @@ export class PatientPage {
   }
 
   clickPatientUpdateDetails() {
-    cy.verifyAndClickElement("#update-patient-details", "Update Details");
+    cy.verifyAndClickElement("#update-patient-details", "Edit Profile");
   }
 
   interceptFacilities() {
diff --git a/cypress/pageobject/Patient/PatientMedicalHistory.ts b/cypress/pageobject/Patient/PatientMedicalHistory.ts
index 93fdd1b38b3..bf2296b4471 100644
--- a/cypress/pageobject/Patient/PatientMedicalHistory.ts
+++ b/cypress/pageobject/Patient/PatientMedicalHistory.ts
@@ -33,7 +33,9 @@ class PatientMedicalHistory {
     patientSymptoms6: string,
     patientSymptoms7: string,
   ) {
-    cy.get("[data-testid=patient-details]").then(($dashboard) => {
+    cy.get("a").contains("Health Profile").click();
+    cy.wait(2000);
+    cy.get("[data-test-id=patient-health-profile]").then(($dashboard) => {
       cy.url().should("include", "/facility/");
       expect($dashboard).to.contain(patientPresentHealth);
       expect($dashboard).to.contain(patientOngoingMedication);
diff --git a/cypress/pageobject/Patient/PatientPredefined.ts b/cypress/pageobject/Patient/PatientPredefined.ts
index a3eb41cb86c..445fbaf9b31 100644
--- a/cypress/pageobject/Patient/PatientPredefined.ts
+++ b/cypress/pageobject/Patient/PatientPredefined.ts
@@ -19,7 +19,9 @@ class PatientPredefined {
     patientPage.typePatientDateOfBirth("01012001");
     patientPage.typePatientName("Patient With Predefined Data");
     patientPage.selectPatientGender("Male");
-    patientPage.typePatientAddress("Test Patient Address");
+    patientPage.typePatientAddress(
+      "149/J, 3rd Block, Aluva, Ernakulam - 682001",
+    );
     facilityPage.fillPincode("682001");
     facilityPage.selectStateOnPincode("Kerala");
     facilityPage.selectDistrictOnPincode("Ernakulam");
diff --git a/cypress/pageobject/Sample/SampleTestCreate.ts b/cypress/pageobject/Sample/SampleTestCreate.ts
index cd2e93e5072..445d08732c3 100644
--- a/cypress/pageobject/Sample/SampleTestCreate.ts
+++ b/cypress/pageobject/Sample/SampleTestCreate.ts
@@ -1,5 +1,6 @@
 export class SampleTestPage {
   visitSampleRequestPage(): void {
+    cy.get("a").contains("Service Request").click();
     cy.verifyAndClickElement("#sample-request-btn", "Request Sample Test");
     cy.url().should("include", "/sample-test");
   }
@@ -60,6 +61,7 @@ export class SampleTestPage {
     fastTrack: string,
     sampleTestResult: string,
   ): void {
+    cy.get("a").contains("Service Request").click();
     cy.verifyContentPresence("#sample-test-status", [sampleTestStatus]);
     cy.verifyContentPresence("#sample-test-type", [sampleTestType]);
     cy.verifyContentPresence("#sample-test-fast-track", [fastTrack]);
diff --git a/package-lock.json b/package-lock.json
index 63af1164ef0..5c703af8fe1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20862,4 +20862,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/public/locale/en.json b/public/locale/en.json
index 8a4a36a1a5c..56f84a1883a 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -274,6 +274,7 @@
   "accept_all": "Accept All",
   "access_level": "Access Level",
   "action_irreversible": "This action is irreversible",
+  "actions": "Actions",
   "active": "Active",
   "active_prescriptions": "Active Prescriptions",
   "add": "Add",
@@ -281,7 +282,10 @@
   "add_attachments": "Add Attachments",
   "add_beds": "Add Bed(s)",
   "add_beds_to_configure_presets": "Add beds to this location to configure presets for them.",
+  "add_consultation": "Add consultation",
+  "add_consultation_update": "Add Consultation Update",
   "add_details_of_patient": "Add Details of Patient",
+  "add_insurance_details": "Add Insurance Details",
   "add_location": "Add Location",
   "add_new_beds": "Add New Bed(s)",
   "add_new_user": "Add New User",
@@ -301,11 +305,14 @@
   "administered_on": "Administered on",
   "administration_dosage_range_error": "Dosage should be between start and target dosage",
   "administration_notes": "Administration Notes",
+  "admitted": "Admitted",
+  "admitted_on": "Admitted On",
   "advanced_filters": "Advanced Filters",
   "age": "Age",
   "all_changes_have_been_saved": "All changes have been saved",
   "all_details": "All Details",
   "allergies": "Allergies",
+  "allow_transfer": "Allow Transfer",
   "allowed_formats_are": "Allowed formats are",
   "already_a_member": "Already a member?",
   "ambulance_driver_name": "Name of ambulance driver",
@@ -316,6 +323,7 @@
   "any_id_description": "Currently we support: Aadhaar Number / Mobile Number",
   "any_other_comments": "Any other comments",
   "apply": "Apply",
+  "approve": "Approve",
   "approved_by_district_covid_control_room": "Approved by District COVID Control Room",
   "approving_facility": "Name of Approving Facility",
   "archive": "Archive",
@@ -332,8 +340,14 @@
   "asset_qr_id": "Asset QR ID",
   "asset_type": "Asset Type",
   "assets": "Assets",
+  "assign": "Assign",
+  "assign_a_volunteer_to": "Assign a volunteer to {{name}}",
+  "assign_bed": "Assign Bed",
+  "assign_to_volunteer": "Assign to a Volunteer",
+  "assigned_doctor": "Assigned Doctor",
   "assigned_facility": "Facility assigned",
   "assigned_to": "Assigned to",
+  "assigned_volunteer": "Assigned Volunteer",
   "async_operation_warning": "This operation may take some time. Please check back later.",
   "atypical_presentation_details": "Atypical presentation details",
   "audio__allow_permission": "Please allow microphone permission in site settings",
@@ -365,6 +379,7 @@
   "bed_capacity": "Bed Capacity",
   "bed_created_notification_one": "{{count}} Bed created successfully",
   "bed_created_notification_other": "{{count}} Beds created successfully",
+  "bed_history": "Bed History",
   "bed_not_linked_to_camera": "This bed has not been linked to this camera.",
   "bed_search_placeholder": "Search by beds name",
   "bed_type": "Bed Type",
@@ -397,6 +412,7 @@
   "central_nursing_station": "Central Nursing Station",
   "change_file": "Change File",
   "change_password": "Change Password",
+  "chat_on_whatsapp": "Chat on Whatsapp",
   "check_eligibility": "Check Eligibility",
   "check_for_available_update": "Check for available update",
   "check_for_update": "Check for Update",
@@ -493,6 +509,7 @@
   "consent_request_rejected": "Patient has rejected the consent request",
   "consent_request_waiting_approval": "Waiting for the Patient to approve the consent request",
   "consent_requested_successfully": "Consent requested successfully!",
+  "consultation_history": "Consultation History",
   "consultation_missing_warning": "You have not created a consultation for the patient in",
   "consultation_not_filed": "You have not filed a consultation for this patient yet.",
   "consultation_not_filed_description": "Please file a consultation for this patient to continue.",
@@ -516,6 +533,7 @@
   "countries_travelled": "Countries travelled",
   "covid_19_cat_gov": "Covid_19 Clinical Category as per Govt. of Kerala guideline (A/B/C)",
   "covid_19_death_reporting_form_1": "Covid-19 Death Reporting : Form 1",
+  "covid_details": "Covid Details",
   "create": "Create",
   "create_abha_address": "Create ABHA Address",
   "create_add_more": "Create & Add More",
@@ -533,6 +551,7 @@
   "created_date": "Created Date",
   "created_on": "Created On",
   "csv_file_in_the_specified_format": "Select a CSV file in the specified format",
+  "current_address": "Current Address",
   "current_password": "Current Password",
   "customer_support_email": "Customer Support Email",
   "customer_support_name": "Customer Support Name",
@@ -546,13 +565,16 @@
   "date_of_birth": "Date of birth",
   "date_of_positive_covid_19_swab": "Date of Positive Covid 19 Swab",
   "date_of_result": "Covid confirmation date",
+  "date_of_return": "Date of Return",
   "date_of_test": "Date of sample collection for Covid testing",
   "days": "Days",
+  "death_report": "Death Report",
   "delete": "Delete",
   "delete_facility": "Delete Facility",
   "delete_item": "Delete {{name}}",
   "delete_record": "Delete Record",
   "deleted_successfully": "{{name}} deleted successfully",
+  "demography": "Demography",
   "denied_on": "Denied On",
   "describe_why_the_asset_is_not_working": "Describe why the asset is not working",
   "description": "Description",
@@ -573,6 +595,7 @@
   "diastolic": "Diastolic",
   "differential": "Differential",
   "differential_diagnosis": "Differential diagnosis",
+  "disable_transfer": "Disable Transfer",
   "discard": "Discard",
   "discharge": "Discharge",
   "discharge_from_care": "Discharge from CARE",
@@ -580,6 +603,7 @@
   "discharge_summary": "Discharge Summary",
   "discharge_summary_not_ready": "Discharge summary is not ready yet.",
   "discharged": "Discharged",
+  "discharged_on": "Discharged On",
   "discharged_patients": "Discharged Patients",
   "discharged_patients_empty": "No discharged patients present in this facility",
   "disclaimer": "Disclaimer",
@@ -614,6 +638,7 @@
   "edit_policy": "Edit Insurance Policy",
   "edit_policy_description": "Add or edit patient's insurance details",
   "edit_prescriptions": "Edit Prescriptions",
+  "edit_profile": "Edit Profile",
   "edit_user_profile": "Edit Profile",
   "edited_by": "Edited by",
   "edited_on": "Edited on",
@@ -627,7 +652,11 @@
   "email_discharge_summary_description": "Enter your valid email address to receive the discharge summary",
   "email_success": "We will be sending an email shortly. Please check your inbox.",
   "emergency": "Emergency",
+  "emergency_contact": "Emergency Contact",
   "emergency_contact_number": "Emergency Contact Number",
+  "emergency_contact_person_name": "Emergency Contact Person Name",
+  "emergency_contact_person_name_volunteer": "Emergency Contact Person Name (Volunteer)",
+  "emergency_contact_volunteer": "Emergency Contact (Volunteer)",
   "empty_date_time": "--:-- --; --/--/----",
   "encounter_date_field_label__A": "Date & Time of Admission to the Facility",
   "encounter_date_field_label__DC": "Date & Time of Domiciliary Care commencement",
@@ -643,6 +672,7 @@
   "encounter_suggestion__OP": "Out-patient visit",
   "encounter_suggestion__R": "Consultation",
   "encounter_suggestion_edit_disallowed": "Not allowed to switch to this option in edit consultation",
+  "encounters": "Encounters",
   "end_datetime": "End Date/Time",
   "enter_aadhaar_number": "Enter a 12-digit Aadhaar ID",
   "enter_aadhaar_otp": "Enter OTP sent to the registered mobile with Aadhaar",
@@ -664,6 +694,7 @@
   "events": "Events",
   "expand_sidebar": "Expand Sidebar",
   "expected_burn_rate": "Expected Burn Rate",
+  "expired": "Expired",
   "expired_on": "Expired On",
   "expires_on": "Expires On",
   "facilities": "Facilities",
@@ -721,6 +752,7 @@
   "granted_on": "Granted On",
   "has_domestic_healthcare_support": "Has domestic healthcare support?",
   "has_sari": "Has SARI (Severe Acute Respiratory illness)?",
+  "health-profile": "Health Profile",
   "health_facility__config_registration_error": "Health ID registration failed",
   "health_facility__config_update_error": "Health Facility config update failed",
   "health_facility__config_update_success": "Health Facility config updated successfully",
@@ -757,12 +789,17 @@
   "i_declare": "I hereby declare that:",
   "icd11_as_recommended": "As per ICD-11 recommended by WHO",
   "icmr_specimen_referral_form": "ICMR Specimen Referral Form",
+  "immunisation-records": "Immunisation",
   "incomplete_patient_details_warning": "Patient details are incomplete. Please update the details before proceeding.",
   "inconsistent_dosage_units_error": "Dosage units must be same",
   "indian_mobile": "Indian Mobile",
   "indicator": "Indicator",
   "inidcator_event": "Indicator Event",
   "instruction_on_titration": "Instruction on titration",
+  "insurance__insurer_id": "Insurer ID",
+  "insurance__insurer_name": "Insurer Name",
+  "insurance__member_id": "Member ID",
+  "insurance__policy_name": "Policy ID / Policy Name",
   "insurer_name_required": "Insurer Name is required",
   "international_mobile": "International Mobile",
   "invalid_asset_id_msg": "Oops! The asset ID you entered does not appear to be valid.",
@@ -771,6 +808,7 @@
   "invalid_link_msg": "It appears that the password reset link you have used is either invalid or expired. Please request a new password reset link.",
   "invalid_password": "Password doesn't meet the requirements",
   "invalid_password_reset_link": "Invalid password reset link",
+  "invalid_patient_data": "Invalid Patient Data",
   "invalid_phone": "Please enter valid phone number",
   "invalid_phone_number": "Invalid Phone Number",
   "invalid_pincode": "Invalid Pincode",
@@ -789,6 +827,8 @@
   "investigations__result": "Result",
   "investigations__unit": "Unit",
   "investigations_suggested": "Investigations Suggested",
+  "investigations_summary": "Investigations Summary",
+  "ip_encounter": "IP Encounter",
   "is": "Is",
   "is_antenatal": "Is Antenatal",
   "is_atypical_presentation": "Is Atypical presentation",
@@ -796,21 +836,26 @@
   "is_emergency": "Is emergency",
   "is_emergency_case": "Is emergency case",
   "is_it_upshift": "is it upshift",
+  "is_pregnant": "Is pregnant",
   "is_this_an_emergency": "Is this an emergency?",
   "is_this_an_upshift": "Is this an upshift?",
   "is_unusual_course": "Is unusual course",
   "is_up_shift": "Is up shift",
   "is_upshift_case": "Is upshift case",
   "is_vaccinated": "Whether vaccinated",
+  "kasp_enabled_date": "{{kasp_string}} enabled date",
   "label": "Label",
   "landline": "Indian landline",
   "language_selection": "Language Selection",
   "last_administered": "Last administered",
+  "last_discharge_reason": "Last Discharge Reason",
   "last_edited": "Last Edited",
   "last_modified": "Last Modified",
   "last_name": "Last Name",
   "last_online": "Last Online",
   "last_serviced_on": "Last Serviced On",
+  "last_updated_by": "Last updated by",
+  "last_vaccinated_on": "Last Vaccinated on",
   "latitude_invalid": "Latitude must be between -90 and 90",
   "left": "Left",
   "length": "Length ({{unit}})",
@@ -859,6 +904,7 @@
   "max_size_for_image_uploaded_should_be": "Max size for image uploaded should be",
   "measured_after": "Measured after",
   "measured_before": "Measured before",
+  "medical": "Medical",
   "medical_council_registration": "Medical Council Registration",
   "medical_worker": "Medical Worker",
   "medicine": "Medicine",
@@ -903,6 +949,8 @@
   "no_beds_available": "No beds available",
   "no_changes": "No changes",
   "no_changes_made": "No changes made",
+  "no_consultation_filed": "No consultation filed",
+  "no_consultation_history": "No consultation history available",
   "no_consultation_updates": "No consultation updates",
   "no_data_found": "No data found",
   "no_duplicate_facility": "You should not create duplicate facilities",
@@ -915,6 +963,7 @@
   "no_linked_facilities": "No Linked Facilities",
   "no_log_update_delta": "No changes since previous log update",
   "no_log_updates": "No log updates found",
+  "no_medical_history_available": "No Medical History Available",
   "no_notices_for_you": "No notices for you.",
   "no_patients_found": "No Patients Found",
   "no_patients_to_show": "No patients to show.",
@@ -924,6 +973,7 @@
   "no_records_found": "No Records Found",
   "no_remarks": "No remarks",
   "no_results_found": "No Results Found",
+  "no_social_profile_details_available": "No Social Profile Details Available",
   "no_staff": "No staff found",
   "no_tests_taken": "No tests taken",
   "no_treating_physicians_available": "This facility does not have any home facility doctors. Please contact your admin.",
@@ -943,6 +993,7 @@
   "number_of_beds": "Number of beds",
   "number_of_beds_out_of_range_error": "Number of beds cannot be greater than 100",
   "number_of_chronic_diseased_dependents": "Number Of Chronic Diseased Dependents",
+  "number_of_covid_vaccine_doses": "Number of Covid vaccine doses",
   "nursing_care": "Nursing Care",
   "nursing_information": "Nursing Information",
   "nutrition": "Nutrition",
@@ -952,6 +1003,8 @@
   "on": "On",
   "ongoing_medications": "Ongoing Medications",
   "only_indian_mobile_numbers_supported": "Currently only Indian numbers are supported",
+  "op_encounter": "OP Encounter",
+  "op_file_closed": "OP file closed",
   "open": "Open",
   "open_camera": "Open Camera",
   "open_live_monitoring": "Open Live Monitoring",
@@ -974,6 +1027,11 @@
   "password_reset_success": "Password Reset successfully",
   "password_sent": "Password Reset Email Sent",
   "patient": "Patient",
+  "patient-notes": "Notes",
+  "patient__general-info": "General Info",
+  "patient__insurance-details": "Insurance Details",
+  "patient__social-profile": "Social Profile",
+  "patient__volunteer-contact": "Volunteer Contact",
   "patient_address": "Patient Address",
   "patient_body": "Patient Body",
   "patient_category": "Patient Category",
@@ -997,6 +1055,8 @@
   "patient_notes_thread__Doctors": "Doctor's Discussions",
   "patient_notes_thread__Nurses": "Nurse's Discussions",
   "patient_phone_number": "Patient Phone Number",
+  "patient_profile": "Patient Profile",
+  "patient_profile_created_by": "Patient profile created by",
   "patient_registration__address": "Address",
   "patient_registration__age": "Age",
   "patient_registration__comorbidities": "Comorbidities",
@@ -1009,12 +1069,15 @@
   "patient_status": "Patient Status",
   "patient_transfer_birth_match_note": "Note: Year of birth must match the patient to process the transfer request.",
   "patients": "Patients",
+  "permanent_address": "Permanent Address",
+  "permission_denied": "You do not have permission to perform this action",
   "personal_information": "Personal Information",
   "phone": "Phone",
   "phone_no": "Phone no.",
   "phone_number": "Phone Number",
   "phone_number_at_current_facility": "Phone Number of Contact person at current Facility",
   "pincode": "Pincode",
+  "please_assign_bed_to_patient": "Please assign a bed to this patient",
   "please_enter_a_reason_for_the_shift": "Please enter a reason for the shift.",
   "please_select_a_facility": "Please select a facility",
   "please_select_breathlessness_level": "Please select Breathlessness Level",
@@ -1036,6 +1099,7 @@
   "policy__subscriber_id__example": "SUB001",
   "policy_id_required": "Policy Id or Policy Name is required",
   "position": "Position",
+  "post_partum": "Post-partum",
   "post_your_comment": "Post Your Comment",
   "powered_by": "Powered By",
   "preferred_facility_type": "Preferred Facility Type",
@@ -1050,6 +1114,7 @@
   "prescriptions__medicine": "Medicine",
   "prescriptions__route": "Route",
   "prescriptions__start_date": "Prescribed On",
+  "present_health": "Present Health",
   "preset_deleted": "Preset deleted",
   "preset_name_placeholder": "Specify an identifiable name for the new preset",
   "preset_updated": "Preset updated",
@@ -1100,9 +1165,11 @@
   "req_atleast_one_lowercase": "Require at least one lower case letter",
   "req_atleast_one_symbol": "Require at least one symbol",
   "req_atleast_one_uppercase": "Require at least one upper case",
+  "request-sample-test": "Service Request",
   "request_consent": "Request Consent",
   "request_description": "Description of Request",
   "request_description_placeholder": "Type your description here",
+  "request_sample_test": "Request Sample Test",
   "request_title": "Request Title",
   "request_title_placeholder": "Type your title here",
   "required": "Required",
@@ -1126,6 +1193,8 @@
   "return_to_login": "Return to Login",
   "return_to_password_reset": "Return to Password Reset",
   "return_to_patient_dashboard": "Return to Patient Dashboard",
+  "review_before": "Review Before",
+  "review_missed": "Review Missed",
   "revoked_on": "Revoked On",
   "right": "Right",
   "route": "Route",
@@ -1173,6 +1242,8 @@
   "send_otp_error": "Failed to send OTP. Please try again later.",
   "send_otp_success": "OTP has been sent to the respective mobile number",
   "send_reset_link": "Send Reset Link",
+  "send_sample_to_collection_centre_description": "Are you sure you want to send the sample to Collection Centre?",
+  "send_sample_to_collection_centre_title": "Send sample to collection centre",
   "serial_number": "Serial Number",
   "serviced_on": "Serviced on",
   "session_expired": "Session Expired",
@@ -1181,6 +1252,8 @@
   "set_your_local_language": "Set your local language",
   "settings_and_filters": "Settings and Filters",
   "severity_of_breathlessness": "Severity of Breathlessness",
+  "sex": "Sex",
+  "shift": "Shift Patient",
   "shift_request_updated_successfully": "Shift request updated successfully",
   "shifting": "Shifting",
   "shifting_approval_facility": "Shifting approval facility",
@@ -1188,6 +1261,7 @@
   "shifting_approving_facility_can_not_be_empty": "Shifting approving facility can not be empty.",
   "shifting_deleted": "Shifting record has been deleted successfully.",
   "shifting_details": "Shifting details",
+  "shifting_history": "Shifting History",
   "shifting_status": "Shifting status",
   "show_abha_profile": "Show ABHA Profile",
   "show_all": "Show all",
@@ -1197,6 +1271,7 @@
   "show_unread_notifications": "Show Unread",
   "sign_out": "Sign Out",
   "skills": "Skills",
+  "social_profile": "Social Profile",
   "socioeconomic_status": "Socioeconomic status",
   "software_update": "Software Update",
   "something_went_wrong": "Something went wrong..!",
@@ -1225,9 +1300,11 @@
   "subscription_error": "Subscription Error",
   "subscription_failed": "Subscription Failed",
   "suggested_investigations": "Suggested Investigations",
+  "suggestion": "Suggestion",
   "summary": "Summary",
   "support": "Support",
   "switch": "Switch",
+  "switch_bed": "Switch Bed",
   "switch_camera_is_not_available": "Switch camera is not available.",
   "symptoms": "Symptoms",
   "systolic": "Systolic",
@@ -1244,7 +1321,10 @@
   "total_users": "Total Users",
   "transcript_edit_info": "You can update this if we made an error",
   "transcript_information": "This is what we heard",
+  "transfer_allowed": "Transfer Allowed",
+  "transfer_blocked": "Transfer Blocked",
   "transfer_in_progress": "TRANSFER IN PROGRESS",
+  "transfer_status_updated": "Transfer Status Updated",
   "transfer_to_receiving_facility": "Transfer to receiving facility",
   "travel_within_last_28_days": "Domestic/international Travel (within last 28 days)",
   "treating_doctor": "Treating Doctor",
@@ -1305,6 +1385,8 @@
   "username": "Username",
   "users": "Users",
   "vacant": "Vacant",
+  "vaccinated": "Vaccinated",
+  "vaccine_name": "Vaccine name",
   "vehicle_preference": "Vehicle preference",
   "vendor_name": "Vendor Name",
   "ventilator_interface": "Respiratory Support Type",
@@ -1320,21 +1402,30 @@
   "verify_otp_success": "OTP has been verified successfully.",
   "verify_patient_identifier": "Please verify the patient identifier",
   "verify_using": "Verify Using",
+  "video_call": "Video Call",
   "video_conference_link": "Video Conference Link",
   "view": "View",
   "view_abdm_records": "View ABDM Records",
+  "view_all_details": "View All Details",
   "view_asset": "View Assets",
   "view_cns": "View CNS",
   "view_consultation_and_log_updates": "View Consultation / Log Updates",
   "view_details": "View Details",
   "view_faciliy": "View Facility",
+  "view_files": "View Files",
   "view_patients": "View Patients",
+  "view_update_patient_files": "View/Update patient files",
+  "view_updates": "View Updates",
   "view_users": "View Users",
+  "village": "Village",
   "virtual_nursing_assistant": "Virtual Nursing Assistant",
   "vitals": "Vitals",
   "vitals_monitor": "Vitals Monitor",
   "vitals_present": "Vitals Monitor present",
   "voice_autofill": "Voice Autofill",
+  "volunteer_assigned": "Volunteer assigned successfuly",
+  "volunteer_contact": "Volunteer Contact",
+  "volunteer_unassigned": "Volunteer unassigned successfuly",
   "ward": "Ward",
   "warranty_amc_expiry": "Warranty / AMC Expiry",
   "what_facility_assign_the_patient_to": "What facility would you like to assign the patient to",
diff --git a/public/locale/hi.json b/public/locale/hi.json
index 0eb0cc28cfd..b3c172021dd 100644
--- a/public/locale/hi.json
+++ b/public/locale/hi.json
@@ -567,6 +567,7 @@
   "patient_name": "मरीज का नाम",
   "patient_no": "ओपी/आईपी संख्या",
   "patient_phone_number": "मरीज़ का फ़ोन नंबर",
+  "patient_profile": "रोगी प्रोफ़ाइल",
   "patient_registration__address": "पता",
   "patient_registration__age": "आयु",
   "patient_registration__comorbidities": "comorbidities",
diff --git a/public/locale/kn.json b/public/locale/kn.json
index be18432e0ce..faf50da3a23 100644
--- a/public/locale/kn.json
+++ b/public/locale/kn.json
@@ -568,6 +568,7 @@
   "patient_name": "ರೋಗಿಯ ಹೆಸರು",
   "patient_no": "OP/IP ಸಂ",
   "patient_phone_number": "ರೋಗಿಯ ಫೋನ್ ಸಂಖ್ಯೆ",
+  "patient_profile": "ರೋಗಿ ಪ್ರೊಫೈಲ್",
   "patient_registration__address": "ವಿಳಾಸ",
   "patient_registration__age": "ವಯಸ್ಸು",
   "patient_registration__comorbidities": "ಸಹವರ್ತಿ ರೋಗಗಳು",
diff --git a/public/locale/ml.json b/public/locale/ml.json
index cf381c32c0e..33dadcf9fb7 100644
--- a/public/locale/ml.json
+++ b/public/locale/ml.json
@@ -567,6 +567,7 @@
   "patient_name": "രോഗിയുടെ പേര്",
   "patient_no": "OP/IP നമ്പർ",
   "patient_phone_number": "രോഗിയുടെ ഫോൺ നമ്പർ",
+  "patient_profile": "രോഗിയുടെ പ്രൊഫൈൽ",
   "patient_registration__address": "വിലാസം",
   "patient_registration__age": "പ്രായം",
   "patient_registration__comorbidities": "കോമോർബിഡിറ്റികൾ",
diff --git a/public/locale/mr.json b/public/locale/mr.json
index 06e9c5bbbde..543278bf867 100644
--- a/public/locale/mr.json
+++ b/public/locale/mr.json
@@ -49,6 +49,7 @@
   "new_password": "नवीन पासवर्ड",
   "no_duplicate_facility": "बनावट हॉस्पिटल सुविधा मुळीच तयार करू नका",
   "no_facilities": "कोणतेही हॉस्पिटल नाही",
+  "patient_profile": "रुग्ण प्रोफाइल",
   "password": "पासवर्ड",
   "password_mismatch": "\"पासवर्ड\" आणि \"पासवर्डची खात्री करा\" दोन्ही सारखे हवेत.",
   "password_reset_failure": "पासवर्ड रिसेट झाला नाही",
@@ -62,5 +63,36 @@
   "send_reset_link": "रीसेट लिंक  पाठवा",
   "sign_out": "साइन आउट",
   "something_wrong": "काहीतरी चूक झाली! पुन्हा प्रयत्न करा",
-  "username": "युजरनेम"
+  "username": "युजरनेम",
+  "general_info": "सामान्य माहिती",
+  "phone": "फोन",
+  "date_of_birth": "जन्म तारीख",
+  "sex": "लिंग",
+  "emergency_contact": "आपत्कालीन संपर्क",
+  "emergency_contact_person_name": "आपत्कालीन संपर्क व्यक्तीचे नाव",
+  "covid_details": "कोविड तपशील",
+  "number_of_covid_vaccine_doses": "कोविड लसीचे डोस",
+  "vaccine_name": "लस नाव",
+  "last_vaccinated_on": "शेवटचा लसीकरणाचा दिवस",
+  "countries_travelled": "प्रवास केलेले देश",
+  "date_of_return": "परतण्याची तारीख",
+  "social_profile": "सामाजिक प्रोफाइल",
+  "no_social_profile_details_available": "कोणतीही सामाजिक प्रोफाइल माहिती उपलब्ध नाही",
+  "location": "स्थान",
+  "current_address": "सध्याचा पत्ता",
+  "permanent_address": "स्थायी पत्ता",
+  "nationality": "राष्ट्रीयत्व",
+  "state": "राज्य",
+  "local_body": "स्थानिक संस्था",
+  "ward": "वॉर्ड",
+  "village": "गाव",
+  "volunteer_contact": "स्वयंसेवक संपर्क",
+  "emergency_contact_volunteer": "आपत्कालीन संपर्क (स्वयंसेवक)",
+  "emergency_contact_person_name_volunteer": "आपत्कालीन संपर्क व्यक्तीचे नाव (स्वयंसेवक)",
+  "medical": "वैद्यकीय",
+  "no_medical_history_available": "कोणताही वैद्यकीय इतिहास उपलब्ध नाही",
+  "present_health": "सध्याचे आरोग्य",
+  "ongoing_medications": "चालू औषधे",
+  "allergies": "अॅलर्जी",
+  "is_pregnant": "गर्भवती आहे"
 }
diff --git a/src/CAREUI/display/Chip.tsx b/src/CAREUI/display/Chip.tsx
index a2bacf8bd61..e501bf26f90 100644
--- a/src/CAREUI/display/Chip.tsx
+++ b/src/CAREUI/display/Chip.tsx
@@ -26,7 +26,7 @@ export default function Chip({
     <span
       id={props?.id}
       className={classNames(
-        "inline-flex items-center gap-2 font-medium leading-4",
+        "inline-flex items-center gap-2 font-medium",
 
         {
           small: "rounded px-2 py-1 text-xs",
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 125ee8c9055..8ba9460e34b 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -111,7 +111,7 @@ export default function AppRouter() {
 
   return (
     <SidebarShrinkContext.Provider value={{ shrinked, setShrinked }}>
-      <div className="absolute inset-0 flex h-screen overflow-hidden bg-secondary-100 print:overflow-visible">
+      <div className="flex h-screen overflow-hidden bg-secondary-100 print:overflow-visible">
         <>
           <div className="block md:hidden">
             <MobileSidebar open={sidebarOpen} setOpen={setSidebarOpen} />{" "}
@@ -121,7 +121,7 @@ export default function AppRouter() {
           </div>
         </>
 
-        <div className="flex w-full flex-1 flex-col overflow-hidden print:overflow-visible">
+        <div className="relative flex w-full flex-1 flex-col overflow-hidden bg-gray-100 print:overflow-visible">
           <div className="relative z-10 flex h-16 shrink-0 bg-white shadow md:hidden">
             <button
               onClick={() => setSidebarOpen(true)}
@@ -156,7 +156,7 @@ export default function AppRouter() {
 
           <main
             id="pages"
-            className="flex-1 overflow-y-scroll bg-gray-100 pb-4 focus:outline-none md:py-0"
+            className="flex-1 overflow-y-auto bg-gray-100 focus:outline-none md:pb-2 md:pr-2"
           >
             <div
               className="max-w-8xl mx-auto mt-4 min-h-[96vh] rounded-lg border bg-gray-50 p-3 shadow"
diff --git a/src/Routers/routes/PatientRoutes.tsx b/src/Routers/routes/PatientRoutes.tsx
index 0a46190cfd1..31d6d99a037 100644
--- a/src/Routers/routes/PatientRoutes.tsx
+++ b/src/Routers/routes/PatientRoutes.tsx
@@ -3,6 +3,7 @@ import InvestigationReports from "@/components/Facility/Investigations/Reports";
 import FileUploadPage from "@/components/Patient/FileUploadPage";
 import { InsuranceDetails } from "@/components/Patient/InsuranceDetails";
 import { PatientManager } from "@/components/Patient/ManagePatients";
+import { patientTabs } from "@/components/Patient/PatientDetailsTab";
 import { PatientHome } from "@/components/Patient/PatientHome";
 import PatientNotes from "@/components/Patient/PatientNotes";
 import { PatientRegister } from "@/components/Patient/PatientRegister";
@@ -11,7 +12,7 @@ import { AppRoutes } from "@/Routers/AppRouter";
 
 const PatientRoutes: AppRoutes = {
   "/patients": () => <PatientManager />,
-  "/patient/:id": ({ id }) => <PatientHome id={id} />,
+  "/patient/:id": ({ id }) => <PatientHome id={id} page="demography" />,
   "/patient/:id/investigation_reports": ({ id }) => (
     <InvestigationReports id={id} />
   ),
@@ -19,8 +20,15 @@ const PatientRoutes: AppRoutes = {
     <PatientRegister facilityId={facilityId} />
   ),
   "/facility/:facilityId/patient/:id": ({ facilityId, id }) => (
-    <PatientHome facilityId={facilityId} id={id} />
+    <PatientHome facilityId={facilityId} id={id} page="demography" />
   ),
+  ...patientTabs.reduce((acc: AppRoutes, tab) => {
+    acc["/facility/:facilityId/patient/:id/" + tab.route] = ({
+      facilityId,
+      id,
+    }) => <PatientHome facilityId={facilityId} id={id} page={tab.route} />;
+    return acc;
+  }, {}),
   "/facility/:facilityId/patient/:id/insurance": ({ facilityId, id }) => (
     <InsuranceDetails facilityId={facilityId} id={id} />
   ),
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
index d036ad49750..847b7c9ba60 100644
--- a/src/Utils/request/request.ts
+++ b/src/Utils/request/request.ts
@@ -70,6 +70,9 @@ export default async function request<TData, TBody>(
       return result;
     } catch (error: any) {
       result = { error, res: undefined, data: undefined };
+      if (error.name === "AbortError") {
+        return result;
+      }
     }
   }
 
diff --git a/src/Utils/request/useMutation.ts b/src/Utils/request/useMutation.ts
index fbc6edc3940..7c368f5e45d 100644
--- a/src/Utils/request/useMutation.ts
+++ b/src/Utils/request/useMutation.ts
@@ -10,7 +10,7 @@ import { mergeRequestOptions } from "@/Utils/request/utils";
 
 export default function useMutation<TData, TBody>(
   route: MutationRoute<TData, TBody>,
-  options: RequestOptions<TData>,
+  options: RequestOptions<TData, TBody>,
 ) {
   const [response, setResponse] = React.useState<RequestResult<TData>>();
   const [isProcessing, setIsProcessing] = React.useState(false);
@@ -18,7 +18,7 @@ export default function useMutation<TData, TBody>(
   const controllerRef = React.useRef<AbortController>();
 
   const runQuery = React.useCallback(
-    async (overrides?: RequestOptions<TData>) => {
+    async (overrides?: RequestOptions<TData, TBody>) => {
       controllerRef.current?.abort();
 
       const controller = new AbortController();
@@ -31,8 +31,10 @@ export default function useMutation<TData, TBody>(
 
       setIsProcessing(true);
       const response = await request(route, { ...resolvedOptions, controller });
-      setResponse(response);
-      setIsProcessing(false);
+      if (response.error?.name !== "AbortError") {
+        setResponse(response);
+        setIsProcessing(false);
+      }
       return response;
     },
     [route, JSON.stringify(options)],
diff --git a/src/Utils/request/useQuery.ts b/src/Utils/request/useQuery.ts
index 109ff0bb2f1..5f4c10a289e 100644
--- a/src/Utils/request/useQuery.ts
+++ b/src/Utils/request/useQuery.ts
@@ -37,8 +37,10 @@ export default function useQuery<TData>(
 
       setLoading(true);
       const response = await request(route, { ...resolvedOptions, controller });
-      setResponse(response);
-      setLoading(false);
+      if (response.error?.name !== "AbortError") {
+        setResponse(response);
+        setLoading(false);
+      }
       return response;
     },
     [route, JSON.stringify(options)],
diff --git a/src/common/constants.tsx b/src/common/constants.tsx
index d46c42969ee..9d0be731565 100644
--- a/src/common/constants.tsx
+++ b/src/common/constants.tsx
@@ -1717,3 +1717,5 @@ export const HEADER_CONTENT_TYPES = {
   svg: "image/svg+xml",
   xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
 } as const;
+
+export const ADMIN_USER_TYPES = ["DistrictAdmin", "StateAdmin"] as const;
diff --git a/src/components/Common/Breadcrumbs.tsx b/src/components/Common/Breadcrumbs.tsx
index 410df597a5d..0435d7675d9 100644
--- a/src/components/Common/Breadcrumbs.tsx
+++ b/src/components/Common/Breadcrumbs.tsx
@@ -72,12 +72,12 @@ export default function Breadcrumbs({
         <div className="flex items-center">
           <CareIcon icon="l-angle-right" className="h-4 text-gray-400" />
           {isLastItem ? (
-            <span className="text-gray-500">{crumb.name}</span>
+            <span className="text-gray-600">{crumb.name}</span>
           ) : (
             <Button
               asChild
               variant="link"
-              className="p-1 font-light text-gray-500 underline underline-offset-2 hover:text-gray-700"
+              className="p-1 font-normal text-gray-800 underline underline-offset-2 hover:text-gray-700"
             >
               <Link href={crumb.uri}>{crumb.name}</Link>
             </Button>
@@ -91,32 +91,26 @@ export default function Breadcrumbs({
     <nav className={classNames("w-full", className)} aria-label="Breadcrumb">
       <ol className="flex flex-wrap items-center">
         {!hideBack && (
-          <li className="mr-1 flex items-center">
+          <li className="mr-3 flex items-center">
             <Button
               variant="link"
-              className="px-1 text-sm font-normal text-gray-500 underline underline-offset-2"
+              className="rounded bg-gray-200/50 px-1 text-sm font-normal text-gray-800 transition hover:bg-gray-200/75 hover:no-underline"
               size="xs"
               onClick={() => {
                 if (onBackClick && onBackClick() === false) return;
                 goBack(backUrl);
               }}
             >
-              <CareIcon
-                icon="l-angle-left"
-                className="-ml-2 h-4 text-gray-400"
-              />
-              <span className="pr-1">Back</span>
+              <CareIcon icon="l-arrow-left" className="h-5 text-gray-700" />
+              <span className="pr-2">Back</span>
             </Button>
-            <span className="text-xs font-light text-gray-400 no-underline">
-              |
-            </span>
           </li>
         )}
         <li>
           <Button
             asChild
             variant="link"
-            className="p-1 font-light text-gray-500 underline underline-offset-2 hover:text-gray-700"
+            className="p-1 font-normal text-gray-800 underline underline-offset-2 hover:text-gray-700"
           >
             <Link href="/">Home</Link>
           </Button>
diff --git a/src/components/Common/Menu.tsx b/src/components/Common/Menu.tsx
index 035b6f2f342..aa647a3dedb 100644
--- a/src/components/Common/Menu.tsx
+++ b/src/components/Common/Menu.tsx
@@ -55,7 +55,7 @@ export default function DropdownMenu({
 
         <MenuItems
           modal={false}
-          className={`absolute right-0 z-10 mt-2 min-w-full origin-top-right rounded-lg bg-white py-1 shadow-lg ring-1 ring-black/5 focus:outline-none sm:min-w-[250px] md:w-max ${props.itemClassName}`}
+          className={`absolute right-0 z-50 mt-2 min-w-full origin-top-right rounded-lg bg-white py-1 shadow-lg ring-1 ring-black/5 focus:outline-none sm:min-w-[250px] md:w-max ${props.itemClassName}`}
         >
           <>{props.children}</>
         </MenuItems>
diff --git a/src/components/Common/Page.tsx b/src/components/Common/Page.tsx
index 5d542a4fcbc..699f3d47204 100644
--- a/src/components/Common/Page.tsx
+++ b/src/components/Common/Page.tsx
@@ -33,13 +33,13 @@ export default function Page(props: PageProps) {
 
   let padding = "";
   if (!props.noImplicitPadding) {
-    if (!props.hideBack || props.componentRight) padding = "md:px-6 px-3 py-1";
+    if (!props.hideBack || props.componentRight) padding = "py-3 md:p-6";
     else padding = "px-6 py-5";
   }
 
   return (
     <div className={classNames(padding, props.className)} ref={props.ref}>
-      <div className="flex flex-col justify-between gap-2 md:flex-row md:items-center md:gap-6">
+      <div className="flex flex-col justify-between gap-2 px-3 md:flex-row md:items-center md:gap-6 md:px-0">
         <PageTitle
           changePageMetadata={props.changePageMetadata}
           title={props.title}
diff --git a/src/components/Common/SortDropdown.tsx b/src/components/Common/SortDropdown.tsx
index cf4193deaea..2e5ccd95015 100644
--- a/src/components/Common/SortDropdown.tsx
+++ b/src/components/Common/SortDropdown.tsx
@@ -27,7 +27,7 @@ export default function SortDropdownMenu(props: Props) {
       variant="secondary"
       className="w-full border border-primary-500 bg-white md:w-auto"
       icon={<CareIcon icon="l-sort" />}
-      containerClassName="w-full md:w-auto"
+      containerClassName="w-full md:w-auto z-20"
     >
       {props.options.map(({ isAscending, value }, i) => (
         <DropdownItem
diff --git a/src/components/Facility/ConsultationCard.tsx b/src/components/Facility/ConsultationCard.tsx
index 1a2ed02d6ad..a2ede9f2667 100644
--- a/src/components/Facility/ConsultationCard.tsx
+++ b/src/components/Facility/ConsultationCard.tsx
@@ -1,13 +1,14 @@
 import careConfig from "@careConfig";
+import dayjs from "dayjs";
 import { t } from "i18next";
 import { navigate } from "raviger";
 import { useState } from "react";
 
 import Chip from "@/CAREUI/display/Chip";
+import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import ButtonV2 from "@/components/Common/ButtonV2";
 import DialogModal from "@/components/Common/Dialog";
-import RelativeDateUserMention from "@/components/Common/RelativeDateUserMention";
 import Beds from "@/components/Facility/Consultations/Beds";
 import { ConsultationModel } from "@/components/Facility/models";
 
@@ -25,10 +26,10 @@ export const ConsultationCard = (props: ConsultationProps) => {
   const { itemData, isLastConsultation, refetch } = props;
   const [open, setOpen] = useState(false);
   const bedDialogTitle = itemData.discharge_date
-    ? "Bed History"
+    ? t("bed_history")
     : !itemData.current_bed
-      ? "Assign Bed"
-      : "Switch Bed";
+      ? t("assign_bed")
+      : t("switch_bed");
   return (
     <>
       <DialogModal
@@ -48,63 +49,59 @@ export const ConsultationCard = (props: ConsultationProps) => {
             hideTitle
           />
         ) : (
-          <div>Invalid Patient Data</div>
+          <div>{t("invalid_patient_data")}</div>
         )}
       </DialogModal>
-      <div className="mt-4 block cursor-pointer rounded-lg border bg-white p-4 text-black shadow hover:border-primary-500">
+      <div className="pb-16 block relative cursor-pointer border-l-2 px-4 border-l-secondary-300 hover:border-primary-500 transition-all before:absolute before:-left-[7px] before:top-0 before:w-3 before:aspect-square before:bg-secondary-400 before:rounded-full hover:before:bg-primary-500 before:transition-all">
+        <Chip
+          size="small"
+          variant={itemData.suggestion === "A" ? "alert" : "primary"}
+          text={
+            itemData.suggestion === "A" ? t("ip_encounter") : t("op_encounter")
+          }
+          className="-translate-y-2"
+        />
+        <div className="text-sm">
+          {dayjs(itemData.created_date).format("DD/MM/YYYY")}
+        </div>
+
         {itemData.is_kasp && (
           <div className="ml-3 mt-2 inline-flex items-center rounded-md bg-yellow-100 px-2.5 py-0.5 text-sm font-medium leading-5 text-yellow-800">
             {careConfig.kasp.string}
           </div>
         )}
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
+          {[
+            {
+              label: t("facility"),
+              value: (
+                <>
+                  {itemData.facility_name}
+                  {itemData.is_telemedicine && (
+                    <span className="ml-1">(Telemedicine)</span>
+                  )}
+                </>
+              ),
+            },
+            {
+              label: t("suggestion"),
+              value: itemData.suggestion_text?.toLocaleLowerCase(),
+            },
+            {
+              hide: !itemData.kasp_enabled_date,
+              label: t("kasp_enabled_date", {
+                kasp_string: careConfig.kasp.string,
+              }),
+              value: itemData.kasp_enabled_date
+                ? formatDateTime(itemData.kasp_enabled_date)
+                : undefined,
+            },
 
-        <div className="ml-2 mt-2 grid grid-cols-1 gap-4 md:grid-cols-4">
-          <div className="sm:col-span-1">
-            <div className="sm:col-span-1">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Facility
-              </div>
-              <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-                {itemData.facility_name}{" "}
-                {itemData.is_telemedicine && (
-                  <span className="ml-2">(Telemedicine)</span>
-                )}
-              </div>
-            </div>
-          </div>
-          <div className="sm:col-span-1">
-            <div className="capitalize">
-              <div className="sm:col-span-1">
-                <div className="text-sm font-semibold leading-5 text-zinc-400">
-                  Suggestion{" "}
-                </div>
-                <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-                  {itemData.suggestion_text?.toLocaleLowerCase()}
-                </div>
-              </div>
-            </div>
-          </div>
-          {itemData.kasp_enabled_date && (
-            <div className="sm:col-span-1">
-              <div className="sm:col-span-1">
-                <div className="text-sm font-semibold leading-5 text-zinc-400">
-                  {careConfig.kasp.string} Enabled date{" "}
-                </div>
-                <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-                  {itemData.kasp_enabled_date
-                    ? formatDateTime(itemData.kasp_enabled_date)
-                    : "-"}
-                </div>
-              </div>
-            </div>
-          )}
-          {itemData.admitted && itemData.encounter_date && (
-            <div className="sm:col-span-1">
-              <div className="sm:col-span-1">
-                <div className="text-sm font-semibold leading-5 text-zinc-400">
-                  Admitted on
-                </div>
-                <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
+            {
+              label: t("admitted_on"),
+              hide: !(itemData.admitted && itemData.encounter_date),
+              value: (
+                <>
                   {formatDateTime(itemData.encounter_date)}
                   {itemData.is_readmission && (
                     <Chip
@@ -115,103 +112,77 @@ export const ConsultationCard = (props: ConsultationProps) => {
                       text="Readmission"
                     />
                   )}
-                </div>
-              </div>
-            </div>
-          )}
-          {!itemData.admitted && (
-            <div className="sm:col-span-1">
-              <div className="sm:col-span-1">
-                <div className="text-sm font-semibold leading-5 text-zinc-400">
-                  Admitted{" "}
-                </div>
-                <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-                  No
-                </div>
+                </>
+              ),
+            },
+            {
+              label: t("admitted"),
+              hide: itemData.admitted,
+              value: t("no"),
+            },
+            {
+              label: t("discharged_on"),
+              hide: !itemData.discharge_date,
+              value: formatDateTime(itemData.discharge_date),
+            },
+          ]
+            .filter((f) => !f.hide)
+            .map((field, i) => (
+              <div key={i}>
+                <div className="text-sm text-gray-600">{field.label}</div>
+                <div className="font-bold">{field.value}</div>
               </div>
-            </div>
-          )}
-          {itemData.discharge_date && (
-            <div className="sm:col-span-1">
-              <div className="sm:col-span-1">
-                <div className="text-sm font-semibold leading-5 text-zinc-400">
-                  Discharged on{" "}
-                </div>
-                <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-                  {formatDateTime(itemData.discharge_date)}
-                </div>
-              </div>
-            </div>
-          )}
-        </div>
-        <div className="mt-8 flex flex-col">
-          {
-            <div className="flex flex-col items-center text-sm text-secondary-700 md:flex-row">
-              <div className="font-medium text-black">Created : </div>
-              <div className="ml-1 text-black">
-                <RelativeDateUserMention
-                  tooltipPosition="right"
-                  actionDate={itemData.created_date}
-                  user={itemData.created_by}
-                />
-              </div>
-            </div>
-          }
-          <div className="flex flex-col items-center text-sm text-secondary-700 md:flex-row">
-            <div className="font-medium text-black">Last Modified : </div>
-            <div className="ml-1 text-secondary-700">
-              <RelativeDateUserMention
-                tooltipPosition="right"
-                actionDate={itemData.modified_date}
-                user={itemData.last_edited_by}
-              />
-            </div>
-          </div>
+            ))}
         </div>
-        <div className="mt-4 flex w-full flex-col justify-between gap-1 md:flex-row">
+
+        <div className="flex gap-2 items-center mt-4">
           <ButtonV2
             id="view_consultation_and_log_updates"
-            className="h-auto whitespace-pre-wrap border border-secondary-500 bg-white text-black hover:bg-secondary-300"
+            variant="secondary"
+            className="bg-gray-200 rounded-lg font-semibold shadow-none text-xs"
             onClick={() =>
               navigate(
                 `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}`,
               )
             }
           >
-            {t("view_consultation_and_log_updates")}
+            {t("view_updates")}
           </ButtonV2>
           <ButtonV2
-            className="h-auto whitespace-pre-wrap border border-secondary-500 bg-white text-black hover:bg-secondary-300"
+            variant="secondary"
+            className="bg-gray-200 rounded-lg font-semibold shadow-none text-xs"
             onClick={() =>
               navigate(
                 `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/files/`,
               )
             }
           >
-            View / Upload Consultation Files
+            {t("view_files")}
           </ButtonV2>
-          {isLastConsultation && (
-            <ButtonV2
-              className="h-auto whitespace-pre-wrap border border-secondary-500 bg-white text-black hover:bg-secondary-300"
-              onClick={() => {
-                if (itemData.admitted && !itemData.current_bed) {
-                  Notification.Error({
-                    msg: "Please assign a bed to the patient",
-                  });
-                  setOpen(true);
-                } else {
-                  navigate(
-                    `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/log_updates/`,
-                  );
-                }
-              }}
-              disabled={!!itemData.discharge_date}
-              authorizeFor={NonReadOnlyUsers}
-            >
-              {t("add") + " " + t("log_update")}
-            </ButtonV2>
-          )}
         </div>
+        {isLastConsultation && (
+          <ButtonV2
+            variant="secondary"
+            className="mt-2 shadow-none border border-secondary-300"
+            onClick={() => {
+              if (itemData.admitted && !itemData.current_bed) {
+                Notification.Error({
+                  msg: t("please_assign_bed_to_patient"),
+                });
+                setOpen(true);
+              } else {
+                navigate(
+                  `/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/log_updates/`,
+                );
+              }
+            }}
+            disabled={!!itemData.discharge_date}
+            authorizeFor={NonReadOnlyUsers}
+          >
+            <CareIcon icon="l-plus-circle" />
+            {t("add_consultation_update")}
+          </ButtonV2>
+        )}
       </div>
     </>
   );
diff --git a/src/components/Facility/ConsultationDetails/index.tsx b/src/components/Facility/ConsultationDetails/index.tsx
index 463a4037fc9..4834ba40198 100644
--- a/src/components/Facility/ConsultationDetails/index.tsx
+++ b/src/components/Facility/ConsultationDetails/index.tsx
@@ -206,83 +206,81 @@ export const ConsultationDetails = (props: any) => {
       }}
     >
       <div>
-        <div>
-          <nav className="relative flex flex-wrap items-start justify-between">
-            <PageTitle
-              title="Patient Dashboard"
-              className="sm:m-0 sm:p-0"
-              crumbsReplacements={{
-                [facilityId]: { name: patientData?.facility_object?.name },
-                [patientId]: { name: patientData?.name },
-                [consultationId]: {
-                  name:
-                    consultationData.suggestion === "A"
-                      ? `Admitted on ${formatDateTime(
-                          consultationData.encounter_date!,
-                        )}`
-                      : consultationData.suggestion_text,
-                },
-              }}
-              breadcrumbs={true}
-              backUrl="/patients"
-            />
-            <div
-              className="flex w-full flex-col min-[1150px]:w-min min-[1150px]:flex-row min-[1150px]:items-center"
-              id="consultationpage-header"
+        <nav className="relative flex flex-wrap items-start justify-between">
+          <PageTitle
+            title="Patient Dashboard"
+            className="sm:m-0 sm:p-0"
+            crumbsReplacements={{
+              [facilityId]: { name: patientData?.facility_object?.name },
+              [patientId]: { name: patientData?.name },
+              [consultationId]: {
+                name:
+                  consultationData.suggestion === "A"
+                    ? `Admitted on ${formatDateTime(
+                        consultationData.encounter_date!,
+                      )}`
+                    : consultationData.suggestion_text,
+              },
+            }}
+            breadcrumbs={true}
+            backUrl="/patients"
+          />
+          <div
+            className="flex w-full flex-col min-[1150px]:w-min min-[1150px]:flex-row min-[1150px]:items-center"
+            id="consultationpage-header"
+          >
+            {!consultationData.discharge_date && (
+              <>
+                <button
+                  id="doctor-connect-button"
+                  onClick={() => {
+                    triggerGoal("Doctor Connect Clicked", {
+                      consultationId,
+                      facilityId: patientData.facility,
+                      userId: authUser.id,
+                      page: "ConsultationDetails",
+                    });
+                    setShowDoctors(true);
+                  }}
+                  className="btn btn-primary m-1 w-full hover:text-white"
+                >
+                  Doctor Connect
+                </button>
+                {patientData.last_consultation?.id &&
+                  isCameraAttached &&
+                  CameraFeedPermittedUserTypes.includes(authUser.user_type) && (
+                    <Link
+                      href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
+                      className="btn btn-primary m-1 w-full hover:text-white"
+                    >
+                      Camera Feed
+                    </Link>
+                  )}
+              </>
+            )}
+            <Link
+              href={`/facility/${patientData.facility}/patient/${patientData.id}`}
+              className="btn btn-primary m-1 w-full hover:text-white"
+              id="patient-details"
             >
-              {!consultationData.discharge_date && (
-                <>
-                  <button
-                    id="doctor-connect-button"
-                    onClick={() => {
-                      triggerGoal("Doctor Connect Clicked", {
-                        consultationId,
-                        facilityId: patientData.facility,
-                        userId: authUser.id,
-                        page: "ConsultationDetails",
-                      });
-                      setShowDoctors(true);
-                    }}
-                    className="btn btn-primary m-1 w-full hover:text-white"
-                  >
-                    Doctor Connect
-                  </button>
-                  {patientData.last_consultation?.id &&
-                    isCameraAttached &&
-                    CameraFeedPermittedUserTypes.includes(
-                      authUser.user_type,
-                    ) && (
-                      <Link
-                        href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
-                        className="btn btn-primary m-1 w-full hover:text-white"
-                      >
-                        Camera Feed
-                      </Link>
-                    )}
-                </>
-              )}
-              <Link
-                href={`/facility/${patientData.facility}/patient/${patientData.id}`}
-                className="btn btn-primary m-1 w-full hover:text-white"
-                id="patient-details"
-              >
-                Patient Details
-              </Link>
-              <a
-                id="patient_discussion_notes"
-                onClick={() =>
-                  showPatientNotesPopup
-                    ? navigate(
-                        `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/notes`,
-                      )
-                    : setShowPatientNotesPopup(true)
-                }
-                className="btn btn-primary m-1 w-full hover:text-white"
-              >
-                Discussion Notes
-              </a>
-            </div>
-          </nav>
+              Patient Details
+            </Link>
+            <a
+              id="patient_discussion_notes"
+              onClick={() =>
+                showPatientNotesPopup
+                  ? navigate(
+                      `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/notes`,
+                    )
+                  : setShowPatientNotesPopup(true)
+              }
+              className="btn btn-primary m-1 w-full hover:text-white"
+            >
+              Discussion Notes
+            </a>
+          </div>
+        </nav>
+        <div className="mt-4 w-full border-b-2 border-secondary-200">
           <div className="mt-2 flex w-full flex-col md:flex-row">
             <div className="size-full rounded-lg border bg-white text-black shadow">
               <PatientInfoCard
@@ -399,22 +397,22 @@ export const ConsultationDetails = (props: any) => {
           </div>
           <SelectedTab {...consultationTabProps} />
         </div>
+      </div>
+
+      <DoctorVideoSlideover
+        facilityId={facilityId}
+        show={showDoctors}
+        setShow={setShowDoctors}
+      />
 
-        <DoctorVideoSlideover
+      {showPatientNotesPopup && (
+        <PatientNotesSlideover
+          patientId={patientId}
           facilityId={facilityId}
-          show={showDoctors}
-          setShow={setShowDoctors}
+          consultationId={consultationId}
+          setShowPatientNotesPopup={setShowPatientNotesPopup}
         />
-
-        {showPatientNotesPopup && (
-          <PatientNotesSlideover
-            patientId={patientId}
-            facilityId={facilityId}
-            consultationId={consultationId}
-            setShowPatientNotesPopup={setShowPatientNotesPopup}
-          />
-        )}
-      </div>
+      )}
     </ConsultationProvider>
   );
 };
diff --git a/src/components/Files/AudioCaptureDialog.tsx b/src/components/Files/AudioCaptureDialog.tsx
index 5512fad9dc6..d198ac7db16 100644
--- a/src/components/Files/AudioCaptureDialog.tsx
+++ b/src/components/Files/AudioCaptureDialog.tsx
@@ -1,5 +1,5 @@
 import { Link } from "raviger";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -26,6 +26,7 @@ export default function AudioCaptureDialog(props: AudioCaptureDialogProps) {
 
   const { show, onHide, onCapture, autoRecord = false } = props;
   const [status, setStatus] = useState<Status | null>(null);
+  const mediaStreamRef = useRef<MediaStream | null>(null);
   const { t } = useTranslation();
 
   const { audioURL, resetRecording, startRecording, stopRecording } =
@@ -42,7 +43,8 @@ export default function AudioCaptureDialog(props: AudioCaptureDialogProps) {
   const handleStartRecording = () => {
     navigator.mediaDevices
       .getUserMedia({ audio: true })
-      .then(() => {
+      .then((stream) => {
+        mediaStreamRef.current = stream;
         setStatus("RECORDING");
         startRecording();
         timer.start();
@@ -105,6 +107,13 @@ export default function AudioCaptureDialog(props: AudioCaptureDialogProps) {
     if (autoRecord && show && status === "RECORDING") {
       handleStartRecording();
     }
+
+    return () => {
+      if (mediaStreamRef.current) {
+        mediaStreamRef.current.getTracks().forEach((track) => track.stop());
+        mediaStreamRef.current = null;
+      }
+    };
   }, [autoRecord, status, show]);
 
   return (
diff --git a/src/components/Files/CameraCaptureDialog.tsx b/src/components/Files/CameraCaptureDialog.tsx
index 91b158bcb44..f81d854c559 100644
--- a/src/components/Files/CameraCaptureDialog.tsx
+++ b/src/components/Files/CameraCaptureDialog.tsx
@@ -7,7 +7,7 @@ import CareIcon from "@/CAREUI/icons/CareIcon";
 import ButtonV2, { Submit } from "@/components/Common/ButtonV2";
 import DialogModal from "@/components/Common/Dialog";
 
-import useWindowDimensions from "@/hooks/useWindowDimensions";
+import useBreakpoints from "@/hooks/useBreakpoints";
 
 import * as Notify from "@/Utils/Notifications";
 
@@ -15,38 +15,61 @@ export interface CameraCaptureDialogProps {
   show: boolean;
   onHide: () => void;
   onCapture: (file: File, fileName: string) => void;
+  onResetCapture: () => void;
 }
 
 export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
-  const { show, onHide, onCapture } = props;
+  const { show, onHide, onCapture, onResetCapture } = props;
+  const isLaptopScreen = useBreakpoints({ lg: true, default: false });
 
-  const [cameraFacingFront, setCameraFacingFront] = useState(true);
+  const [cameraFacingMode, setCameraFacingMode] = useState(
+    isLaptopScreen ? "user" : "environment",
+  );
   const [previewImage, setPreviewImage] = useState(null);
   const webRef = useRef<any>(null);
 
   const videoConstraints = {
     width: { ideal: 4096 },
     height: { ideal: 2160 },
-    facingMode: "user",
+    facingMode: cameraFacingMode,
   };
   useEffect(() => {
     if (!show) return;
-    navigator.mediaDevices.getUserMedia({ video: true }).catch(() => {
-      Notify.Warn({
-        msg: t("camera_permission_denied"),
+    let stream: MediaStream | null = null;
+
+    navigator.mediaDevices
+      .getUserMedia({ video: { facingMode: cameraFacingMode } })
+      .then((mediaStream) => {
+        stream = mediaStream;
+      })
+      .catch(() => {
+        Notify.Warn({
+          msg: t("camera_permission_denied"),
+        });
+        onHide();
       });
-      onHide();
-    });
-  }, [show]);
-  const handleSwitchCamera = useCallback(() => {
-    const supportedConstraints =
-      navigator.mediaDevices.getSupportedConstraints();
-    if (
-      !isLaptopScreen &&
-      typeof supportedConstraints.facingMode === "string" &&
-      (supportedConstraints.facingMode as string).includes("environment")
-    ) {
-      setCameraFacingFront((prevState) => !prevState);
+
+    return () => {
+      if (stream) {
+        stream.getTracks().forEach((track) => {
+          track.stop();
+        });
+      }
+    };
+  }, [show, cameraFacingMode, onHide]);
+
+  const handleSwitchCamera = useCallback(async () => {
+    const devices = await navigator.mediaDevices.enumerateDevices();
+    const videoInputs = devices.filter(
+      (device) => device.kind === "videoinput",
+    );
+    const backCamera = videoInputs.some((device) =>
+      device.label.toLowerCase().includes("back"),
+    );
+    if (!isLaptopScreen && backCamera) {
+      setCameraFacingMode((prevMode) =>
+        prevMode === "environment" ? "user" : "environment",
+      );
     } else {
       Notify.Warn({
         msg: t("switch_camera_is_not_available"),
@@ -54,10 +77,6 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
     }
   }, []);
 
-  const { width } = useWindowDimensions();
-  const LaptopScreenBreakpoint = 640;
-  const isLaptopScreen = width >= LaptopScreenBreakpoint ? true : false;
-
   const captureImage = () => {
     setPreviewImage(webRef.current.getScreenshot());
     const canvas = webRef.current.getCanvas();
@@ -70,10 +89,6 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
     });
   };
 
-  const cameraFacingMode = cameraFacingFront
-    ? "user"
-    : { exact: "environment" };
-
   return (
     <DialogModal
       show={show}
@@ -146,6 +161,7 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
                 <ButtonV2
                   onClick={() => {
                     setPreviewImage(null);
+                    onResetCapture();
                   }}
                   className="m-2"
                 >
@@ -169,6 +185,7 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
             variant="secondary"
             onClick={() => {
               setPreviewImage(null);
+              onResetCapture();
               onHide();
             }}
             className="m-2"
@@ -207,6 +224,7 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
                   <ButtonV2
                     onClick={() => {
                       setPreviewImage(null);
+                      onResetCapture();
                     }}
                   >
                     {t("retake")}
@@ -228,6 +246,7 @@ export default function CameraCaptureDialog(props: CameraCaptureDialogProps) {
             variant="secondary"
             onClick={() => {
               setPreviewImage(null);
+              onResetCapture();
               onHide();
             }}
           >
diff --git a/src/components/Patient/InsuranceDetails.tsx b/src/components/Patient/InsuranceDetails.tsx
index 248c7304bfa..3efe7866316 100644
--- a/src/components/Patient/InsuranceDetails.tsx
+++ b/src/components/Patient/InsuranceDetails.tsx
@@ -1,7 +1,7 @@
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
 import { HCXPolicyModel } from "@/components/HCX/models";
-import { InsuranceDetialsCard } from "@/components/Patient/InsuranceDetailsCard";
+import { InsuranceDetailsCard } from "@/components/Patient/InsuranceDetailsCard";
 
 import routes from "@/Utils/request/api";
 import useQuery from "@/Utils/request/useQuery";
@@ -53,7 +53,7 @@ export const InsuranceDetails = (props: IProps) => {
           data-testid="patient-details"
         >
           {insuranceDetials?.results.map((data: HCXPolicyModel) => (
-            <InsuranceDetialsCard data={data} />
+            <InsuranceDetailsCard data={data} />
           ))}
         </section>
       )}
diff --git a/src/components/Patient/InsuranceDetailsCard.tsx b/src/components/Patient/InsuranceDetailsCard.tsx
index 62098fc6a07..6685e7a99a2 100644
--- a/src/components/Patient/InsuranceDetailsCard.tsx
+++ b/src/components/Patient/InsuranceDetailsCard.tsx
@@ -1,79 +1,53 @@
-import { navigate } from "raviger";
+import { useTranslation } from "react-i18next";
 
-import ButtonV2 from "@/components/Common/ButtonV2";
 import { HCXPolicyModel } from "@/components/HCX/models";
 
 interface InsuranceDetails {
-  data?: HCXPolicyModel;
-  showViewAllDetails?: boolean;
+  data: HCXPolicyModel;
 }
 
-export const InsuranceDetialsCard = (props: InsuranceDetails) => {
-  const { data, showViewAllDetails } = props;
+export const InsuranceDetailsCard = (props: InsuranceDetails) => {
+  const { data } = props;
+
+  const { t } = useTranslation();
 
   return (
     <div className="w-full">
-      <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-        <div className="border-b border-dashed pb-2 text-xl font-bold text-secondary-900">
-          Policy Details
-        </div>
-        {data ? (
-          <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 md:grid-cols-2">
-            <div className=" ">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Member ID
-              </div>
-              <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                {data.subscriber_id || ""}
-              </div>
+      <div className="h-full space-y-2 pr-5">
+        <div className="grid grid-cols-1 gap-2 rounded-md border border-secondary-400 bg-gray-50 p-5 sm:grid-cols-2 md:grid-cols-2">
+          <div className=" ">
+            <div className="text-sm font-semibold leading-5 text-zinc-400">
+              {t("insurance__member_id")}
             </div>
-            <div className=" ">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Policy ID / Policy Name
-              </div>
-              <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                {data.policy_id || ""}
-              </div>
+            <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+              {data.subscriber_id || ""}
             </div>
-            <div className="sm:col-span-1">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Insurer ID
-              </div>
-              <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                {data.insurer_id || ""}
-              </div>
+          </div>
+          <div className=" ">
+            <div className="text-sm font-semibold leading-5 text-zinc-400">
+              {t("insurance__policy_name")}
             </div>
-            <div className="sm:col-span-1">
-              <div className="text-sm font-semibold leading-5 text-zinc-400">
-                Insurer Name
-              </div>
-              <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                {data.insurer_name || ""}
-              </div>
+            <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+              {data.policy_id || ""}
             </div>
-            {showViewAllDetails && (
-              <div className="first-letter: sm:col-span-2 md:ml-auto md:mt-10">
-                <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                  <ButtonV2
-                    id="insurance-view-details"
-                    onClick={() => {
-                      navigate(
-                        `/facility/${data.patient_object?.facility_object?.id}/patient/${data.patient_object?.id}/insurance`,
-                      );
-                    }}
-                    className="h-auto whitespace-pre-wrap border border-secondary-500 bg-white text-black hover:bg-secondary-300"
-                  >
-                    View All Details
-                  </ButtonV2>
-                </div>
-              </div>
-            )}
           </div>
-        ) : (
-          <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
-            No Insurance Details Available
+          <div className="sm:col-span-1">
+            <div className="text-sm font-semibold leading-5 text-zinc-400">
+              {t("insurance__insurer_id")}
+            </div>
+            <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+              {data.insurer_id || ""}
+            </div>
           </div>
-        )}
+          <div className="sm:col-span-1">
+            <div className="text-sm font-semibold leading-5 text-zinc-400">
+              {t("insurance__insurer_name")}
+            </div>
+            <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+              {data.insurer_name || ""}
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   );
diff --git a/src/components/Patient/PatientDetailsTab/Demography.tsx b/src/components/Patient/PatientDetailsTab/Demography.tsx
new file mode 100644
index 00000000000..7ac854b8ee6
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/Demography.tsx
@@ -0,0 +1,454 @@
+import dayjs from "dayjs";
+import { navigate } from "raviger";
+import { Fragment, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import Chip from "@/CAREUI/display/Chip";
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import ButtonV2 from "@/components/Common/ButtonV2";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import { GENDER_TYPES } from "@/common/constants";
+
+import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
+import routes from "@/Utils/request/api";
+import useQuery from "@/Utils/request/useQuery";
+import { formatName, formatPatientAge } from "@/Utils/utils";
+
+import { PatientProps } from ".";
+import * as Notification from "../../../Utils/Notifications";
+import { InsuranceDetailsCard } from "../InsuranceDetailsCard";
+import { parseOccupation } from "../PatientHome";
+import { AssignedToObjectModel } from "../models";
+
+export const Demography = (props: PatientProps) => {
+  const { patientData, facilityId, id } = props;
+  const authUser = useAuthUser();
+  const { t } = useTranslation();
+  const [_assignedVolunteerObject, setAssignedVolunteerObject] =
+    useState<AssignedToObjectModel>();
+
+  const [activeSection, setActiveSection] = useState<string | null>(null);
+
+  useEffect(() => {
+    setAssignedVolunteerObject(patientData.assigned_to_object);
+
+    const observedSections: Element[] = [];
+    const sections = document.querySelectorAll("div[id]");
+    const observer = new IntersectionObserver(
+      (entries) => {
+        entries.forEach((entry) => {
+          if (entry.isIntersecting) {
+            setActiveSection(entry.target.id);
+          }
+        });
+      },
+      {
+        threshold: 0.6,
+      },
+    );
+
+    sections.forEach((section) => {
+      observer.observe(section);
+      observedSections.push(section);
+    });
+
+    return () => {
+      observedSections.forEach((section) => observer.unobserve(section));
+    };
+  }, [patientData.assigned_to_object]);
+
+  const { data: insuranceDetials } = useQuery(routes.hcx.policies.list, {
+    query: {
+      patient: id,
+    },
+  });
+
+  const patientGender = GENDER_TYPES.find(
+    (i) => i.id === patientData.gender,
+  )?.text;
+
+  const scrollToSection = (sectionId: string) => {
+    const section = document.getElementById(sectionId);
+    if (section) {
+      section.scrollIntoView({ behavior: "smooth" });
+    }
+  };
+
+  const handleEditClick = (sectionId: string) => {
+    navigate(
+      `/facility/${facilityId}/patient/${id}/update?section=${sectionId}`,
+    );
+  };
+
+  const hasEditPermission = () => {
+    const showAllFacilityUsers = ["DistrictAdmin", "StateAdmin"];
+    if (
+      !showAllFacilityUsers.includes(authUser.user_type) &&
+      authUser.home_facility_object?.id !== patientData.facility
+    ) {
+      Notification.Error({
+        msg: "Oops! Non-Home facility users don't have permission to perform this action.",
+      });
+      return false;
+    }
+    return true;
+  };
+
+  const EmergencyContact = (props: { number?: string; name?: string }) => (
+    <div className="sm:col-span-2">
+      <div className="mr-6 flex flex-col items-start justify-between rounded-md border border-orange-300 bg-orange-50 p-4 sm:flex-row">
+        {/* Emergency Contact Section */}
+        <div className="flex-1">
+          <div className="text-sm font-normal leading-5 text-gray-600">
+            {t("emergency_contact")}
+          </div>
+
+          <div className="mt-1 text-sm leading-5 text-secondary-900">
+            <div>
+              <a
+                href={`tel:${props.number}`}
+                className="text-sm font-medium text-black hover:text-secondary-500"
+              >
+                {props.number || "-"}
+              </a>
+            </div>
+            {props.number && (
+              <div>
+                <a
+                  href={`https://wa.me/${props.number?.replace(/\D+/g, "")}`}
+                  target="_blank"
+                  className="text-sm font-normal text-sky-600 hover:text-sky-300"
+                  rel="noreferrer"
+                >
+                  <CareIcon icon="l-whatsapp" /> {t("chat_on_whatsapp")}
+                </a>
+              </div>
+            )}
+          </div>
+        </div>
+
+        <div className="ml-0 mt-4 flex-1 sm:ml-4 sm:mt-0">
+          <div className="text-sm font-normal leading-5 text-gray-600">
+            {t("emergency_contact_person_name")}
+          </div>
+          <div className="mt-1 text-sm font-semibold leading-5 text-gray-900">
+            {props.name || "-"}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+
+  const withPermissionCheck = (action: () => void) => () => {
+    if (!hasEditPermission()) {
+      Notification.Error({
+        msg: t("permission_denied"),
+      });
+      return;
+    }
+    action();
+  };
+
+  type Data = {
+    id: string;
+    hidden?: boolean;
+    allowEdit?: boolean;
+    details: (React.ReactNode | { label: string; value: React.ReactNode })[];
+  };
+
+  const data: Data[] = [
+    {
+      id: "general-info",
+      allowEdit: true,
+      details: [
+        { label: t("full_name"), value: patientData.name },
+        {
+          label: t("phone_number"),
+          value: (
+            <div>
+              <a
+                href={`tel:${patientData.phone_number}`}
+                className="text-sm font-medium text-black hover:text-secondary-500"
+              >
+                {patientData.phone_number || "-"}
+              </a>
+              <br />
+              <a
+                href={`https://wa.me/${patientData.phone_number?.replace(/\D+/g, "")}`}
+                target="_blank"
+                className="text-sm font-normal text-sky-600 hover:text-sky-300"
+                rel="noreferrer"
+              >
+                <CareIcon icon="l-whatsapp" /> Chat on WhatsApp
+              </a>
+            </div>
+          ),
+        },
+        {
+          label: t("date_of_birth"),
+          value: (
+            <>
+              {dayjs(patientData.date_of_birth).format("DD MMM YYYY")} (
+              {formatPatientAge(patientData, true)})
+            </>
+          ),
+        },
+        {
+          label: t("sex"),
+          value: patientGender,
+        },
+        <EmergencyContact
+          number={patientData.emergency_phone_number}
+          name={patientData.name}
+        />,
+        {
+          label: t("current_address"),
+          value: patientData.address,
+        },
+        {
+          label: t("permanent_address"),
+          value: patientData.permanent_address,
+        },
+        {
+          label: t("nationality"),
+          value: patientData.nationality,
+        },
+        {
+          label: t("state"),
+          value: patientData.state,
+        },
+        {
+          label: t("district"),
+          value: patientData.district_object?.name,
+        },
+        {
+          label: t("local_body"),
+          value: patientData.local_body_object?.name,
+        },
+        {
+          label: t("ward"),
+          value: (
+            <>
+              {(patientData.ward_object &&
+                patientData.ward_object.number +
+                  ", " +
+                  patientData.ward_object.name) ||
+                "-"}
+            </>
+          ),
+        },
+        {
+          label: t("village"),
+          value: patientData.village,
+        },
+      ],
+    },
+    {
+      id: "social-profile",
+      allowEdit: true,
+      details: [
+        {
+          label: t("occupation"),
+          value: parseOccupation(patientData.meta_info?.occupation),
+        },
+        {
+          label: t("ration_card_category"),
+          value:
+            !!patientData.ration_card_category &&
+            t(`ration_card__${patientData.ration_card_category}`),
+        },
+        {
+          label: t("socioeconomic_status"),
+          value:
+            patientData.meta_info?.socioeconomic_status &&
+            t(
+              `SOCIOECONOMIC_STATUS__${patientData.meta_info?.socioeconomic_status}`,
+            ),
+        },
+        {
+          label: t("domestic_healthcare_support"),
+          value:
+            patientData.meta_info?.domestic_healthcare_support &&
+            t(
+              `DOMESTIC_HEALTHCARE_SUPPORT__${patientData.meta_info?.domestic_healthcare_support}`,
+            ),
+        },
+      ],
+    },
+    {
+      id: "volunteer-contact",
+      hidden: !patientData.assigned_to_object,
+      details: [
+        <EmergencyContact
+          number={patientData.assigned_to_object?.alt_phone_number}
+          name={
+            patientData.assigned_to_object
+              ? formatName(patientData.assigned_to_object)
+              : undefined
+          }
+        />,
+      ],
+    },
+    {
+      id: "insurance-details",
+      details: [
+        <div className="w-full md:col-span-2">
+          {insuranceDetials?.results.map((insurance) => (
+            <InsuranceDetailsCard key={insurance.id} data={insurance} />
+          ))}
+          {!!insuranceDetials?.results &&
+            insuranceDetials.results.length === 0 && (
+              <div className="text-gray-500 text-sm flex items-center justify-center py-10">
+                {t("no_data_found")}
+              </div>
+            )}
+          <ButtonV2
+            border
+            className="mt-4"
+            ghost
+            disabled={!patientData.is_active}
+            onClick={withPermissionCheck(() =>
+              handleEditClick("insurance-details"),
+            )}
+          >
+            <CareIcon icon="l-plus" className="" />
+            {t("add_insurance_details")}
+          </ButtonV2>
+        </div>,
+      ],
+    },
+  ];
+
+  return (
+    <div>
+      <section
+        className="mt-8 w-full items-start gap-6 px-3 md:px-0 lg:flex 2xl:gap-8"
+        data-testid="patient-details"
+      >
+        <div className="sticky top-20 hidden text-sm font-medium text-gray-600 lg:flex lg:basis-1/5 lg:flex-col gap-2">
+          {data
+            .filter((s) => !s.hidden)
+            .map((subtab, i) => (
+              <button
+                key={i}
+                className={`cursor-pointer rounded-lg p-3 transition-colors duration-300 text-left ${
+                  activeSection === subtab.id
+                    ? "bg-white text-green-800"
+                    : "hover:bg-white hover:text-green-800"
+                }`}
+                onClick={() => scrollToSection(subtab.id)}
+              >
+                {t(`patient__${subtab.id}`)}
+              </button>
+            ))}
+        </div>
+
+        <div className="lg:basis-4/5">
+          <div className="mb-2 flex flex-row justify-between">
+            <div className="w-1/2">
+              <div className="text-sm font-normal leading-5 text-secondary-700">
+                {t("patient_status")}
+              </div>
+              <div className="mt-1 text-xl font-semibold leading-5 text-secondary-900">
+                <Chip
+                  size="medium"
+                  variant="custom"
+                  className={
+                    patientData.is_active
+                      ? "bg-blue-100 text-blue-800"
+                      : "bg-red-100 text-red-800"
+                  }
+                  text={patientData.is_active ? "LIVE" : "DISCHARGED"}
+                />
+              </div>
+            </div>
+            <div>
+              <ButtonV2
+                id="update-patient-details"
+                variant="secondary"
+                className="mt-4  text-green-800 "
+                disabled={!patientData.is_active}
+                authorizeFor={NonReadOnlyUsers}
+                onClick={withPermissionCheck(() =>
+                  navigate(
+                    `/facility/${patientData?.facility}/patient/${id}/update`,
+                  ),
+                )}
+              >
+                <CareIcon icon="l-edit-alt" className="text-lg" />
+                {t("edit_profile")}
+              </ButtonV2>
+            </div>
+          </div>
+          {/* <div className="mt-4 rounded-md border border-blue-400 bg-blue-50 p-5 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-2">
+            {[
+              { label: t("abha_number"), value: "-" },
+              { label: t("abha_address"), value: "-" },
+            ].map((info, i) => (
+              <div className="sm:col-span-1" key={i}>
+                <p className="text-normal text-sm text-gray-600 sm:col-span-1">
+                  {info.label}:
+                </p>
+                <p className="text-sm font-semibold text-gray-900">
+                  {info.value}
+                </p>
+              </div>
+            ))}
+          </div> */}
+          <div className="flex h-full flex-col gap-y-4">
+            {data
+              .filter((s) => !s.hidden)
+              .map((subtab, i) => (
+                <div
+                  key={i}
+                  id={subtab.id}
+                  className="group mt-4 rounded-md bg-white pb-2 pl-5 pt-5 shadow"
+                >
+                  <hr className="mb-1 mr-5 h-1 w-5 border-0 bg-blue-500" />
+                  <div className="flex flex-row gap-x-4 mb-4">
+                    <h1 className="text-xl">{t(`patient__${subtab.id}`)}</h1>
+                    {subtab.allowEdit && (
+                      <button
+                        className="flex rounded border border-secondary-400 bg-white px-2 py-1 text-sm font-semibold text-green-800 hover:bg-secondary-200"
+                        disabled={!patientData.is_active}
+                        onClick={withPermissionCheck(() =>
+                          handleEditClick(subtab.id),
+                        )}
+                      >
+                        <CareIcon
+                          icon="l-edit-alt"
+                          className="text-md mr-1 mt-1"
+                        />
+                        {t("edit")}
+                      </button>
+                    )}
+                  </div>
+                  <div className="mb-8 mt-2 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-2">
+                    {subtab.details.map((detail, j) =>
+                      detail &&
+                      typeof detail === "object" &&
+                      "label" in detail ? (
+                        <div className="sm:col-span-1" key={j}>
+                          <div className="text-sm font-normal leading-5 text-gray-500">
+                            {detail.label}
+                          </div>
+                          <div className="mt-1 text-sm font-semibold leading-5 text-gray-900">
+                            {detail.value || "-"}
+                          </div>
+                        </div>
+                      ) : (
+                        <Fragment key={j}>{detail}</Fragment>
+                      ),
+                    )}
+                  </div>
+                </div>
+              ))}
+          </div>
+        </div>
+      </section>
+    </div>
+  );
+};
diff --git a/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx b/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx
new file mode 100644
index 00000000000..71865483800
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/EncounterHistory.tsx
@@ -0,0 +1,90 @@
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import PaginatedList from "@/CAREUI/misc/PaginatedList";
+
+import CircularProgress from "@/components/Common/CircularProgress";
+import Loading from "@/components/Common/Loading";
+import { ConsultationCard } from "@/components/Facility/ConsultationCard";
+import { ConsultationModel } from "@/components/Facility/models";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import { triggerGoal } from "@/Integrations/Plausible";
+import routes from "@/Utils/request/api";
+import useQuery from "@/Utils/request/useQuery";
+
+import { PatientProps } from ".";
+import { PatientModel } from "../models";
+
+const EncounterHistory = (props: PatientProps) => {
+  const { patientData: initialPatientData, facilityId, id } = props;
+  const [patientData, setPatientData] =
+    useState<PatientModel>(initialPatientData);
+  const authUser = useAuthUser();
+
+  useEffect(() => {
+    setPatientData(initialPatientData);
+  }, [initialPatientData]);
+
+  const { t } = useTranslation();
+
+  const { loading: isLoading, refetch } = useQuery(routes.getPatient, {
+    pathParams: {
+      id,
+    },
+    onResponse: ({ res, data }) => {
+      if (res?.ok && data) {
+        setPatientData(data);
+      }
+      triggerGoal("Patient Profile Viewed", {
+        facilityId: facilityId,
+        userId: authUser.id,
+      });
+    },
+  });
+
+  if (isLoading) {
+    return <Loading />;
+  }
+
+  return (
+    <PaginatedList
+      route={routes.getConsultationList}
+      query={{ patient: id }}
+      perPage={5}
+    >
+      {(_) => (
+        <div className="mt-8">
+          <PaginatedList.WhenLoading>
+            <CircularProgress />
+          </PaginatedList.WhenLoading>
+          <PaginatedList.WhenEmpty className="py-2">
+            <div className="h-full space-y-2 rounded-lg bg-white p-7 border border-secondary-300">
+              <div className="flex w-full items-center justify-center text-xl text-secondary-600">
+                {t("no_consultation_history")}
+              </div>
+            </div>
+          </PaginatedList.WhenEmpty>
+          <PaginatedList.Items<ConsultationModel>>
+            {(item) => (
+              <ConsultationCard
+                itemData={item}
+                isLastConsultation={
+                  !!patientData.last_consultation &&
+                  item.id === patientData.last_consultation.id
+                }
+                refetch={refetch}
+              />
+            )}
+          </PaginatedList.Items>
+          <div className="flex w-full items-center justify-center">
+            <PaginatedList.Paginator hideIfSinglePage />
+          </div>
+        </div>
+      )}
+    </PaginatedList>
+  );
+};
+
+export default EncounterHistory;
diff --git a/src/components/Patient/PatientDetailsTab/HealthProfileSummary.tsx b/src/components/Patient/PatientDetailsTab/HealthProfileSummary.tsx
new file mode 100644
index 00000000000..3fb6b60d330
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/HealthProfileSummary.tsx
@@ -0,0 +1,135 @@
+import { navigate } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import { UserModel } from "@/components/Users/models";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import { ADMIN_USER_TYPES } from "@/common/constants";
+
+import { PatientProps } from ".";
+import * as Notification from "../../../Utils/Notifications";
+import { PatientModel } from "../models";
+
+export const HealthProfileSummary = (props: PatientProps) => {
+  const { patientData, facilityId, id } = props;
+
+  const authUser = useAuthUser();
+  const { t } = useTranslation();
+
+  const handleEditClick = (sectionId: string) => {
+    navigate(
+      `/facility/${facilityId}/patient/${id}/update?section=${sectionId}`,
+    );
+  };
+
+  let patientMedHis: JSX.Element[] = [];
+
+  if (patientData?.medical_history?.length) {
+    const medHis = patientData.medical_history;
+    patientMedHis = medHis
+      .filter((item) => item.disease !== "NO")
+      .map((item, idx) => (
+        <div className="sm:col-span-1" key={`med_his_${idx}`}>
+          <div className="break-words text-sm font-semibold leading-5 text-zinc-400">
+            {item.disease}
+          </div>
+          <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+            {item.details}
+          </div>
+        </div>
+      ));
+  }
+
+  const canEditPatient = (authUser: UserModel, patientData: PatientModel) => {
+    return (
+      ADMIN_USER_TYPES.includes(
+        authUser.user_type as (typeof ADMIN_USER_TYPES)[number],
+      ) || authUser.home_facility_object?.id === patientData.facility
+    );
+  };
+
+  return (
+    <div className="mt-4 px-4 md:px-0" data-test-id="patient-health-profile">
+      <div className="group my-2 w-full rounded bg-white p-4 shadow">
+        <hr className="mb-1 mr-5 h-1 w-5 border-0 bg-blue-500" />
+        <div className="h-full space-y-2">
+          <div className="flex flex-row">
+            <div className="mr-4 text-xl font-bold text-secondary-900">
+              {t("medical")}
+            </div>
+            <button
+              className="flex rounded border border-secondary-400 bg-white px-1 py-1 text-sm font-semibold text-green-800 hover:bg-secondary-200"
+              disabled={!patientData.is_active}
+              aria-label="Edit medical history"
+              onClick={() => {
+                if (!canEditPatient(authUser, patientData)) {
+                  Notification.Error({
+                    msg: t("permission_denied"),
+                  });
+                } else {
+                  handleEditClick("medical-history");
+                }
+              }}
+            >
+              <CareIcon icon="l-edit-alt" className="text-md mr-1 mt-1" />
+              {t("edit")}
+            </button>
+          </div>
+
+          <div className="mt-2 grid grid-cols-1 gap-x-4 gap-y-2 sm:grid-cols-2 md:gap-y-8">
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("present_health")}
+              </div>
+              <div
+                data-testid="patient-present-health"
+                className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
+              >
+                {patientData.present_health || "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("ongoing_medications")}
+              </div>
+              <div
+                data-testid="patient-ongoing-medication"
+                className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
+              >
+                {patientData.ongoing_medication || "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("allergies")}
+              </div>
+              <div
+                data-testid="patient-allergies"
+                className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
+              >
+                {patientData.allergies || "-"}
+              </div>
+            </div>
+
+            {patientData.gender === 2 && patientData.is_antenatal && (
+              <div className="sm:col-span-1">
+                <div className="text-sm font-semibold leading-5 text-zinc-400">
+                  {t("is_pregnant")}
+                </div>
+                <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+                  {t("yes")}
+                </div>
+              </div>
+            )}
+            {patientMedHis}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/src/components/Patient/PatientDetailsTab/ImmunisationRecords.tsx b/src/components/Patient/PatientDetailsTab/ImmunisationRecords.tsx
new file mode 100644
index 00000000000..eb298737f3c
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/ImmunisationRecords.tsx
@@ -0,0 +1,124 @@
+import { navigate } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import { UserModel } from "@/components/Users/models";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import { ADMIN_USER_TYPES } from "@/common/constants";
+
+import { formatDateTime } from "@/Utils/utils";
+
+import { PatientProps } from ".";
+import * as Notification from "../../../Utils/Notifications";
+import { PatientModel } from "../models";
+
+export const ImmunisationRecords = (props: PatientProps) => {
+  const { patientData, facilityId, id } = props;
+
+  const authUser = useAuthUser();
+  const { t } = useTranslation();
+
+  const handleEditClick = (sectionId: string) => {
+    navigate(
+      `/facility/${facilityId}/patient/${id}/update?section=${sectionId}`,
+    );
+  };
+
+  const canEditPatient = (authUser: UserModel, patientData: PatientModel) => {
+    return (
+      ADMIN_USER_TYPES.includes(
+        authUser.user_type as (typeof ADMIN_USER_TYPES)[number],
+      ) || authUser.home_facility_object?.id === patientData.facility
+    );
+  };
+
+  return (
+    <div className="mt-4 px-4 md:px-0">
+      <div className="w-full rounded-md bg-white p-4 shadow-md">
+        <hr className="mb-1 mr-5 h-1 w-5 border-0 bg-blue-500" />
+        <div>
+          <div className="flex flex-row gap-x-4">
+            <h1 className="text-xl">{t("covid_details")}</h1>
+            <button
+              className="hidden rounded border border-secondary-400 bg-white px-1 py-1 text-sm font-semibold text-green-800 hover:bg-secondary-200 group-hover:flex"
+              disabled={!patientData.is_active}
+              onClick={() => {
+                if (!canEditPatient(authUser, patientData)) {
+                  Notification.Error({
+                    msg: t("permission_denied"),
+                  });
+                } else {
+                  handleEditClick("covid-details");
+                }
+              }}
+            >
+              <CareIcon icon="l-edit-alt" className="text-md mr-1 mt-1" />
+              {t("edit")}
+            </button>
+          </div>
+
+          <div className="mb-8 mt-2 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-2">
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("number_of_covid_vaccine_doses")}
+              </div>
+              <div className="mt-1 text-sm font-medium leading-5">
+                {patientData.is_vaccinated && patientData.number_of_doses
+                  ? patientData.number_of_doses
+                  : "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("vaccine_name")}
+              </div>
+              <div className="mt-1 text-sm font-medium leading-5">
+                {patientData.is_vaccinated && patientData.vaccine_name
+                  ? patientData.vaccine_name
+                  : "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("last_vaccinated_on")}
+              </div>
+              <div className="mt-1 text-sm font-medium leading-5">
+                {patientData.is_vaccinated && patientData.last_vaccinated_date
+                  ? formatDateTime(patientData.last_vaccinated_date)
+                  : "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("countries_travelled")}
+              </div>
+              <div className="mt-1 text-sm font-medium leading-5">
+                {patientData.countries_travelled &&
+                patientData.countries_travelled.length > 0
+                  ? patientData.countries_travelled.join(", ")
+                  : "-"}
+              </div>
+            </div>
+
+            <div className="sm:col-span-1">
+              <div className="text-sm font-semibold leading-5 text-zinc-400">
+                {t("date_of_return")}
+              </div>
+              <div className="mt-1 text-sm font-medium leading-5">
+                {patientData.date_of_return
+                  ? formatDateTime(patientData.date_of_return)
+                  : "-"}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/src/components/Patient/PatientDetailsTab/Notes.tsx b/src/components/Patient/PatientDetailsTab/Notes.tsx
new file mode 100644
index 00000000000..646e97d3bd5
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/Notes.tsx
@@ -0,0 +1,184 @@
+import { t } from "i18next";
+import { useEffect, useState } from "react";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import ButtonV2 from "@/components/Common/ButtonV2";
+import DoctorNoteReplyPreviewCard from "@/components/Facility/DoctorNoteReplyPreviewCard";
+import PatientNotesList from "@/components/Facility/PatientNotesList";
+import {
+  PatientNoteStateType,
+  PatientNotesModel,
+} from "@/components/Facility/models";
+import AutoExpandingTextInputFormField from "@/components/Form/FormFields/AutoExpandingTextInputFormField";
+
+import useAuthUser from "@/hooks/useAuthUser";
+import { useMessageListener } from "@/hooks/useMessageListener";
+
+import { PATIENT_NOTES_THREADS } from "@/common/constants";
+
+import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
+import routes from "@/Utils/request/api";
+import request from "@/Utils/request/request";
+import { classNames, keysOf } from "@/Utils/utils";
+
+import * as Notification from "../../../Utils/Notifications";
+
+interface PatientNotesProps {
+  id: string;
+  facilityId: string;
+}
+
+const PatientNotes = (props: PatientNotesProps) => {
+  const { id: patientId, facilityId } = props;
+
+  const authUser = useAuthUser();
+  const [thread, setThread] = useState(
+    authUser.user_type === "Nurse"
+      ? PATIENT_NOTES_THREADS.Nurses
+      : PATIENT_NOTES_THREADS.Doctors,
+  );
+
+  const [patientActive, setPatientActive] = useState(true);
+  const [noteField, setNoteField] = useState("");
+  const [reload, setReload] = useState(false);
+  const [reply_to, setReplyTo] = useState<PatientNotesModel | undefined>(
+    undefined,
+  );
+
+  const initialData: PatientNoteStateType = {
+    notes: [],
+    cPage: 1,
+    totalPages: 1,
+  };
+  const [state, setState] = useState(initialData);
+
+  const onAddNote = async () => {
+    if (!/\S+/.test(noteField)) {
+      Notification.Error({
+        msg: "Note Should Contain At Least 1 Character",
+      });
+      return;
+    }
+
+    try {
+      const { res } = await request(routes.addPatientNote, {
+        pathParams: { patientId: patientId },
+        body: {
+          note: noteField,
+          thread,
+          reply_to: reply_to?.id,
+        },
+      });
+      if (res?.status === 201) {
+        setNoteField("");
+        setReload(!reload);
+        setState({ ...state, cPage: 1 });
+        setReplyTo(undefined);
+        Notification.Success({ msg: "Note added successfully" });
+      }
+    } catch (error) {
+      Notification.Error({
+        msg: "Failed to add note. Please try again.",
+      });
+    }
+  };
+
+  useEffect(() => {
+    async function fetchPatientName() {
+      if (patientId) {
+        try {
+          const { data } = await request(routes.getPatient, {
+            pathParams: { id: patientId },
+          });
+          if (data) {
+            setPatientActive(data.is_active ?? true);
+          }
+        } catch (error) {
+          Notification.Error({
+            msg: "Failed to fetch patient status",
+          });
+        }
+      }
+    }
+    fetchPatientName();
+  }, [patientId]);
+
+  useMessageListener((data) => {
+    const message = data?.message;
+    if (
+      (message?.from == "patient/doctor_notes/create" ||
+        message?.from == "patient/doctor_notes/edit") &&
+      message?.facility_id == facilityId &&
+      message?.patient_id == patientId
+    ) {
+      setReload(true);
+    }
+  });
+
+  return (
+    <div className="flex h-screen flex-col">
+      <div className="relative mx-3 my-2 flex grow flex-col rounded-lg border border-secondary-300 bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
+        <div className="absolute inset-x-0 top-0 z-10 flex bg-secondary-200 text-sm shadow-md">
+          {keysOf(PATIENT_NOTES_THREADS).map((current) => (
+            <button
+              id={`patient-note-tab-${current}`}
+              key={current}
+              className={classNames(
+                "flex flex-1 justify-center border-b-2 py-2",
+                thread === PATIENT_NOTES_THREADS[current]
+                  ? "border-primary-500 font-bold text-secondary-800"
+                  : "border-secondary-300 text-secondary-800",
+              )}
+              onClick={() => setThread(PATIENT_NOTES_THREADS[current])}
+            >
+              {t(`patient_notes_thread__${current}`)}
+            </button>
+          ))}
+        </div>
+        <PatientNotesList
+          state={state}
+          setState={setState}
+          patientId={patientId}
+          facilityId={facilityId}
+          reload={reload}
+          setReload={setReload}
+          thread={thread}
+          setReplyTo={setReplyTo}
+        />
+        <DoctorNoteReplyPreviewCard
+          parentNote={reply_to}
+          cancelReply={() => setReplyTo(undefined)}
+        >
+          <div className="relative mx-4 flex items-center">
+            <AutoExpandingTextInputFormField
+              maxHeight={160}
+              rows={2}
+              name="note"
+              value={noteField}
+              onChange={(e) => setNoteField(e.value)}
+              className="w-full grow"
+              errorClassName="hidden"
+              innerClassName="pr-10"
+              placeholder={t("notes_placeholder")}
+              disabled={!patientActive}
+            />
+            <ButtonV2
+              onClick={onAddNote}
+              border={false}
+              className="absolute right-2"
+              ghost
+              size="small"
+              disabled={!patientActive}
+              authorizeFor={NonReadOnlyUsers}
+            >
+              <CareIcon icon="l-message" className="text-lg" />
+            </ButtonV2>
+          </div>
+        </DoctorNoteReplyPreviewCard>
+      </div>
+    </div>
+  );
+};
+
+export default PatientNotes;
diff --git a/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx b/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx
new file mode 100644
index 00000000000..b7a907fe662
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/SampleTestHistory.tsx
@@ -0,0 +1,107 @@
+import { navigate } from "raviger";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+import PaginatedList from "@/CAREUI/misc/PaginatedList";
+
+import ButtonV2 from "@/components/Common/ButtonV2";
+import CircularProgress from "@/components/Common/CircularProgress";
+
+import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
+import routes from "@/Utils/request/api";
+
+import { PatientProps } from ".";
+import { SampleTestCard } from "../SampleTestCard";
+import { PatientModel, SampleTestModel } from "../models";
+
+export const SampleTestHistory = (props: PatientProps) => {
+  const { patientData, facilityId, id } = props;
+  const [_selectedStatus, setSelectedStatus] = useState<{
+    status: number;
+    sample: SampleTestModel | null;
+  }>({ status: 0, sample: null });
+  const [_showAlertMessage, setShowAlertMessage] = useState(false);
+
+  const isPatientInactive = (patientData: PatientModel, facilityId: string) => {
+    if (!patientData) return true;
+    return (
+      !patientData.is_active ||
+      !(
+        patientData?.last_consultation &&
+        patientData.last_consultation.facility === facilityId
+      )
+    );
+  };
+
+  const confirmApproval = (status: number, sample: SampleTestModel) => {
+    setSelectedStatus({ status, sample });
+    setShowAlertMessage(true);
+  };
+
+  const { t } = useTranslation();
+
+  return (
+    <div className="mt-4 px-3 md:px-0">
+      <div>
+        <div className="flex justify-between items-center">
+          <h2 className="my-4 ml-0 text-2xl font-semibold leading-tight">
+            {t("sample_test_history")}
+          </h2>
+          <ButtonV2
+            className="bg-green-600 px-3 py-2 font-semibold text-white hover:bg-green-500"
+            disabled={isPatientInactive(patientData, facilityId)}
+            size="default"
+            onClick={() =>
+              navigate(
+                `/facility/${patientData?.facility}/patient/${id}/sample-test`,
+              )
+            }
+            authorizeFor={NonReadOnlyUsers}
+            id="sample-request-btn"
+          >
+            <span className="flex w-full items-center justify-start gap-2">
+              <CareIcon icon="l-medkit" className="text-xl" />
+              {t("request_sample_test")}
+            </span>
+          </ButtonV2>
+        </div>
+      </div>
+
+      <PaginatedList
+        route={routes.sampleTestList}
+        pathParams={{ patientId: id }}
+        perPage={5}
+      >
+        {(_, query) => (
+          <div>
+            <PaginatedList.WhenLoading>
+              <CircularProgress />
+            </PaginatedList.WhenLoading>
+            <PaginatedList.WhenEmpty className="py-2">
+              <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
+                <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
+                  {t("no_records_found")}
+                </div>
+              </div>
+            </PaginatedList.WhenEmpty>
+            <PaginatedList.Items<SampleTestModel>>
+              {(item) => (
+                <SampleTestCard
+                  refetch={query.refetch}
+                  itemData={item}
+                  handleApproval={confirmApproval}
+                  facilityId={facilityId}
+                  patientId={id}
+                />
+              )}
+            </PaginatedList.Items>
+            <div className="flex w-full items-center justify-center">
+              <PaginatedList.Paginator hideIfSinglePage />
+            </div>
+          </div>
+        )}
+      </PaginatedList>
+    </div>
+  );
+};
diff --git a/src/components/Patient/PatientDetailsTab/ShiftingHistory.tsx b/src/components/Patient/PatientDetailsTab/ShiftingHistory.tsx
new file mode 100644
index 00000000000..b7ef154bf4d
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/ShiftingHistory.tsx
@@ -0,0 +1,73 @@
+import { navigate } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import ButtonV2 from "@/components/Common/ButtonV2";
+import { formatFilter } from "@/components/Resource/ResourceCommons";
+import ShiftingTable from "@/components/Shifting/ShiftingTable";
+
+import useFilters from "@/hooks/useFilters";
+
+import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
+import routes from "@/Utils/request/api";
+import useQuery from "@/Utils/request/useQuery";
+
+import { PatientProps } from ".";
+import { PatientModel } from "../models";
+
+const ShiftingHistory = (props: PatientProps) => {
+  const { patientData, facilityId, id } = props;
+  const { t } = useTranslation();
+  const { qParams, Pagination, resultsPerPage } = useFilters({
+    cacheBlacklist: ["patient_name"],
+  });
+
+  const isPatientInactive = (patientData: PatientModel, facilityId: string) => {
+    return (
+      !patientData.is_active ||
+      !(patientData?.last_consultation?.facility === facilityId)
+    );
+  };
+
+  const { data: shiftData, loading } = useQuery(routes.listShiftRequests, {
+    query: {
+      ...formatFilter({
+        ...qParams,
+        offset: (qParams.page ? qParams.page - 1 : 0) * resultsPerPage,
+      }),
+      patient: id,
+    },
+    prefetch: !!id,
+  });
+
+  return (
+    <section className="mt-4">
+      <div className="flex justify-between items-center">
+        <h2 className="my-4 ml-0 text-2xl font-semibold leading-tight">
+          {t("shifting_history")}
+        </h2>
+        <ButtonV2
+          className=""
+          disabled={isPatientInactive(patientData, facilityId)}
+          size="default"
+          onClick={() =>
+            navigate(`/facility/${facilityId}/patient/${id}/shift/new`)
+          }
+          authorizeFor={NonReadOnlyUsers}
+        >
+          <span className="flex w-full items-center justify-start gap-2">
+            <CareIcon icon="l-ambulance" className="text-xl" />
+            {t("shift")}
+          </span>
+        </ButtonV2>
+      </div>
+      <ShiftingTable hidePatient data={shiftData?.results} loading={loading} />
+      <div>
+        <Pagination totalCount={shiftData?.count || 0} />
+      </div>{" "}
+    </section>
+  );
+};
+
+export default ShiftingHistory;
diff --git a/src/components/Patient/PatientDetailsTab/index.tsx b/src/components/Patient/PatientDetailsTab/index.tsx
new file mode 100644
index 00000000000..effc9b667f8
--- /dev/null
+++ b/src/components/Patient/PatientDetailsTab/index.tsx
@@ -0,0 +1,45 @@
+import { PatientModel } from "../models";
+import { Demography } from "./Demography";
+import EncounterHistory from "./EncounterHistory";
+import { HealthProfileSummary } from "./HealthProfileSummary";
+import { ImmunisationRecords } from "./ImmunisationRecords";
+import PatientNotes from "./Notes";
+import { SampleTestHistory } from "./SampleTestHistory";
+import ShiftingHistory from "./ShiftingHistory";
+
+export interface PatientProps {
+  facilityId: string;
+  id: string;
+  patientData: PatientModel;
+}
+
+export const patientTabs = [
+  {
+    route: "demography",
+    component: Demography,
+  },
+  {
+    route: "encounters",
+    component: EncounterHistory,
+  },
+  {
+    route: "health-profile",
+    component: HealthProfileSummary,
+  },
+  {
+    route: "immunisation-records",
+    component: ImmunisationRecords,
+  },
+  {
+    route: "shift",
+    component: ShiftingHistory,
+  },
+  {
+    route: "request-sample-test",
+    component: SampleTestHistory,
+  },
+  {
+    route: "patient-notes",
+    component: PatientNotes,
+  },
+];
diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index a7b08bdea58..d6b9844b699 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -1,26 +1,9 @@
-import { navigate } from "raviger";
+import { Link, navigate } from "raviger";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import Chip from "@/CAREUI/display/Chip";
-import CareIcon from "@/CAREUI/icons/CareIcon";
-import PaginatedList from "@/CAREUI/misc/PaginatedList";
-
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-
-import ButtonV2 from "@/components/Common/ButtonV2";
-import CircularProgress from "@/components/Common/CircularProgress";
 import ConfirmDialog from "@/components/Common/ConfirmDialog";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-import RelativeDateUserMention from "@/components/Common/RelativeDateUserMention";
 import UserAutocomplete from "@/components/Common/UserAutocompleteFormField";
-import { ConsultationCard } from "@/components/Facility/ConsultationCard";
-import { ConsultationModel, ShiftingModel } from "@/components/Facility/models";
-import { InsuranceDetialsCard } from "@/components/Patient/InsuranceDetailsCard";
-import { SampleTestCard } from "@/components/Patient/SampleTestCard";
-import { PatientModel, SampleTestModel } from "@/components/Patient/models";
 
 import useAuthUser from "@/hooks/useAuthUser";
 
@@ -31,98 +14,67 @@ import {
   SAMPLE_TEST_STATUS,
 } from "@/common/constants";
 
-import { triggerGoal } from "@/Integrations/Plausible";
-import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
-import * as Notification from "@/Utils/Notifications";
 import dayjs from "@/Utils/dayjs";
 import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import useQuery from "@/Utils/request/useQuery";
+
+import Chip from "../../CAREUI/display/Chip";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { triggerGoal } from "../../Integrations/Plausible";
+import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import * as Notification from "../../Utils/Notifications";
+import request from "../../Utils/request/request";
+import useQuery from "../../Utils/request/useQuery";
 import {
-  classNames,
-  formatDate,
   formatDateTime,
   formatName,
   formatPatientAge,
+  humanizeStrings,
   isAntenatal,
   isPostPartum,
-} from "@/Utils/utils";
+  relativeDate,
+} from "../../Utils/utils";
+import { Avatar } from "../Common/Avatar";
+import ButtonV2 from "../Common/ButtonV2";
+import Loading from "../Common/Loading";
+import Page from "../Common/Page";
+import { SkillModel, UserBareMinimum } from "../Users/models";
+import { patientTabs } from "./PatientDetailsTab";
+import { isPatientMandatoryDataFilled } from "./Utils";
+import { AssignedToObjectModel, PatientModel, SampleTestModel } from "./models";
 
 export const parseOccupation = (occupation: string | undefined) => {
   return OCCUPATION_TYPES.find((i) => i.value === occupation)?.text;
 };
 
-export const PatientHome = (props: any) => {
-  const { facilityId, id } = props;
-  const [showShifts, setShowShifts] = useState(false);
-  const [isShiftClicked, setIsShiftClicked] = useState(false);
+export const PatientHome = (props: {
+  facilityId?: string;
+  id: string;
+  page: (typeof patientTabs)[0]["route"];
+}) => {
+  const { facilityId, id, page } = props;
   const [patientData, setPatientData] = useState<PatientModel>({});
-  const [assignedVolunteerObject, setAssignedVolunteerObject] =
-    useState<any>(null);
+
   const authUser = useAuthUser();
   const { t } = useTranslation();
-  const [selectedStatus, setSelectedStatus] = useState<{
+  const [selectedStatus, _setSelectedStatus] = useState<{
     status: number;
-    sample: any;
+    sample: SampleTestModel | null;
   }>({ status: 0, sample: null });
-  const [showAlertMessage, setShowAlertMessage] = useState(false);
-  const [modalFor, setModalFor] = useState<ShiftingModel>();
-  const [openAssignVolunteerDialog, setOpenAssignVolunteerDialog] =
-    useState(false);
 
-  const initErr: any = {};
-  const errors = initErr;
+  const [assignedVolunteer, setAssignedVolunteer] = useState<
+    AssignedToObjectModel | undefined
+  >(patientData.assigned_to_object);
 
   useEffect(() => {
-    setAssignedVolunteerObject(patientData.assigned_to_object);
+    setAssignedVolunteer(patientData.assigned_to_object);
   }, [patientData.assigned_to_object]);
 
-  const handleTransferComplete = async (shift: ShiftingModel) => {
-    if (!shift) return;
-    await request(routes.completeTransfer, {
-      pathParams: { externalId: shift.external_id },
-    });
-    navigate(
-      `/facility/${shift.assigned_facility}/patient/${shift.patient}/consultation`,
-    );
-  };
-
-  const { data: insuranceDetials } = useQuery(routes.hcx.policies.list, {
-    query: {
-      patient: id,
-      limit: 1,
-    },
-  });
-
-  const handlePatientTransfer = async (value: boolean) => {
-    const dummyPatientData = Object.assign({}, patientData);
-    dummyPatientData["allow_transfer"] = value;
-
-    await request(routes.patchPatient, {
-      pathParams: {
-        id: patientData.id as string,
-      },
-
-      body: { allow_transfer: value },
-
-      onResponse: ({ res }) => {
-        if ((res || {}).status === 200) {
-          const dummyPatientData = Object.assign({}, patientData);
-          dummyPatientData["allow_transfer"] = value;
-          setPatientData(dummyPatientData);
-
-          Notification.Success({
-            msg: "Transfer status updated.",
-          });
-        }
-      },
-    });
-  };
-
-  const handleVolunteerSelect = (volunteer: any) => {
-    setAssignedVolunteerObject(volunteer.value);
-  };
+  const [showAlertMessage, setShowAlertMessage] = useState(false);
+  const [openAssignVolunteerDialog, setOpenAssignVolunteerDialog] =
+    useState(false);
 
+  const initErr: any = {};
+  const errors = initErr;
   const { loading: isLoading, refetch } = useQuery(routes.getPatient, {
     pathParams: {
       id,
@@ -144,20 +96,18 @@ export const PatientHome = (props: any) => {
         id: patientData.id as string,
       },
       body: {
-        assigned_to: assignedVolunteerObject
-          ? assignedVolunteerObject.id
-          : null,
+        assigned_to: (assignedVolunteer as UserBareMinimum)?.id || null,
       },
     });
     if (res?.ok && data) {
       setPatientData(data);
-      if (assignedVolunteerObject) {
+      if (!assignedVolunteer) {
         Notification.Success({
-          msg: "Volunteer assigned successfully.",
+          msg: t("volunteer_assigned"),
         });
       } else {
         Notification.Success({
-          msg: "Volunteer unassigned successfully.",
+          msg: t("volunteer_unassigned"),
         });
       }
       refetch();
@@ -166,34 +116,41 @@ export const PatientHome = (props: any) => {
     if (errors["assignedVolunteer"]) delete errors["assignedVolunteer"];
   };
 
-  const { loading: isShiftDataLoading, data: activeShiftingData } = useQuery(
-    routes.listShiftRequests,
-    {
-      query: {
-        patient: id,
-      },
-      prefetch: isShiftClicked,
+  const consultation = patientData?.last_consultation;
+  const skillsQuery = useQuery(routes.userListSkill, {
+    pathParams: {
+      username: consultation?.treating_physician_object?.username ?? "",
     },
-  );
+    prefetch: !!consultation?.treating_physician_object?.username,
+  });
+  const formatSkills = (arr: SkillModel[]) => {
+    const skills = arr.map((skill) => skill.skill_object.name);
+
+    if (skills.length === 0) {
+      return "";
+    }
 
-  const confirmApproval = (status: number, sample: any) => {
-    setSelectedStatus({ status, sample });
-    setShowAlertMessage(true);
+    if (skills.length <= 3) {
+      return humanizeStrings(skills);
+    }
+
+    const [first, second, ...rest] = skills;
+    return `${first}, ${second} and ${rest.length} other skills...`;
   };
 
   const handleApproval = async () => {
     const { status, sample } = selectedStatus;
     const sampleData = {
-      id: sample.id,
+      id: sample?.id,
       status: status.toString(),
-      consultation: sample.consultation,
+      consultation: sample?.consultation,
     };
     const statusName = SAMPLE_TEST_STATUS.find((i) => i.id === status)?.desc;
 
     await request(routes.patchSample, {
       body: sampleData,
       pathParams: {
-        id: sample.id,
+        id: sample?.id || "",
       },
       onResponse: ({ res }) => {
         if (res?.ok) {
@@ -214,351 +171,390 @@ export const PatientHome = (props: any) => {
     (i) => i.id === patientData.gender,
   )?.text;
 
-  let patientMedHis: any[] = [];
-  if (
-    patientData &&
-    patientData.medical_history &&
-    patientData.medical_history.length
-  ) {
-    const medHis = patientData.medical_history;
-    patientMedHis = medHis
-      .filter((item) => item.disease !== "NO")
-      .map((item, idx) => (
-        <div className="sm:col-span-1" key={`med_his_${idx}`}>
-          <div className="break-words text-sm font-semibold leading-5 text-zinc-400">
-            {item.disease}
-          </div>
-          <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-            {item.details}
-          </div>
-        </div>
-      ));
-  }
-
-  const isPatientInactive = (patientData: PatientModel, facilityId: string) => {
-    return (
-      !patientData.is_active ||
-      !(patientData?.last_consultation?.facility === facilityId)
-    );
+  const handlePatientTransfer = async (value: boolean) => {
+    await request(routes.patchPatient, {
+      pathParams: {
+        id: patientData.id as string,
+      },
+      body: { allow_transfer: value },
+      onResponse: ({ res }) => {
+        if (res?.status === 200) {
+          setPatientData((prev) => ({
+            ...prev,
+            allow_transfer: value,
+          }));
+          Notification.Success({
+            msg: t("transfer_status_updated"),
+          });
+        }
+      },
+    });
   };
 
+  const Tab = patientTabs.find((t) => t.route === page)?.component;
+
   return (
     <Page
       title={t("patient_details")}
       crumbsReplacements={{
-        [facilityId]: { name: patientData?.facility_object?.name },
+        [facilityId || ""]: { name: patientData?.facility_object?.name },
         [id]: { name: patientData?.name },
       }}
       backUrl={facilityId ? `/facility/${facilityId}/patients` : "/patients"}
     >
       <ConfirmDialog
-        title="Confirm send sample to collection centre"
-        description="Are you sure you want to send the sample to Collection Centre?"
+        title={t("send_sample_to_collection_centre_title")}
+        description={t("send_sample_to_collection_centre_description")}
         show={showAlertMessage}
-        action="Approve"
+        action={t("approve")}
         onConfirm={() => handleApproval()}
         onClose={() => setShowAlertMessage(false)}
       />
 
-      <div>
-        <div className="relative mt-2">
-          <div className="mx-auto max-w-screen-xl p-3 sm:px-6 lg:px-8">
-            <div className="md:flex">
-              {patientData?.last_consultation?.assigned_to_object && (
-                <p className="mx-3 flex flex-1 justify-center gap-2 rounded-lg bg-green-200 p-3 text-center font-bold text-green-800 shadow">
-                  <span className="inline">
-                    Assigned Doctor:
-                    {formatName(
-                      patientData.last_consultation.assigned_to_object,
-                    )}
-                  </span>
-                  {patientData?.last_consultation?.assigned_to_object
-                    .alt_phone_number && (
-                    <a
-                      href={`https://wa.me/${patientData?.last_consultation?.assigned_to_object.alt_phone_number?.replace(/\D+/g, "")}`}
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      <CareIcon icon="l-whatsapp" /> Video Call
-                    </a>
-                  )}
-                </p>
-              )}
-              {patientData.assigned_to_object && (
-                <p className="mx-2 flex-1 rounded-lg bg-primary-200 p-3 text-center font-bold text-primary-800 shadow">
-                  <span className="inline">
-                    Assigned Volunteer:
-                    {formatName(patientData.assigned_to_object)}
-                  </span>
-                </p>
-              )}
-            </div>
-          </div>
-        </div>
-        {(patientData?.facility != patientData?.last_consultation?.facility ||
-          (patientData.is_active &&
-            patientData?.last_consultation?.discharge_date)) && (
-          <Alert
-            variant="destructive"
-            className="mb-4 flex flex-col items-center justify-between gap-2 md:flex-row"
-          >
-            <div className="flex items-center gap-2">
-              <CareIcon
-                icon="l-exclamation-triangle"
-                className="mr-2 hidden h-10 animate-pulse md:block"
-              />
-              <div>
-                <AlertTitle className="flex items-center">
-                  {t("consultation_not_filed")}
-                </AlertTitle>
-                <AlertDescription>
-                  <span className="text-gray-700">
-                    {t("consultation_not_filed_description")}
-                  </span>
-                </AlertDescription>
+      <div className="mt-3" data-testid="patient-dashboard">
+        <div className="px-3 md:px-0">
+          <div className="rounded-md bg-white p-3 shadow-sm">
+            <div>
+              <div className="flex flex-col justify-between gap-4 gap-y-2 md:flex-row">
+                <div className="flex flex-col gap-4 md:flex-row">
+                  <div className="flex flex-row gap-x-4">
+                    <div className="h-10 w-10 flex-shrink-0 md:h-14 md:w-14">
+                      <Avatar
+                        className="size-10 font-semibold text-secondary-800 md:size-auto"
+                        name={patientData.name || "-"}
+                      />
+                    </div>
+                    <div>
+                      <h1 className="text-xl font-bold capitalize text-gray-950">
+                        {patientData.name}
+                      </h1>
+                      <h3 className="text-sm font-medium text-gray-600">
+                        {formatPatientAge(patientData, true)},{"  "}
+                        {patientGender},{"  "} {patientData.blood_group || "-"}
+                      </h3>
+                    </div>
+                  </div>
+                </div>
+                <div className="h-full space-y-2">
+                  <div className="space-y-3 border-b border-dashed text-left text-lg font-semibold text-secondary-900">
+                    <div>
+                      {patientData?.is_active &&
+                        (!patientData?.last_consultation ||
+                          patientData?.last_consultation?.discharge_date) && (
+                          <div>
+                            <ButtonV2
+                              className="w-full"
+                              size="default"
+                              onClick={() =>
+                                navigate(
+                                  `/facility/${patientData?.facility}/patient/${id}/consultation`,
+                                )
+                              }
+                            >
+                              <span className="flex w-full items-center justify-start gap-2">
+                                <CareIcon
+                                  icon="l-chat-bubble-user"
+                                  className="text-xl"
+                                />
+                                {t("add_consultation")}
+                              </span>
+                            </ButtonV2>
+                          </div>
+                        )}
+                    </div>
+                  </div>
+                </div>
               </div>
-            </div>
-            <Button
-              variant="outline_primary"
-              disabled={!patientData.is_active}
-              onClick={() =>
-                navigate(
-                  `/facility/${patientData?.facility}/patient/${id}/consultation`,
-                )
-              }
-            >
-              <CareIcon icon="l-plus" className="mr-2" />
-              <span>{t("create_consultation")}</span>
-            </Button>
-          </Alert>
-        )}
 
-        <section className="lg:flex" data-testid="patient-dashboard">
-          <div className="lg:w-2/3">
-            <div className="flex h-full flex-col justify-between rounded-lg bg-white pb-5 pl-9 pt-11 shadow">
               <div>
-                <div className="flex flex-row gap-4">
-                  <h1 className="flex flex-row pb-3 text-2xl font-bold capitalize">
-                    {patientData.name} - {formatPatientAge(patientData, true)}
-                  </h1>
-                  <div className="ml-auto mr-9 flex flex-wrap gap-3">
-                    {patientData.is_vaccinated && (
-                      <Chip
-                        variant="custom"
-                        className="bg-blue-100 text-blue-800"
-                        startIcon="l-syringe"
-                        text="Vaccinated"
-                      />
-                    )}
-                    {patientData.allow_transfer ? (
-                      <Chip
-                        variant="warning"
-                        startIcon="l-unlock"
-                        text="Transfer Allowed"
-                      />
-                    ) : (
-                      <Chip startIcon="l-lock" text="Transfer Blocked" />
+                <div className="ml-auto mt-4 flex flex-wrap gap-3">
+                  {isPatientMandatoryDataFilled(patientData) &&
+                    (!patientData.last_consultation ||
+                      patientData.last_consultation?.facility !==
+                        patientData.facility ||
+                      (patientData.last_consultation?.discharge_date &&
+                        patientData.is_active)) && (
+                      <span className="relative inline-flex">
+                        <Chip
+                          size="small"
+                          variant="danger"
+                          startIcon="l-notes"
+                          text={t("no_consultation_filed")}
+                        />
+                        <span className="absolute -right-1 -top-1 flex h-3 w-3 items-center justify-center">
+                          <span className="center absolute inline-flex h-4 w-4 animate-ping rounded-full bg-red-400"></span>
+                          <span className="relative inline-flex h-3 w-3 rounded-full bg-red-600"></span>
+                        </span>
+                      </span>
                     )}
-                    {patientData.gender === 2 && (
-                      <>
-                        {patientData.is_antenatal &&
-                          isAntenatal(
-                            patientData.last_menstruation_start_date,
-                          ) && (
-                            <Chip
-                              variant="custom"
-                              className="border-pink-300 bg-pink-100 text-pink-600"
-                              startIcon="l-baby-carriage"
-                              text="Antenatal"
-                            />
-                          )}
-                        {isPostPartum(patientData.date_of_delivery) && (
+                  {patientData.is_vaccinated && (
+                    <Chip
+                      variant="custom"
+                      size="small"
+                      className="bg-blue-100 text-blue-800"
+                      startIcon="l-syringe"
+                      text={t("vaccinated")}
+                    />
+                  )}
+                  {patientData.allow_transfer ? (
+                    <Chip
+                      variant="warning"
+                      size="small"
+                      startIcon="l-unlock"
+                      text={t("transfer_allowed")}
+                    />
+                  ) : (
+                    <Chip
+                      startIcon="l-lock"
+                      size="small"
+                      text={t("transfer_blocked")}
+                    />
+                  )}
+
+                  {patientData.gender === 2 && (
+                    <>
+                      {patientData.is_antenatal &&
+                        isAntenatal(
+                          patientData.last_menstruation_start_date,
+                        ) && (
                           <Chip
                             variant="custom"
+                            size="small"
                             className="border-pink-300 bg-pink-100 text-pink-600"
                             startIcon="l-baby-carriage"
-                            text="Post-partum"
+                            text={t("antenatal")}
                           />
                         )}
-                      </>
-                    )}
-                    {patientData.last_consultation?.is_telemedicine && (
-                      <Chip
-                        variant="alert"
-                        startIcon="l-phone"
-                        text="Telemedicine"
-                      />
-                    )}
-                  </div>
+                      {isPostPartum(patientData.date_of_delivery) && (
+                        <Chip
+                          variant="custom"
+                          size="small"
+                          className="border-pink-300 bg-pink-100 text-pink-600"
+                          startIcon="l-baby-carriage"
+                          text={t("post_partum")}
+                        />
+                      )}
+                    </>
+                  )}
+                  {patientData.last_consultation?.is_telemedicine && (
+                    <Chip
+                      variant="alert"
+                      size="small"
+                      startIcon="l-phone"
+                      text={t("TELEMEDICINE")}
+                    />
+                  )}
+                  {patientData.allergies && (
+                    <Chip
+                      variant="danger"
+                      size="small"
+                      text={`${t("allergies")} ${patientData.allergies.length}`}
+                    />
+                  )}
                 </div>
-                <h3 className="text-base font-medium">
-                  <CareIcon
-                    icon="l-hospital"
-                    className="mr-2 text-emerald-900"
-                  />
-                  {patientData.facility_object?.name || "-"}
-                </h3>
-                <p className="mb-7 mt-4 text-sm font-medium text-zinc-500">
-                  {patientGender} | {patientData.blood_group || "-"} | Born on{" "}
-                  {patientData.date_of_birth
-                    ? formatDate(patientData.date_of_birth)
-                    : patientData.year_of_birth}
-                </p>
               </div>
-              <div className="mb-8 mt-2 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-4">
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("phone")}
-                  </div>
-                  <div className="mt-1 text-sm leading-5">
-                    <div>
-                      <a
-                        href={`tel:${patientData.phone_number}`}
-                        className="text-sm font-medium text-black hover:text-secondary-500"
-                      >
-                        {patientData.phone_number || "-"}
-                      </a>
-                    </div>
-                    <div>
-                      <a
-                        href={`https://wa.me/${patientData.phone_number?.replace(/\D+/g, "")}`}
-                        target="_blank"
-                        className="text-sm font-normal text-sky-600 hover:text-sky-300"
-                        rel="noreferrer"
-                      >
-                        <CareIcon icon="l-whatsapp" /> Chat on WhatsApp
-                      </a>
-                    </div>
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("patient_registration__contact")}
-                  </div>
-                  <div className="mt-1 text-sm leading-5 text-secondary-900">
-                    <div>
-                      <a
-                        href={`tel:${patientData.emergency_phone_number}`}
-                        className="text-sm font-medium text-black hover:text-secondary-500"
-                      >
-                        {patientData.emergency_phone_number || "-"}
-                      </a>
-                    </div>
-                    <div>
-                      <a
-                        href={`https://wa.me/${patientData.emergency_phone_number?.replace(/\D+/g, "")}`}
-                        target="_blank"
-                        className="text-sm font-normal text-sky-600 hover:text-sky-300"
-                        rel="noreferrer"
-                      >
-                        <CareIcon icon="l-whatsapp" /> Chat on WhatsApp
-                      </a>
-                    </div>
-                  </div>
+
+              <div className="mt-4 flex gap-4">
+                <div>
+                  <p className="text-xs font-normal leading-tight text-gray-600">
+                    {t("facility")}:
+                  </p>
+                  <p className="mt-1 flex text-sm font-semibold leading-tight text-gray-900">
+                    {patientData.facility_object?.name || "-"}
+                  </p>
                 </div>
-                {patientData.date_of_return && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Date of Return
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {formatDateTime(patientData.date_of_return)}
-                    </div>
-                  </div>
-                )}
-                {patientData.is_vaccinated && !!patientData.number_of_doses && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Number of vaccine doses
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {patientData.number_of_doses}
-                    </div>
-                  </div>
-                )}
-                {patientData.is_vaccinated && patientData.vaccine_name && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Vaccine name
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {patientData.vaccine_name}
+
+                {patientData?.last_consultation?.treating_physician_object && (
+                  <div>
+                    <h4 className="text-xs font-normal leading-tight text-gray-600">
+                      {t("treating_doctor")}:
+                    </h4>
+                    <div className="mt-1 flex space-x-2">
+                      <p className="flex text-sm font-semibold leading-tight text-gray-900">
+                        {formatName(
+                          patientData.last_consultation
+                            .treating_physician_object,
+                        )}
+                      </p>
+                      <p className="flex items-end text-xs font-normal leading-tight">
+                        {!!skillsQuery.data?.results?.length &&
+                          formatSkills(skillsQuery.data?.results)}
+                      </p>
                     </div>
                   </div>
                 )}
-                {patientData.is_vaccinated &&
-                  patientData.last_vaccinated_date && (
-                    <div className="sm:col-span-1">
-                      <div className="text-sm font-semibold leading-5 text-zinc-400">
-                        Last Vaccinated on
-                      </div>
-                      <div className="mt-1 text-sm font-medium leading-5">
-                        {formatDateTime(patientData.last_vaccinated_date)}
-                      </div>
-                    </div>
-                  )}
-                {patientData.countries_travelled &&
-                  !!patientData.countries_travelled.length && (
-                    <div className="sm:col-span-1">
-                      <div className="text-sm font-semibold leading-5 text-zinc-400">
-                        Countries travelled
-                      </div>
-                      <div className="mt-1 text-sm font-medium leading-5">
-                        {patientData.countries_travelled.join(", ")}
-                      </div>
-                    </div>
-                  )}
-                {patientData.meta_info?.occupation && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      {t("occupation")}
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {parseOccupation(patientData.meta_info.occupation)}
+                {patientData?.last_consultation?.assigned_to_object && (
+                  <div>
+                    <p className="text-xs font-normal leading-tight text-gray-600">
+                      {t("assigned_doctor")}:
+                    </p>
+                    <div className="mt-1 flex space-x-2 text-sm font-semibold leading-tight text-gray-900">
+                      <p>
+                        {formatName(
+                          patientData.last_consultation.assigned_to_object,
+                        )}
+                      </p>
+                      {patientData?.last_consultation?.assigned_to_object
+                        .alt_phone_number && (
+                        <a
+                          href={`https://wa.me/${patientData.last_consultation.assigned_to_object.alt_phone_number.replace(/\D+/g, "")}`}
+                          target="_blank"
+                          rel="noreferrer"
+                          className="flex items-center space-x-1 text-xs text-green-500"
+                        >
+                          <CareIcon icon="l-whatsapp" />{" "}
+                          <span>{t("video_call")}</span>
+                        </a>
+                      )}
                     </div>
                   </div>
                 )}
-                {patientData.ration_card_category && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      {t("ration_card_category")}
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {t(`ration_card__${patientData.ration_card_category}`)}
-                    </div>
+
+                {patientData.assigned_to_object && (
+                  <div>
+                    <p className="text-xs font-normal leading-tight text-gray-600">
+                      {t("assigned_volunteer")}:
+                    </p>
+                    <p className="mt-1 text-sm font-semibold leading-tight text-gray-900">
+                      {formatName(patientData.assigned_to_object)}
+                    </p>
                   </div>
                 )}
-                {patientData.meta_info?.socioeconomic_status && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      {t("socioeconomic_status")}
-                    </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {t(
-                        `SOCIOECONOMIC_STATUS__${patientData.meta_info.socioeconomic_status}`,
-                      )}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div
+          className="sticky top-0 z-10 mt-4 w-full overflow-x-auto border-b bg-gray-50"
+          role="navigation"
+        >
+          <div className="flex flex-row" role="tablist">
+            {patientTabs.map((tab) => (
+              <Link
+                key={tab.route}
+                href={`/facility/${facilityId}/patient/${id}/${tab.route}`}
+                className={`whitespace-nowrap px-4 py-2 text-sm font-medium ${
+                  page === tab.route
+                    ? "border-b-4 border-green-800 text-green-800 md:border-b-2"
+                    : "rounded-t-lg text-gray-600 hover:bg-gray-100"
+                }`}
+                role="tab"
+                aria-selected={page === tab.route}
+                aria-controls={`${tab.route}-panel`}
+              >
+                {t(tab.route)}
+              </Link>
+            ))}
+          </div>
+        </div>
+
+        <div className="h-full lg:flex">
+          <div className="h-full lg:mr-7 lg:basis-5/6">
+            {Tab && (
+              <Tab
+                facilityId={facilityId || ""}
+                id={id}
+                patientData={patientData}
+              />
+            )}
+          </div>
+          <div className="sticky top-20 mt-8 h-full lg:basis-1/6">
+            <section className="mb-4 space-y-2 md:flex">
+              <div className="mx-3 w-full lg:mx-0">
+                <div className="font-semibold text-secondary-900">
+                  {t("actions")}
+                </div>
+                <div className="mt-2 h-full space-y-2">
+                  <div className="space-y-3 border-b border-dashed text-left text-lg font-semibold text-secondary-900">
+                    <div>
+                      <ButtonV2
+                        className="w-full bg-white font-semibold text-green-800 hover:bg-secondary-200"
+                        size="large"
+                        onClick={() =>
+                          navigate(`/patient/${id}/investigation_reports`)
+                        }
+                      >
+                        <span className="flex w-full items-center justify-start gap-2">
+                          <CareIcon
+                            icon="l-file-search-alt"
+                            className="text-xl"
+                          />
+                          {t("investigations_summary")}
+                        </span>
+                      </ButtonV2>
                     </div>
-                  </div>
-                )}
-                {patientData.meta_info?.domestic_healthcare_support && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      {t("domestic_healthcare_support")}
+                    <div>
+                      <ButtonV2
+                        className="w-full bg-white font-semibold text-green-800 hover:bg-secondary-200"
+                        id="upload-patient-files"
+                        size="large"
+                        onClick={() =>
+                          navigate(
+                            `/facility/${patientData?.facility}/patient/${id}/files`,
+                          )
+                        }
+                      >
+                        <span className="flex w-full items-center justify-start gap-2">
+                          <CareIcon icon="l-file-upload" className="text-xl" />
+                          {t("view_update_patient_files")}
+                        </span>
+                      </ButtonV2>
                     </div>
-                    <div className="mt-1 text-sm font-medium leading-5">
-                      {t(
-                        `DOMESTIC_HEALTHCARE_SUPPORT__${patientData.meta_info.domestic_healthcare_support}`,
-                      )}
+
+                    {NonReadOnlyUsers && (
+                      <div>
+                        <ButtonV2
+                          id="assign-volunteer"
+                          onClick={() => setOpenAssignVolunteerDialog(true)}
+                          disabled={false}
+                          authorizeFor={NonReadOnlyUsers}
+                          className="w-full bg-white font-semibold text-green-800 hover:bg-secondary-200"
+                          size="large"
+                        >
+                          <span className="flex w-full items-center justify-start gap-2">
+                            <CareIcon icon="l-users-alt" className="text-lg" />{" "}
+                            {t("assign_to_volunteer")}
+                          </span>
+                        </ButtonV2>
+                      </div>
+                    )}
+
+                    <div>
+                      <ButtonV2
+                        id="patient-allow-transfer"
+                        className="flex w-full flex-row bg-white font-semibold text-green-800 hover:bg-secondary-200"
+                        size="large"
+                        disabled={
+                          !patientData.last_consultation?.id ||
+                          !patientData.is_active
+                        }
+                        onClick={() =>
+                          handlePatientTransfer(!patientData.allow_transfer)
+                        }
+                        authorizeFor={NonReadOnlyUsers}
+                      >
+                        <span className="flex w-full items-center justify-start gap-2">
+                          <CareIcon
+                            icon={
+                              patientData.allow_transfer ? "l-lock" : "l-unlock"
+                            }
+                            className="text-lg"
+                          />
+                          {patientData.allow_transfer
+                            ? t("disable_transfer")
+                            : t("allow_transfer")}
+                        </span>
+                      </ButtonV2>
                     </div>
                   </div>
-                )}
+                </div>
               </div>
-            </div>
-          </div>
-          <div className="h-full px-2 lg:w-1/3">
+            </section>
+            <hr />
             <div
               id="actions"
-              className="flex h-full flex-col justify-between space-y-2 px-2"
+              className="my-2 flex h-full flex-col justify-between space-y-2"
             >
               <div>
                 {patientData.review_time &&
@@ -567,7 +563,7 @@ export const PatientHome = (props: any) => {
                     0 && (
                     <div
                       className={
-                        "mb-6 inline-flex w-full items-center justify-center rounded-md border p-3 text-xs font-semibold leading-4 shadow-sm lg:mt-0 " +
+                        "my-2 inline-flex w-full items-center justify-center rounded-md border p-3 text-xs font-semibold leading-4 shadow-sm lg:mt-0" +
                         (dayjs().isBefore(patientData.review_time)
                           ? " bg-secondary-100"
                           : " bg-red-600/5 p-1 text-sm font-normal text-red-600")
@@ -576,41 +572,37 @@ export const PatientHome = (props: any) => {
                       <CareIcon icon="l-clock" className="text-md mr-2" />
                       <p className="p-1">
                         {(dayjs().isBefore(patientData.review_time)
-                          ? "Review before: "
-                          : "Review Missed: ") +
+                          ? t("review_before")
+                          : t("review_missed")) +
+                          ": " +
                           formatDateTime(patientData.review_time)}
                       </p>
                     </div>
                   )}
-                <div className="my-3 rounded-sm bg-white p-2 text-center shadow md:my-0 md:mb-6">
-                  <div className="flex justify-between">
-                    <div className="w-1/2 border-r-2">
-                      <div className="text-sm font-normal leading-5 text-secondary-500">
-                        Status
-                      </div>
-                      <div className="mt-1 text-xl font-semibold leading-5 text-secondary-900">
-                        {patientData.is_active ? "LIVE" : "DISCHARGED"}
-                      </div>
-                    </div>
-                    <div className="w-1/2">
-                      <div className="text-sm font-normal leading-5 text-secondary-500">
-                        Last Discharged Reason
+
+                <div className="rounded-sm px-2">
+                  <div className="my-1 flex justify-between">
+                    <div>
+                      <div className="text-xs font-normal leading-5 text-gray-600">
+                        {t("last_discharge_reason")}
                       </div>
-                      <div className="mt-1 text-xl font-semibold leading-5 text-secondary-900">
+                      <div className="text-sm font-semibold text-gray-900">
                         {patientData.is_active ? (
                           "-"
                         ) : !patientData.last_consultation
                             ?.new_discharge_reason ? (
                           <span className="text-secondary-800">
                             {patientData?.last_consultation?.suggestion === "OP"
-                              ? "OP file closed"
-                              : "UNKNOWN"}
+                              ? t("op_file_closed")
+                              : t("unknown")}
                           </span>
                         ) : patientData.last_consultation
                             ?.new_discharge_reason ===
                           DISCHARGE_REASONS.find((i) => i.text == "Expired")
                             ?.id ? (
-                          <span className="text-red-600">EXPIRED</span>
+                          <span className="text-red-600 uppercase">
+                            {t("expired")}
+                          </span>
                         ) : (
                           DISCHARGE_REASONS.find(
                             (reason) =>
@@ -623,31 +615,46 @@ export const PatientHome = (props: any) => {
                     </div>
                   </div>
                 </div>
-                <div className="mt-2 flex justify-between rounded-sm bg-white p-2 px-4 text-center shadow">
-                  <div className="w-1/2 border-r-2 pb-1 pr-2">
-                    <div className="text-sm font-normal leading-5 text-secondary-500">
-                      Created
-                    </div>
-                    <div className="mt-1 whitespace-normal text-sm font-semibold leading-5 text-secondary-900">
-                      <div className="flex justify-center text-sm font-semibold">
-                        <RelativeDateUserMention
-                          actionDate={patientData.created_date}
-                          user={patientData.created_by}
-                        />
+                <div className="my-1 rounded-sm p-2">
+                  <div>
+                    <div className="text-xs font-normal text-gray-600">
+                      {t("last_updated_by")}{" "}
+                      <span className="font-semibold text-gray-900">
+                        {patientData.last_edited?.first_name}{" "}
+                        {patientData.last_edited?.last_name}
+                      </span>
+                    </div>
+                    <div className="whitespace-normal text-sm font-semibold text-gray-900">
+                      <div className="tooltip">
+                        <span className={`tooltip-text tooltip`}>
+                          {patientData.modified_date
+                            ? formatDateTime(patientData.modified_date)
+                            : "--:--"}
+                        </span>
+                        {patientData.modified_date
+                          ? relativeDate(patientData.modified_date)
+                          : "--:--"}
                       </div>
                     </div>
                   </div>
-                  <div className="w-1/2 pb-1 pl-2">
-                    <div className="text-sm font-normal leading-5 text-secondary-500">
-                      Last Edited
-                    </div>
-                    <div className="mt-1 whitespace-normal text-sm leading-5 text-secondary-900">
-                      <div className="flex justify-center whitespace-normal text-sm font-semibold">
-                        <RelativeDateUserMention
-                          actionDate={patientData.modified_date}
-                          user={patientData.last_edited}
-                          tooltipPosition="left"
-                        />
+                  <div className="mt-4">
+                    <div className="text-xs font-normal leading-5 text-gray-600">
+                      {t("patient_profile_created_by")}{" "}
+                      <span className="font-semibold text-gray-900">
+                        {patientData.created_by?.first_name}{" "}
+                        {patientData.created_by?.last_name}
+                      </span>
+                    </div>
+                    <div className="whitespace-normal text-sm font-semibold text-gray-900">
+                      <div className="tooltip">
+                        <span className={`tooltip-text tooltip`}>
+                          {patientData.created_date
+                            ? formatDateTime(patientData.created_date)
+                            : "--:--"}
+                        </span>
+                        {patientData.modified_date
+                          ? relativeDate(patientData.modified_date)
+                          : "--:--"}
                       </div>
                     </div>
                   </div>
@@ -659,784 +666,40 @@ export const PatientHome = (props: any) => {
                   <div>
                     <ButtonV2
                       id="death-report"
-                      className="mt-6 w-full"
+                      className="my-2 w-full"
                       name="death_report"
                       onClick={() => navigate(`/death_report/${id}`)}
                     >
                       <CareIcon icon="l-file-download" className="text-lg" />
-                      Death Report
+                      {t("death_report")}
                     </ButtonV2>
                   </div>
                 )}
-                <div>
-                  <ButtonV2
-                    id="update-patient-details"
-                    className="mt-4 w-full"
-                    disabled={!patientData.is_active}
-                    authorizeFor={NonReadOnlyUsers}
-                    onClick={() => {
-                      const showAllFacilityUsers = [
-                        "DistrictAdmin",
-                        "StateAdmin",
-                      ];
-                      if (
-                        !showAllFacilityUsers.includes(authUser.user_type) &&
-                        authUser.home_facility_object?.id !==
-                          patientData.facility
-                      ) {
-                        Notification.Error({
-                          msg: "Oops! Non-Home facility users don't have permission to perform this action.",
-                        });
-                      } else {
-                        navigate(
-                          `/facility/${patientData?.facility}/patient/${id}/update`,
-                        );
-                      }
-                    }}
-                  >
-                    <CareIcon icon="l-edit-alt" className="text-lg" />
-                    Update Details
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    id="patient-allow-transfer"
-                    className="mt-4 w-full"
-                    disabled={
-                      !patientData.last_consultation?.id ||
-                      !patientData.is_active
-                    }
-                    onClick={() =>
-                      handlePatientTransfer(!patientData.allow_transfer)
-                    }
-                    authorizeFor={NonReadOnlyUsers}
-                  >
-                    <CareIcon
-                      icon={patientData.allow_transfer ? "l-lock" : "l-unlock"}
-                      className="text-lg"
-                    />
-                    {patientData.allow_transfer
-                      ? "Disable Transfer"
-                      : "Allow Transfer"}
-                  </ButtonV2>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
-        <section className="mt-7 h-full space-y-2 rounded-lg bg-white p-4 text-secondary-100 shadow">
-          <div
-            className="flex cursor-pointer justify-between border-b border-dashed pb-2 text-left text-lg font-semibold text-secondary-900"
-            onClick={() => {
-              setShowShifts(!showShifts);
-              setIsShiftClicked(true);
-            }}
-          >
-            <div>{t("shifting")}</div>
-            {showShifts ? (
-              <CareIcon icon="l-angle-up" className="text-2xl" />
-            ) : (
-              <CareIcon icon="l-angle-down" className="text-2xl" />
-            )}
-          </div>
-          <div
-            className={
-              showShifts
-                ? activeShiftingData?.count || 0
-                  ? "grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3"
-                  : ""
-                : "hidden"
-            }
-          >
-            {activeShiftingData?.count ? (
-              activeShiftingData.results.map((shift: ShiftingModel) => (
-                <div key={`shift_${shift.id}`} className="mx-2">
-                  <div className="h-full overflow-hidden rounded-lg bg-white shadow">
-                    <div className="flex h-full flex-col justify-between p-4">
-                      <div>
-                        <div className="mt-1 flex justify-between">
-                          <div>
-                            {shift.emergency && (
-                              <span className="inline-block shrink-0 rounded-full bg-red-100 px-2 py-0.5 text-xs font-medium leading-4 text-red-800">
-                                Emergency
-                              </span>
-                            )}
-                          </div>
-                        </div>
-                        <dl className="grid grid-cols-1 gap-x-1 gap-y-2 sm:grid-cols-1">
-                          <div className="sm:col-span-1">
-                            <dt
-                              title="Shifting status"
-                              className="flex items-center text-sm font-semibold leading-5 text-zinc-400"
-                            >
-                              <CareIcon
-                                icon="l-truck"
-                                className="mr-2 text-lg"
-                              />
-                              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                                {shift.status}
-                              </dd>
-                            </dt>
-                          </div>
-                          <div className="sm:col-span-1">
-                            <dt
-                              title=" Origin facility"
-                              className="flex items-center text-sm font-semibold leading-5 text-zinc-400"
-                            >
-                              <CareIcon
-                                icon="l-plane-fly"
-                                className="mr-2 text-lg"
-                              />
-                              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                                {(shift.origin_facility_object || {})?.name}
-                              </dd>
-                            </dt>
-                          </div>
-                          <div className="sm:col-span-1">
-                            <dt
-                              title="Shifting approving facility"
-                              className="flex items-center text-sm font-semibold leading-5 text-zinc-400"
-                            >
-                              <CareIcon
-                                icon="l-user-check"
-                                className="mr-2 text-lg"
-                              />
-                              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                                {
-                                  (
-                                    shift.shifting_approving_facility_object ||
-                                    {}
-                                  )?.name
-                                }
-                              </dd>
-                            </dt>
-                          </div>
-                          <div className="sm:col-span-1">
-                            <dt
-                              title=" Assigned facility"
-                              className="flex items-center text-sm font-semibold leading-5 text-zinc-400"
-                            >
-                              <CareIcon
-                                icon="l-plane-arrival"
-                                className="mr-2 text-lg"
-                              />
-                              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                                {(shift.assigned_facility_object || {})?.name ||
-                                  "Yet to be decided"}
-                              </dd>
-                            </dt>
-                          </div>
-
-                          <div className="sm:col-span-1">
-                            <dt
-                              title="  Last Modified"
-                              className={
-                                "flex items-center text-sm font-medium leading-5 " +
-                                (dayjs()
-                                  .subtract(2, "hours")
-                                  .isBefore(shift.modified_date)
-                                  ? "text-secondary-900"
-                                  : "rounded p-1 font-normal text-red-600")
-                              }
-                            >
-                              <CareIcon
-                                icon="l-stopwatch"
-                                className="mr-2 text-lg"
-                              />
-                              <dd className="text-sm font-bold leading-5">
-                                {formatDateTime(shift.modified_date) || "--"}
-                              </dd>
-                            </dt>
-                          </div>
-                        </dl>
-                      </div>
-
-                      <div className="mt-2 flex">
-                        <ButtonV2
-                          className="mr-2 w-full bg-white hover:bg-secondary-100"
-                          variant="secondary"
-                          onClick={() =>
-                            navigate(`/shifting/${shift.external_id}`)
-                          }
-                        >
-                          <CareIcon icon="l-eye" className="mr-2 text-lg" />
-                          All Details
-                        </ButtonV2>
-                      </div>
-                      {shift.status === "COMPLETED" &&
-                        shift.assigned_facility && (
-                          <div className="mt-2">
-                            <ButtonV2
-                              size="small"
-                              className="w-full"
-                              disabled={
-                                !shift.patient_object.allow_transfer ||
-                                !(
-                                  ["DistrictAdmin", "StateAdmin"].includes(
-                                    authUser.user_type,
-                                  ) ||
-                                  authUser.home_facility_object?.id ===
-                                    shift.assigned_facility
-                                )
-                              }
-                              onClick={() => setModalFor(shift)}
-                            >
-                              {t("transfer_to_receiving_facility")}
-                            </ButtonV2>
-                            <ConfirmDialog
-                              title="Confirm Transfer Complete"
-                              description="Are you sure you want to mark this transfer as complete? The Origin facility will no longer have access to this patient"
-                              show={!!modalFor}
-                              action="Confirm"
-                              onClose={() => setModalFor(undefined)}
-                              onConfirm={() => handleTransferComplete(shift)}
-                            />
-                          </div>
-                        )}
-                    </div>
-                  </div>
-                </div>
-              ))
-            ) : (
-              <div className="text-center text-secondary-500">
-                {isShiftDataLoading ? "Loading..." : "No Shifting Records!"}
-              </div>
-            )}
-          </div>
-        </section>
-
-        <section
-          className="mt-5 grid grid-cols-1 gap-6 lg:grid-cols-3"
-          data-testid="patient-details"
-        >
-          <div className="w-full">
-            <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-              <div className="border-b border-dashed pb-2 text-xl font-bold text-secondary-900">
-                {t("location")}
-              </div>
-              <div className="grid grid-cols-1 gap-2 md:grid-cols-2">
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("address")}
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {patientData.address || "-"}
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("district")}
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {patientData.district_object?.name || "-"}
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    Village
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {patientData.village || "-"}
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("ward")}
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {(patientData.ward_object &&
-                      patientData.ward_object.number +
-                        ", " +
-                        patientData.ward_object.name) ||
-                      "-"}
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    State, Country - Pincode
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {patientData?.state_object?.name},
-                    {patientData.nationality || "-"} - {patientData.pincode}
-                  </div>
-                </div>
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {t("local_body")}
-                  </div>
-                  <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                    {patientData.local_body_object?.name || "-"}
-                  </div>
-                </div>
               </div>
             </div>
           </div>
-          <div className="w-full">
-            <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-              <div className="border-b border-dashed pb-2 text-xl font-bold text-secondary-900">
-                Medical
-              </div>
-              {!patientData.present_health &&
-                !patientData.allergies &&
-                !patientData.ongoing_medication &&
-                !(patientData.gender === 2 && patientData.is_antenatal) &&
-                !patientData.medical_history?.some(
-                  (history) => history.disease !== "NO",
-                ) && (
-                  <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
-                    No Medical History Available
-                  </div>
-                )}
-              <div className="mt-2 grid grid-cols-1 gap-x-4 gap-y-2 sm:grid-cols-3 md:gap-y-8">
-                {patientData.present_health && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Present Health
-                    </div>
-                    <div
-                      data-testid="patient-present-health"
-                      className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
-                    >
-                      {patientData.present_health}
-                    </div>
-                  </div>
-                )}
-                {patientData.ongoing_medication && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Ongoing Medications
-                    </div>
-                    <div
-                      data-testid="patient-ongoing-medication"
-                      className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
-                    >
-                      {patientData.ongoing_medication}
-                    </div>
-                  </div>
-                )}
-                {patientData.allergies && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Allergies
-                    </div>
-                    <div
-                      data-testid="patient-allergies"
-                      className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5"
-                    >
-                      {patientData.allergies}
-                    </div>
-                  </div>
-                )}
-                {patientData.gender === 2 && patientData.is_antenatal && (
-                  <div className="sm:col-span-1">
-                    <div className="text-sm font-semibold leading-5 text-zinc-400">
-                      Is pregnant
-                    </div>
-                    <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
-                      Yes
-                    </div>
-                  </div>
-                )}
-                {patientMedHis}
-              </div>
-            </div>
-          </div>
-
-          <InsuranceDetialsCard
-            data={insuranceDetials?.results[0]}
-            showViewAllDetails={
-              insuranceDetials?.count !== undefined &&
-              insuranceDetials?.count > 1
-            }
-          />
-        </section>
-        <section className="mt-4 space-y-2 md:flex">
-          <div className="hidden lg:block">
-            <div className="mt-4 grid grid-cols-6 gap-5 xl:grid-cols-7">
-              <div
-                className="w-full"
-                onClick={() => navigate(`/patient/${id}/investigation_reports`)}
-              >
-                <div className="h-full space-y-2 rounded-lg border border-green-700 bg-white p-4 shadow hover:cursor-pointer hover:bg-secondary-200">
-                  <div className="text-center text-green-700">
-                    <span>
-                      <CareIcon icon="l-file-search-alt" className="text-5xl" />
-                    </span>
-                  </div>
-                  <div>
-                    <p className="text-center text-sm font-medium">
-                      Investigations Summary
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="w-full"
-                onClick={() =>
-                  navigate(
-                    `/facility/${patientData?.facility}/patient/${id}/files/`,
-                  )
-                }
-              >
-                <div className="h-full space-y-2 rounded-lg border border-green-700 bg-white p-4 shadow hover:cursor-pointer hover:bg-secondary-200">
-                  <div className="text-center text-green-700">
-                    <span>
-                      <CareIcon icon="l-file-upload" className="text-5xl" />
-                    </span>
-                  </div>
-                  <div>
-                    <p className="text-center text-sm font-medium">
-                      View/Upload Patient Files
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="w-full"
-                onClick={() => {
-                  if (!isPatientInactive(patientData, facilityId)) {
-                    navigate(`/facility/${facilityId}/patient/${id}/shift/new`);
-                  }
-                }}
-              >
-                <div
-                  className={`h-full space-y-2 rounded-lg border bg-white p-4 shadow ${
-                    isPatientInactive(patientData, facilityId)
-                      ? "border-secondary-700 hover:cursor-not-allowed"
-                      : "border-green-700 hover:cursor-pointer hover:bg-secondary-200"
-                  } `}
-                >
-                  <div
-                    className={`${
-                      isPatientInactive(patientData, facilityId)
-                        ? "text-secondary-700"
-                        : "text-green-700"
-                    } text-center`}
-                  >
-                    <span>
-                      <CareIcon icon="l-ambulance" className="text-5xl" />
-                    </span>
-                  </div>
-
-                  <div>
-                    <p
-                      className={`${
-                        isPatientInactive(patientData, facilityId) &&
-                        "text-secondary-700"
-                      } text-center text-sm font-medium`}
-                    >
-                      Shift Patient
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="w-full"
-                onClick={() => {
-                  if (!isPatientInactive(patientData, facilityId)) {
-                    navigate(
-                      `/facility/${patientData?.facility}/patient/${id}/sample-test`,
-                    );
-                  }
-                }}
-              >
-                <div
-                  className={classNames(
-                    "h-full space-y-2 rounded-lg border bg-white p-4 shadow",
-                    isPatientInactive(patientData, facilityId)
-                      ? "border-secondary-700 hover:cursor-not-allowed"
-                      : "border-green-700 hover:cursor-pointer hover:bg-secondary-200",
-                  )}
-                >
-                  <div
-                    className={`${
-                      isPatientInactive(patientData, facilityId)
-                        ? "text-secondary-700"
-                        : "text-green-700"
-                    } text-center`}
-                  >
-                    <span>
-                      <CareIcon icon="l-medkit" className="text-5xl" />
-                    </span>
-                  </div>
-                  <div>
-                    <p
-                      className={`${
-                        isPatientInactive(patientData, facilityId) &&
-                        "text-secondary-700"
-                      } text-center text-sm font-medium`}
-                    >
-                      Request Sample Test
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="w-full"
-                onClick={() =>
-                  navigate(
-                    `/facility/${patientData?.facility}/patient/${id}/notes`,
-                  )
-                }
-              >
-                <div className="h-full space-y-2 rounded-lg border border-green-700 bg-white p-4 shadow hover:cursor-pointer hover:bg-secondary-200">
-                  <div className="text-center text-green-700">
-                    <span>
-                      <CareIcon icon="l-clipboard-notes" className="text-5xl" />
-                    </span>
-                  </div>
-                  <div>
-                    <p className="text-center text-sm font-medium">
-                      View Patient Notes
-                    </p>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="w-full"
-                onClick={() => {
-                  if (!isPatientInactive(patientData, facilityId)) {
-                    setOpenAssignVolunteerDialog(true);
-                  }
-                }}
-              >
-                <div
-                  className={classNames(
-                    "h-full space-y-2 rounded-lg border bg-white p-4 shadow",
-                    isPatientInactive(patientData, facilityId)
-                      ? "border-secondary-700 hover:cursor-not-allowed"
-                      : "border-green-700 hover:cursor-pointer hover:bg-secondary-200",
-                  )}
-                >
-                  <div
-                    className={classNames(
-                      "text-center",
-                      isPatientInactive(patientData, facilityId)
-                        ? "text-secondary-700"
-                        : "text-green-700",
-                    )}
-                  >
-                    <span>
-                      <CareIcon icon="l-users-alt" className="text-5xl" />
-                    </span>
-                  </div>
-                  <div>
-                    <p
-                      className={classNames(
-                        "text-center text-sm font-medium",
-                        isPatientInactive(patientData, facilityId)
-                          ? "text-secondary-700"
-                          : "text-black",
-                      )}
-                    >
-                      Assign to a volunteer
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="mx-2 w-full lg:hidden">
-            <div className="h-full space-y-2 rounded-lg bg-white p-4 shadow">
-              <div className="space-y-2 border-b border-dashed text-left text-lg font-semibold text-secondary-900">
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    onClick={() =>
-                      navigate(`/patient/${id}/investigation_reports`)
-                    }
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-file-search-alt" className="text-xl" />
-                      Investigations Summary
-                    </span>
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    id="upload-patient-files"
-                    onClick={() =>
-                      navigate(
-                        `/facility/${patientData?.facility}/patient/${id}/files`,
-                      )
-                    }
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-file-upload" className="text-xl" />
-                      View/Upload Patient Files
-                    </span>
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    disabled={isPatientInactive(patientData, facilityId)}
-                    onClick={() =>
-                      navigate(
-                        `/facility/${facilityId}/patient/${id}/shift/new`,
-                      )
-                    }
-                    authorizeFor={NonReadOnlyUsers}
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-ambulance" className="text-xl" />
-                      Shift Patient
-                    </span>
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    disabled={isPatientInactive(patientData, facilityId)}
-                    onClick={() =>
-                      navigate(
-                        `/facility/${patientData?.facility}/patient/${id}/sample-test`,
-                      )
-                    }
-                    authorizeFor={NonReadOnlyUsers}
-                    id="sample-request-btn"
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-medkit" className="text-xl" />
-                      Request Sample Test
-                    </span>
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    onClick={() =>
-                      navigate(
-                        `/facility/${patientData?.facility}/patient/${id}/notes`,
-                      )
-                    }
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-clipboard-notes" className="text-xl" />
-                      View Patient Notes
-                    </span>
-                  </ButtonV2>
-                </div>
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    onClick={() => setOpenAssignVolunteerDialog(true)}
-                    disabled={false}
-                    authorizeFor={NonReadOnlyUsers}
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-users-alt" className="text-xl" />
-                      Assign to a volunteer
-                    </span>
-                  </ButtonV2>
-                </div>
-              </div>
-            </div>
-          </div>
-        </section>
+        </div>
       </div>
 
       <ConfirmDialog
         className="w-full justify-between"
-        title={`Assign a volunteer to ${patientData.name}`}
+        title={t("assign_a_volunteer_to", { name: patientData.name })}
         show={openAssignVolunteerDialog}
         onClose={() => setOpenAssignVolunteerDialog(false)}
         description={
           <div className="mt-6">
             <UserAutocomplete
-              value={assignedVolunteerObject}
-              onChange={handleVolunteerSelect}
+              value={assignedVolunteer as UserBareMinimum}
+              onChange={(user) => setAssignedVolunteer(user.value)}
               userType={"Volunteer"}
               name={"assign_volunteer"}
               error={errors.assignedVolunteer}
             />
           </div>
         }
-        action="Assign"
+        action={t("assign")}
         onConfirm={handleAssignedVolunteer}
       />
-
-      <div>
-        <h2 className="ml-0 mt-9 text-2xl font-semibold leading-tight">
-          Consultation History
-        </h2>
-
-        <PaginatedList
-          route={routes.getConsultationList}
-          query={{ patient: id }}
-          perPage={5}
-        >
-          {(_) => (
-            <div>
-              <PaginatedList.WhenLoading>
-                <CircularProgress />
-              </PaginatedList.WhenLoading>
-              <PaginatedList.WhenEmpty className="py-2">
-                <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-                  <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
-                    No Consultation History Available
-                  </div>
-                </div>
-              </PaginatedList.WhenEmpty>
-              <PaginatedList.Items<ConsultationModel>>
-                {(item) => (
-                  <ConsultationCard
-                    itemData={item}
-                    isLastConsultation={
-                      item.id == patientData.last_consultation?.id
-                    }
-                    refetch={refetch}
-                  />
-                )}
-              </PaginatedList.Items>
-              <div className="flex w-full items-center justify-center">
-                <PaginatedList.Paginator hideIfSinglePage />
-              </div>
-            </div>
-          )}
-        </PaginatedList>
-      </div>
-
-      <div>
-        <h2 className="my-4 ml-0 text-2xl font-semibold leading-tight">
-          Sample Test History
-        </h2>
-        <PaginatedList
-          route={routes.sampleTestList}
-          pathParams={{ patientId: id }}
-          perPage={5}
-        >
-          {(_, query) => (
-            <div>
-              <PaginatedList.WhenLoading>
-                <CircularProgress />
-              </PaginatedList.WhenLoading>
-              <PaginatedList.WhenEmpty className="py-2">
-                <div className="h-full space-y-2 rounded-lg bg-white p-7 shadow">
-                  <div className="flex w-full items-center justify-center text-xl font-bold text-secondary-500">
-                    No Sample Test History Available
-                  </div>
-                </div>
-              </PaginatedList.WhenEmpty>
-              <PaginatedList.Items<SampleTestModel>>
-                {(item) => (
-                  <SampleTestCard
-                    refetch={query.refetch}
-                    itemData={item}
-                    handleApproval={confirmApproval}
-                    facilityId={facilityId}
-                    patientId={id}
-                  />
-                )}
-              </PaginatedList.Items>
-              <div className="flex w-full items-center justify-center">
-                <PaginatedList.Paginator hideIfSinglePage />
-              </div>
-            </div>
-          )}
-        </PaginatedList>
-      </div>
     </Page>
   );
 };
diff --git a/src/components/Patient/PatientInfoCard.tsx b/src/components/Patient/PatientInfoCard.tsx
index e415d928a0d..486e8b103fd 100644
--- a/src/components/Patient/PatientInfoCard.tsx
+++ b/src/components/Patient/PatientInfoCard.tsx
@@ -538,7 +538,7 @@ export default function PatientInfoCard(props: PatientInfoCardProps) {
           )}
           {!!consultation?.discharge_date && (
             <div className="flex min-w-max flex-col items-center justify-center">
-              <div className="text-sm font-normal leading-5 text-secondary-500">
+              <div className="text-sm font-normal leading-5 text-gray-600">
                 Discharge Reason
               </div>
               <div className="mt-[6px] text-xl font-semibold leading-5 text-secondary-900">
diff --git a/src/components/Patient/PatientRegister.tsx b/src/components/Patient/PatientRegister.tsx
index 35d93214385..5828517adf9 100644
--- a/src/components/Patient/PatientRegister.tsx
+++ b/src/components/Patient/PatientRegister.tsx
@@ -2,7 +2,7 @@ import careConfig from "@careConfig";
 import { startCase, toLower } from "lodash-es";
 import { debounce } from "lodash-es";
 import { navigate } from "raviger";
-import { useCallback, useReducer, useRef, useState } from "react";
+import { useCallback, useEffect, useReducer, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -232,6 +232,25 @@ export const PatientRegister = (props: PatientRegisterProps) => {
   const headerText = !id ? "Add Details of Patient" : "Update Patient Details";
   const buttonText = !id ? "Add Patient" : "Save Details";
 
+  useEffect(() => {
+    const getQueryParams = () => {
+      const params = new URLSearchParams(window.location.search);
+      return {
+        section: params.get("section"),
+      };
+    };
+
+    const { section } = getQueryParams();
+    if (section) {
+      setTimeout(() => {
+        const element = document.getElementById(section);
+        if (element) {
+          element.scrollIntoView({ behavior: "smooth" });
+        }
+      }, 2000);
+    }
+  }, []);
+
   const fetchDistricts = useCallback(async (id: number) => {
     if (id > 0) {
       setIsDistrictLoading(true);
@@ -1402,7 +1421,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                 </div>
               </div>
               {field("nationality").value === "India" && (
-                <div className="mb-8 rounded border p-4">
+                <div id="social-profile" className="mb-8 rounded border p-4">
                   <AccordionV2
                     className="mt-2 shadow-none md:mt-0 lg:mt-0"
                     expandIcon={
@@ -1480,7 +1499,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                   </AccordionV2>
                 </div>
               )}
-              <div className="mb-8 rounded border p-4">
+              <div id="covid-details" className="mb-8 rounded border p-4">
                 <AccordionV2
                   className="mt-2 shadow-none md:mt-0 lg:mt-0"
                   expandIcon={
@@ -1601,7 +1620,10 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                   </div>
                 </AccordionV2>
               </div>
-              <div className="mb-8 overflow-visible rounded border p-4">
+              <div
+                id="medical-history"
+                className="mb-8 overflow-visible rounded border p-4"
+              >
                 <h1 className="mb-4 text-left text-xl font-bold text-purple-500">
                   Medical History
                 </h1>
@@ -1661,7 +1683,10 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                   </div>
                 </div>
               </div>
-              <div className="flex w-full flex-col gap-4 rounded border bg-white p-4">
+              <div
+                id="insurance-details"
+                className="flex w-full flex-col gap-4 rounded border bg-white p-4"
+              >
                 <div className="flex w-full flex-col items-center justify-between gap-4 sm:flex-row">
                   <h1 className="text-left text-xl font-bold text-purple-500">
                     Insurance Details
diff --git a/src/components/Patient/SampleDetails.tsx b/src/components/Patient/SampleDetails.tsx
index c5282a65c1f..edc0b4d53a6 100644
--- a/src/components/Patient/SampleDetails.tsx
+++ b/src/components/Patient/SampleDetails.tsx
@@ -477,7 +477,11 @@ export const SampleDetails = ({ id }: DetailRoute) => {
       <div className="mb-4">
         <h4 className="mt-8">{t("sample_test_history")}</h4>
         {sampleDetails?.flow &&
-          sampleDetails.flow.map((flow: FlowModel) => renderFlow(flow))}
+          sampleDetails.flow.map((flow: FlowModel) => (
+            <div key={flow.id} className="mb-2">
+              {renderFlow(flow)}
+            </div>
+          ))}
       </div>
 
       <FileUpload
diff --git a/src/components/Patient/SampleTestCard.tsx b/src/components/Patient/SampleTestCard.tsx
index a0303705eb7..c22155c494e 100644
--- a/src/components/Patient/SampleTestCard.tsx
+++ b/src/components/Patient/SampleTestCard.tsx
@@ -16,8 +16,8 @@ import request from "@/Utils/request/request";
 import { formatDateTime } from "@/Utils/utils";
 
 interface SampleDetailsProps {
-  facilityId: number;
-  patientId: number;
+  facilityId: string;
+  patientId: string;
   itemData: SampleTestModel;
   refetch: () => void;
   handleApproval: (status: number, sample: SampleTestModel) => void;
diff --git a/src/components/Patient/models.tsx b/src/components/Patient/models.tsx
index 15063be4e9c..85614e707d5 100644
--- a/src/components/Patient/models.tsx
+++ b/src/components/Patient/models.tsx
@@ -136,7 +136,7 @@ export interface PatientModel {
   is_declared_positive?: boolean;
   last_edited?: UserBareMinimum;
   created_by?: UserBareMinimum;
-  assigned_to?: { first_name?: string; username?: string; last_name?: string };
+  assigned_to?: number | null;
   assigned_to_object?: AssignedToObjectModel;
   occupation?: Occupation;
   meta_info?: PatientMeta;
diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx
index 6eecf7fcef2..891c2f3378b 100644
--- a/src/components/Resource/ResourceList.tsx
+++ b/src/components/Resource/ResourceList.tsx
@@ -189,7 +189,7 @@ export default function ListView() {
 
   return (
     <Page
-      title="Resource"
+      title={t("resource")}
       hideBack
       componentRight={
         <ExportButton
@@ -216,13 +216,13 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <AdvancedFilterButton
-              onClick={() => advancedFilter.setShow(true)}
-            />
             <ButtonV2 className="py-[11px]" onClick={onBoardViewBtnClick}>
               <CareIcon icon="l-list-ul" className="rotate-90" />
               {t("board_view")}
             </ButtonV2>
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
           </div>
         </>
       }
diff --git a/src/components/Shifting/ShiftingBlock.tsx b/src/components/Shifting/ShiftingBlock.tsx
index 09bbcfb3b9f..db173b2c6d8 100644
--- a/src/components/Shifting/ShiftingBlock.tsx
+++ b/src/components/Shifting/ShiftingBlock.tsx
@@ -13,7 +13,7 @@ import { classNames, formatDateTime, formatName } from "@/Utils/utils";
 
 export default function ShiftingBlock(props: {
   shift: ShiftingModel;
-  onTransfer: () => unknown;
+  onTransfer?: () => unknown;
 }) {
   const { shift, onTransfer } = props;
   const { t } = useTranslation();
@@ -123,25 +123,28 @@ export default function ShiftingBlock(props: {
           <CareIcon icon="l-eye" className="text-lg" /> {t("all_details")}
         </Link>
 
-        {shift.status === "COMPLETED" && shift.assigned_facility && (
-          <>
-            <button
-              className="flex w-full items-center justify-center gap-2 rounded-lg border border-secondary-300 bg-secondary-200 p-2 text-sm font-semibold text-inherit transition-all hover:bg-secondary-300"
-              disabled={
-                !shift.patient_object.allow_transfer ||
-                !(
-                  ["DistrictAdmin", "StateAdmin"].includes(
-                    authUser.user_type,
-                  ) ||
-                  authUser.home_facility_object?.id === shift.assigned_facility
-                )
-              }
-              onClick={onTransfer}
-            >
-              {t("transfer_to_receiving_facility")}
-            </button>
-          </>
-        )}
+        {shift.status === "COMPLETED" &&
+          shift.assigned_facility &&
+          onTransfer && (
+            <>
+              <button
+                className="flex w-full items-center justify-center gap-2 rounded-lg border border-secondary-300 bg-secondary-200 p-2 text-sm font-semibold text-inherit transition-all hover:bg-secondary-300"
+                disabled={
+                  !shift.patient_object.allow_transfer ||
+                  !(
+                    ["DistrictAdmin", "StateAdmin"].includes(
+                      authUser.user_type,
+                    ) ||
+                    authUser.home_facility_object?.id ===
+                      shift.assigned_facility
+                  )
+                }
+                onClick={onTransfer}
+              >
+                {t("transfer_to_receiving_facility")}
+              </button>
+            </>
+          )}
       </div>
     </div>
   );
diff --git a/src/components/Shifting/ShiftingList.tsx b/src/components/Shifting/ShiftingList.tsx
index d4746ad434b..7161ea29441 100644
--- a/src/components/Shifting/ShiftingList.tsx
+++ b/src/components/Shifting/ShiftingList.tsx
@@ -1,29 +1,25 @@
-import careConfig from "@careConfig";
 import { navigate } from "raviger";
-import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AdvancedFilterButton } from "@/CAREUI/interactive/FiltersSlideover";
 
 import ButtonV2 from "@/components/Common/ButtonV2";
-import ConfirmDialog from "@/components/Common/ConfirmDialog";
 import { ExportButton } from "@/components/Common/Export";
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
-import { ShiftingModel } from "@/components/Facility/models";
 import SearchInput from "@/components/Form/SearchInput";
 import BadgesList from "@/components/Shifting/ShiftingBadges";
 import { formatFilter } from "@/components/Shifting/ShiftingCommons";
 import ListFilter from "@/components/Shifting/ShiftingFilters";
 
-import useAuthUser from "@/hooks/useAuthUser";
 import useFilters from "@/hooks/useFilters";
 
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useQuery from "@/Utils/request/useQuery";
-import { formatDateTime } from "@/Utils/utils";
+
+import ShiftingTable from "./ShiftingTable";
 
 export default function ListView() {
   const {
@@ -35,31 +31,7 @@ export default function ListView() {
     resultsPerPage,
   } = useFilters({ cacheBlacklist: ["patient_name"] });
 
-  const [modalFor, setModalFor] = useState<{
-    externalId: string | undefined;
-    loading: boolean;
-  }>({
-    externalId: undefined,
-    loading: false,
-  });
-
-  const authUser = useAuthUser();
   const { t } = useTranslation();
-
-  const handleTransferComplete = async (shift: ShiftingModel) => {
-    setModalFor({ ...modalFor, loading: true });
-    try {
-      await request(routes.completeTransfer, {
-        pathParams: { externalId: shift.external_id },
-      });
-      navigate(
-        `/facility/${shift.assigned_facility}/patient/${shift.patient}/consultation`,
-      );
-    } catch (error) {
-      setModalFor({ externalId: undefined, loading: false });
-    }
-  };
-
   const {
     data: shiftData,
     loading,
@@ -71,179 +43,6 @@ export default function ListView() {
     }),
   });
 
-  const showShiftingCardList = (data: ShiftingModel[]) => {
-    if (loading) {
-      return <Loading />;
-    }
-    if (data && !data.length) {
-      return (
-        <div className="mt-64 flex flex-1 justify-center text-secondary-600">
-          {t("no_patients_to_show")}
-        </div>
-      );
-    }
-
-    return data.map((shift: ShiftingModel) => (
-      <div
-        key={`shift_${shift.id}`}
-        className="w-full border-b-2 border-gray-100"
-      >
-        <div className="border-3 mx-3 flex grid w-full gap-1 overflow-hidden bg-white p-4 shadow sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-5">
-          <div className="col-span-1 px-2 text-left">
-            <div className="text-sm font-bold capitalize">
-              {shift.patient_object.name}
-            </div>
-            <div className="text-xs font-semibold capitalize">
-              {shift.patient_object.age}
-            </div>
-          </div>
-
-          <div className="col-span-1 flex flex-col px-2 text-left">
-            <div className="phone number">
-              <dt
-                title={t("phone_number")}
-                className="flex items-center text-sm font-medium leading-5 text-secondary-500"
-              >
-                <CareIcon icon="l-mobile-android" className="mr-2" />
-                <dd className="text-sm font-bold leading-5 text-secondary-900">
-                  {shift.patient_object.phone_number || ""}
-                </dd>
-              </dt>
-            </div>
-            <div className="address mt-1">
-              <dt
-                title={t("patient_address")}
-                className="flex items-center text-sm font-medium leading-5 text-secondary-500"
-              >
-                <CareIcon icon="l-home" className="mr-2" />
-                <dd className="font-xs leading-5 text-secondary-900">
-                  {shift.patient_object.address || "--"}
-                </dd>
-              </dt>
-            </div>
-          </div>
-
-          <div className="col-span-1 flex flex-col px-3 text-left">
-            <div className="3xl:flex-row mb-2 flex gap-2 sm:flex-row md:flex-row lg:flex-col xl:flex-row 2xl:flex-row">
-              <dt
-                title={t("shifting_status")}
-                className={`mt-1 flex h-5 shrink-0 items-center rounded-full px-2 py-0.5 text-xs font-medium leading-4 ${
-                  shift.status === "COMPLETED"
-                    ? "bg-sky-200"
-                    : "bg-yellow-200 text-yellow-500"
-                }`}
-              >
-                <CareIcon icon="l-truck" className="mr-2" />
-                <dd className="text-sky-600">{shift.status}</dd>
-              </dt>
-
-              <div>
-                {shift.emergency && (
-                  <span className="inline-block shrink-0 rounded-full bg-red-100 px-2 py-0.5 text-xs font-medium leading-4 text-red-800">
-                    {t("emergency")}
-                  </span>
-                )}
-              </div>
-            </div>
-
-            <div className="text-center">
-              <dt
-                title={t("last_modified")}
-                className={"flex items-center text-sm font-medium leading-5"}
-              >
-                <CareIcon icon="l-stopwatch" className="mr-1" />
-                <dd className="text-xs font-medium leading-5">
-                  {formatDateTime(shift.modified_date) || "--"}
-                </dd>
-              </dt>
-            </div>
-          </div>
-
-          <div className="col-span-1 text-left">
-            <dt
-              title={t("origin_facility")}
-              className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
-            >
-              <CareIcon icon="l-plane-departure" className="mr-2" />
-              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                {shift.origin_facility_object?.name}
-              </dd>
-            </dt>
-
-            {careConfig.wartimeShifting && (
-              <dt
-                title={t("shifting_approving_facility")}
-                className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
-              >
-                <CareIcon icon="l-user-check" className="mr-2" />
-                <dd className="text-sm font-bold leading-5 text-secondary-900">
-                  {shift.shifting_approving_facility_object?.name}
-                </dd>
-              </dt>
-            )}
-
-            <dt
-              title={t("assigned_facility")}
-              className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
-            >
-              <CareIcon icon="l-plane-arrival" className="mr-2" />
-              <dd className="text-sm font-bold leading-5 text-secondary-900">
-                {shift.assigned_facility_external ||
-                  shift.assigned_facility_object?.name ||
-                  t("yet_to_be_decided")}
-              </dd>
-            </dt>
-          </div>
-          <div className="col-span-1 mt-2 flex flex-col text-left">
-            <ButtonV2
-              onClick={(_) => navigate(`/shifting/${shift.external_id}`)}
-              variant="secondary"
-              border
-              className="w-full"
-            >
-              <CareIcon icon="l-eye" className="mr-2" /> {t("all_details")}
-            </ButtonV2>
-            {shift.status === "COMPLETED" && shift.assigned_facility && (
-              <div className="mt-2">
-                <ButtonV2
-                  className="w-full"
-                  disabled={
-                    !shift.patient_object.allow_transfer ||
-                    !(
-                      ["DistrictAdmin", "StateAdmin"].includes(
-                        authUser.user_type,
-                      ) ||
-                      authUser.home_facility_object?.id ===
-                        shift.assigned_facility
-                    )
-                  }
-                  onClick={() =>
-                    setModalFor({
-                      externalId: shift.external_id,
-                      loading: false,
-                    })
-                  }
-                >
-                  {t("transfer_to_receiving_facility")}
-                </ButtonV2>
-                <ConfirmDialog
-                  title={t("confirm_transfer_complete")}
-                  description={t("mark_transfer_complete_confirmation")}
-                  action="Confirm"
-                  show={modalFor.externalId === shift.external_id} // Check the externalId here
-                  onClose={() =>
-                    setModalFor({ externalId: undefined, loading: false })
-                  }
-                  onConfirm={() => handleTransferComplete(shift)}
-                />
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    ));
-  };
-
   return (
     <Page
       title={t("shifting")}
@@ -274,9 +73,6 @@ export default function ListView() {
           </div>
 
           <div className="mt-2 flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
-            <AdvancedFilterButton
-              onClick={() => advancedFilter.setShow(true)}
-            />
             <ButtonV2
               className="py-[11px]"
               onClick={() => navigate("/shifting/board", { query: qParams })}
@@ -284,11 +80,15 @@ export default function ListView() {
               <CareIcon icon="l-list-ul" className="rotate-90" />
               {t("board_view")}
             </ButtonV2>
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
           </div>
         </>
       }
     >
       <BadgesList {...{ qParams, FilterBadges }} />
+
       <div>
         {loading ? (
           <Loading />
@@ -307,27 +107,7 @@ export default function ListView() {
                 {t("refresh_list")}
               </button>
             </div>
-            <div>
-              <div className="mx-5 mt-5 grid w-full gap-2 border-b-2 border-gray-100 p-4 text-sm font-medium sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-5">
-                <div className="col-span-1 uppercase sm:text-center md:text-center lg:block lg:text-left">
-                  {t("patients")}
-                </div>
-                <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
-                  {t("contact_info")}
-                </div>
-                <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
-                  {t("consent__status")}
-                </div>
-                <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
-                  {t("facilities")}
-                </div>
-                <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
-                  {t("LOG_UPDATE_FIELD_LABEL__action")}
-                </div>
-              </div>
-              <div>{showShiftingCardList(shiftData?.results || [])}</div>
-            </div>
-
+            <ShiftingTable data={shiftData?.results} loading={loading} />
             <div>
               <Pagination totalCount={shiftData?.count || 0} />
             </div>
diff --git a/src/components/Shifting/ShiftingTable.tsx b/src/components/Shifting/ShiftingTable.tsx
new file mode 100644
index 00000000000..de186a13d56
--- /dev/null
+++ b/src/components/Shifting/ShiftingTable.tsx
@@ -0,0 +1,261 @@
+import careConfig from "@careConfig";
+import { navigate } from "raviger";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { cn } from "@/lib/utils";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import useAuthUser from "@/hooks/useAuthUser";
+
+import routes from "@/Utils/request/api";
+import request from "@/Utils/request/request";
+import { formatDateTime } from "@/Utils/utils";
+
+import ButtonV2 from "../Common/ButtonV2";
+import ConfirmDialog from "../Common/ConfirmDialog";
+import Loading from "../Common/Loading";
+import { ShiftingModel } from "../Facility/models";
+
+export default function ShiftingTable(props: {
+  data?: ShiftingModel[];
+  loading?: boolean;
+  hidePatient?: boolean;
+}) {
+  const { data, loading, hidePatient } = props;
+
+  const { t } = useTranslation();
+  const authUser = useAuthUser();
+  const [modalFor, setModalFor] = useState<{
+    externalId: string | undefined;
+    loading: boolean;
+  }>({
+    externalId: undefined,
+    loading: false,
+  });
+
+  const handleTransferComplete = async (shift: ShiftingModel) => {
+    setModalFor({ ...modalFor, loading: true });
+    try {
+      await request(routes.completeTransfer, {
+        pathParams: { externalId: shift.external_id },
+      });
+      navigate(
+        `/facility/${shift.assigned_facility}/patient/${shift.patient}/consultation`,
+      );
+    } catch (error) {
+      setModalFor({ externalId: undefined, loading: false });
+    }
+  };
+
+  if (loading) {
+    return <Loading />;
+  }
+  if (data && !data.length) {
+    return (
+      <div className="mt-64 flex flex-1 justify-center text-secondary-600">
+        {t("no_results_found")}
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      <div
+        className={cn(
+          " mt-5 grid w-full gap-2 border-b-2 border-gray-100 p-4 text-sm font-medium sm:grid-cols-1 md:grid-cols-1",
+          hidePatient ? "lg:grid-cols-4" : "lg:grid-cols-5",
+        )}
+      >
+        {!hidePatient && (
+          <div className="col-span-1 uppercase sm:text-center md:text-center lg:block lg:text-left">
+            {t("patients")}
+          </div>
+        )}
+        <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
+          {t("contact_info")}
+        </div>
+        <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
+          {t("consent__status")}
+        </div>
+        <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
+          {t("facilities")}
+        </div>
+        <div className="col-span-1 hidden text-left uppercase sm:hidden md:hidden lg:block">
+          {t("LOG_UPDATE_FIELD_LABEL__action")}
+        </div>
+      </div>
+      <div>
+        {data?.map((shift: ShiftingModel) => (
+          <div
+            key={`shift_${shift.id}`}
+            className="w-full border-b-2 border-gray-100"
+          >
+            <div
+              className={cn(
+                "border-3 grid w-full gap-1 overflow-hidden bg-white p-4 shadow sm:grid-cols-1 md:grid-cols-1",
+                hidePatient ? "lg:grid-cols-4" : "lg:grid-cols-5",
+              )}
+            >
+              {!hidePatient && (
+                <div className="col-span-1 px-2 text-left">
+                  <div className="text-sm font-bold capitalize">
+                    {shift.patient_object.name}
+                  </div>
+                  <div className="text-xs font-semibold capitalize">
+                    {shift.patient_object.age}
+                  </div>
+                </div>
+              )}
+
+              <div className="col-span-1 flex flex-col px-2 text-left">
+                <div className="phone number">
+                  <dt
+                    title={t("phone_number")}
+                    className="flex items-center text-sm font-medium leading-5 text-secondary-500"
+                  >
+                    <CareIcon icon="l-mobile-android" className="mr-2" />
+                    <dd className="text-sm font-bold leading-5 text-secondary-900">
+                      {shift.patient_object.phone_number || ""}
+                    </dd>
+                  </dt>
+                </div>
+                <div className="address mt-1">
+                  <dt
+                    title={t("patient_address")}
+                    className="flex items-center text-sm font-medium leading-5 text-secondary-500"
+                  >
+                    <CareIcon icon="l-home" className="mr-2" />
+                    <dd className="font-xs leading-5 text-secondary-900">
+                      {shift.patient_object.address || "--"}
+                    </dd>
+                  </dt>
+                </div>
+              </div>
+
+              <div className="col-span-1 flex flex-col px-3 text-left">
+                <div className="3xl:flex-row mb-2 flex gap-2 sm:flex-row md:flex-row lg:flex-col xl:flex-row 2xl:flex-row">
+                  <dt
+                    title={t("shifting_status")}
+                    className={`mt-1 flex h-5 shrink-0 items-center rounded-full px-2 py-0.5 text-xs font-medium leading-4 ${
+                      shift.status === "COMPLETED"
+                        ? "bg-sky-200"
+                        : "bg-yellow-200 text-yellow-500"
+                    }`}
+                  >
+                    <CareIcon icon="l-truck" className="mr-2" />
+                    <dd className="text-sky-600">{shift.status}</dd>
+                  </dt>
+
+                  <div>
+                    {shift.emergency && (
+                      <span className="inline-block shrink-0 rounded-full bg-red-100 px-2 py-0.5 text-xs font-medium leading-4 text-red-800">
+                        {t("emergency")}
+                      </span>
+                    )}
+                  </div>
+                </div>
+
+                <div className="text-center">
+                  <dt
+                    title={t("last_modified")}
+                    className={
+                      "flex items-center text-sm font-medium leading-5"
+                    }
+                  >
+                    <CareIcon icon="l-stopwatch" className="mr-1" />
+                    <dd className="text-xs font-medium leading-5">
+                      {formatDateTime(shift.modified_date) || "--"}
+                    </dd>
+                  </dt>
+                </div>
+              </div>
+
+              <div className="col-span-1 text-left">
+                <dt
+                  title={t("origin_facility")}
+                  className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
+                >
+                  <CareIcon icon="l-plane-departure" className="mr-2" />
+                  <dd className="text-sm font-bold leading-5 text-secondary-900">
+                    {shift.origin_facility_object?.name}
+                  </dd>
+                </dt>
+
+                {careConfig.wartimeShifting && (
+                  <dt
+                    title={t("shifting_approving_facility")}
+                    className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
+                  >
+                    <CareIcon icon="l-user-check" className="mr-2" />
+                    <dd className="text-sm font-bold leading-5 text-secondary-900">
+                      {shift.shifting_approving_facility_object?.name}
+                    </dd>
+                  </dt>
+                )}
+
+                <dt
+                  title={t("assigned_facility")}
+                  className="flex items-center text-left text-sm font-medium leading-5 text-secondary-500"
+                >
+                  <CareIcon icon="l-plane-arrival" className="mr-2" />
+                  <dd className="text-sm font-bold leading-5 text-secondary-900">
+                    {shift.assigned_facility_external ||
+                      shift.assigned_facility_object?.name ||
+                      t("yet_to_be_decided")}
+                  </dd>
+                </dt>
+              </div>
+              <div className="col-span-1 mt-2 flex flex-col text-left">
+                <ButtonV2
+                  onClick={(_) => navigate(`/shifting/${shift.external_id}`)}
+                  variant="secondary"
+                  border
+                  className="w-full"
+                >
+                  <CareIcon icon="l-eye" className="mr-2" /> {t("all_details")}
+                </ButtonV2>
+                {shift.status === "COMPLETED" && shift.assigned_facility && (
+                  <div className="mt-2">
+                    <ButtonV2
+                      className="w-full"
+                      disabled={
+                        !shift.patient_object.allow_transfer ||
+                        !(
+                          ["DistrictAdmin", "StateAdmin"].includes(
+                            authUser.user_type,
+                          ) ||
+                          authUser.home_facility_object?.id ===
+                            shift.assigned_facility
+                        )
+                      }
+                      onClick={() =>
+                        setModalFor({
+                          externalId: shift.external_id,
+                          loading: false,
+                        })
+                      }
+                    >
+                      {t("transfer_to_receiving_facility")}
+                    </ButtonV2>
+                    <ConfirmDialog
+                      title={t("confirm_transfer_complete")}
+                      description={t("mark_transfer_complete_confirmation")}
+                      action="Confirm"
+                      show={modalFor.externalId === shift.external_id} // Check the externalId here
+                      onClose={() =>
+                        setModalFor({ externalId: undefined, loading: false })
+                      }
+                      onConfirm={() => handleTransferComplete(shift)}
+                    />
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/Users/ManageUsers.tsx b/src/components/Users/ManageUsers.tsx
index 0b6a9149dbb..a1c00e5eaef 100644
--- a/src/components/Users/ManageUsers.tsx
+++ b/src/components/Users/ManageUsers.tsx
@@ -250,7 +250,7 @@ export default function ManageUsers() {
                 </div>
                 <div
                   id="name"
-                  className="mt-2 flex items-center gap-3 text-2xl font-bold capitalize"
+                  className="mt-2 flex gap-3 text-2xl font-bold capitalize"
                 >
                   <div className="max-w-full break-words">
                     {formatName(user)}
diff --git a/src/components/Users/UserProfile.tsx b/src/components/Users/UserProfile.tsx
index 15cedafab2e..7b0df12cac0 100644
--- a/src/components/Users/UserProfile.tsx
+++ b/src/components/Users/UserProfile.tsx
@@ -36,7 +36,6 @@ import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import useQuery from "@/Utils/request/useQuery";
 import {
-  classNames,
   dateQueryString,
   formatDate,
   formatDisplayName,
@@ -1006,31 +1005,34 @@ export default function UserProfile() {
             </p>
           </div>
         </div>
-        {updateStatus.isUpdateAvailable && (
-          <UpdatableApp silentlyAutoUpdate={false}>
-            <ButtonV2 disabled={true}>
+        <div className="mt-5 md:col-span-2 md:mt-0">
+          {updateStatus.isChecking ? (
+            // While checking for updates
+            <ButtonV2 disabled>
               <div className="flex items-center gap-4">
-                <CareIcon icon="l-exclamation" className="text-2xl" />
-                {t("update_available")}
+                <CareIcon icon="l-sync" className="text-2xl animate-spin" />
+                {t("checking_for_update")}
               </div>
             </ButtonV2>
-          </UpdatableApp>
-        )}
-        <div className="mt-5 md:col-span-2 md:mt-0">
-          {!updateStatus.isUpdateAvailable && (
-            <ButtonV2 disabled={updateStatus.isChecking} onClick={checkUpdates}>
-              {" "}
+          ) : updateStatus.isUpdateAvailable ? (
+            // When an update is available
+            <UpdatableApp silentlyAutoUpdate={false}>
+              <ButtonV2 disabled>
+                <div className="flex items-center gap-4">
+                  <CareIcon
+                    icon="l-exclamation"
+                    className="text-2xl text-warning"
+                  />
+                  {t("update_available")}
+                </div>
+              </ButtonV2>
+            </UpdatableApp>
+          ) : (
+            // Default state to check for updates
+            <ButtonV2 onClick={checkUpdates}>
               <div className="flex items-center gap-4">
-                <CareIcon
-                  icon="l-sync"
-                  className={classNames(
-                    "text-2xl",
-                    updateStatus.isChecking && "animate-spin",
-                  )}
-                />
-                {updateStatus.isChecking
-                  ? t("checking_for_update")
-                  : t("check_for_update")}
+                <CareIcon icon="l-sync" className="text-2xl" />
+                {t("check_for_update")}
               </div>
             </ButtonV2>
           )}
diff --git a/src/hooks/useFileUpload.tsx b/src/hooks/useFileUpload.tsx
index 56f0d337a5e..d580ad7d557 100644
--- a/src/hooks/useFileUpload.tsx
+++ b/src/hooks/useFileUpload.tsx
@@ -249,6 +249,11 @@ export default function useFileUpload(
     setUploadFileNames([]);
   };
 
+  const clearFiles = () => {
+    setFiles([]);
+    setUploadFileNames([]);
+  };
+
   const Dialogues = (
     <>
       <CameraCaptureDialog
@@ -257,6 +262,7 @@ export default function useFileUpload(
         onCapture={(file) => {
           setFiles((prev) => [...prev, file]);
         }}
+        onResetCapture={clearFiles}
       />
       <AudioCaptureDialog
         show={audioModalOpen}
@@ -309,10 +315,7 @@ export default function useFileUpload(
       setFiles((prev) => prev.filter((_, i) => i !== index));
       setUploadFileNames((prev) => prev.filter((_, i) => i !== index));
     },
-    clearFiles: () => {
-      setFiles([]);
-      setUploadFileNames([]);
-    },
+    clearFiles,
     uploading,
   };
 }