diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 67628d414c8..3c9d6aa28cb 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -11,6 +11,10 @@ on:
       - master
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   IMAGE_NAME: care_fe
   AWS_DEFAULT_REGION: ap-south-1
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index 4fef861aeab..57bae83a880 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -111,7 +111,9 @@ describe("Patient Creation with consultation", () => {
     updatePatientPage.visitConsultationPage();
     patientPage.verifyStatusCode();
     patientConsultationPage.fillIllnessHistory("history");
-    patientConsultationPage.selectConsultationStatus("Out-patient (walk in)");
+    patientConsultationPage.selectConsultationStatus(
+      "Outpatient/Emergency Room"
+    );
     patientConsultationPage.selectSymptoms("ASYMPTOMATIC");
 
     patientConsultationPage.enterConsultationDetails(
@@ -140,9 +142,6 @@ describe("Patient Creation with consultation", () => {
     updatePatientPage.visitUpdatedPatient();
     patientConsultationPage.visitEditConsultationPage();
     patientConsultationPage.fillIllnessHistory("editted");
-    patientConsultationPage.selectConsultationStatus(
-      "Referred from other hospital"
-    );
     patientConsultationPage.updateSymptoms("FEVER");
     patientConsultationPage.setSymptomsDate("01082023");
     patientConsultationPage.updateConsultation();
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index ce1fdc1e393..4fb299a4965 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -1,8 +1,8 @@
 export class PatientConsultationPage {
   selectConsultationStatus(status: string) {
-    cy.get("#consultation_status").scrollIntoView();
-    cy.get("#consultation_status").should("be.visible");
-    cy.get("#consultation_status")
+    cy.get("#route_to_facility").scrollIntoView();
+    cy.get("#route_to_facility").should("be.visible");
+    cy.get("#route_to_facility")
       .click()
       .then(() => {
         cy.get("[role='option']").contains(status).click();
@@ -60,7 +60,7 @@ export class PatientConsultationPage {
     cy.get("#principal-diagnosis-select [role='option']").first().click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);
-    cy.get("#verified_by")
+    cy.get("#treating_physician")
       .click()
       .type(verificationBy)
       .then(() => {
@@ -203,12 +203,13 @@ export class PatientConsultationPage {
   }
 
   addDoctorsNotes(notes: string) {
+    cy.get("#expand_doctor_notes").click();
     cy.get("#doctor_notes_textarea").type(notes);
   }
 
   postDoctorNotes() {
     cy.intercept("POST", "**/api/v1/patient/*/notes").as("postDoctorNotes");
-    cy.get("#submit").contains("Post Your Note").click();
+    cy.get("#add_doctor_note_button").click();
     cy.wait("@postDoctorNotes").its("response.statusCode").should("eq", 201);
   }
 
diff --git a/package-lock.json b/package-lock.json
index d65f617ec05..ebb35bc465c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,6 +46,7 @@
         "react-dom": "18.2.0",
         "react-google-recaptcha": "^3.1.0",
         "react-i18next": "^13.0.1",
+        "react-infinite-scroll-component": "^6.1.0",
         "react-markdown": "^8.0.7",
         "react-player": "^2.13.0",
         "react-qr-reader": "^2.2.1",
@@ -19399,6 +19400,17 @@
         }
       }
     },
+    "node_modules/react-infinite-scroll-component": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-infinite-scroll-component/-/react-infinite-scroll-component-6.1.0.tgz",
+      "integrity": "sha512-SQu5nCqy8DxQWpnUVLx7V7b7LcA37aM7tvoWjTLZp1dk6EJibM5/4EJKzOnl07/BsM1Y40sKLuqjCwwH/xV0TQ==",
+      "dependencies": {
+        "throttle-debounce": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0"
+      }
+    },
     "node_modules/react-inspector": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-6.0.2.tgz",
@@ -21527,6 +21539,14 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/throttle-debounce": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
+      "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/throttleit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
diff --git a/package.json b/package.json
index ca3f6920a12..cbe2267c40d 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "react-dom": "18.2.0",
     "react-google-recaptcha": "^3.1.0",
     "react-i18next": "^13.0.1",
+    "react-infinite-scroll-component": "^6.1.0",
     "react-markdown": "^8.0.7",
     "react-player": "^2.13.0",
     "react-qr-reader": "^2.2.1",
diff --git a/src/CAREUI/icons/UniconPaths.json b/src/CAREUI/icons/UniconPaths.json
index 9a2673695aa..c2ed7ecf467 100644
--- a/src/CAREUI/icons/UniconPaths.json
+++ b/src/CAREUI/icons/UniconPaths.json
@@ -3107,10 +3107,7 @@
     24,
     "M19,2H5A3,3,0,0,0,2,5V19a3,3,0,0,0,3,3H19a3,3,0,0,0,3-3V5A3,3,0,0,0,19,2Zm1,17a1,1,0,0,1-1,1H5a1,1,0,0,1-1-1V5A1,1,0,0,1,5,4H19a1,1,0,0,1,1,1Zm-4-8H8a1,1,0,0,0,0,2h8a1,1,0,0,0,0-2Z"
   ],
-  "l-minus": [
-    24,
-    "M19,11H5a1,1,0,0,0,0,2H19a1,1,0,0,0,0-2Z"
-  ],
+  "l-minus": [24, "M19,11H5a1,1,0,0,0,0,2H19a1,1,0,0,0,0-2Z"],
   "l-missed-call": [
     24,
     "M6,7.49a1,1,0,0,0,1-1V5.9L9.88,8.78a3,3,0,0,0,4.24,0l4.59-4.59a1,1,0,0,0,0-1.41,1,1,0,0,0-1.42,0L12.71,7.36a1,1,0,0,1-1.42,0L8.41,4.49H9a1,1,0,0,0,0-2H6a1,1,0,0,0-.92.61A1.09,1.09,0,0,0,5,3.49v3A1,1,0,0,0,6,7.49Zm15.94,7.36a16.27,16.27,0,0,0-19.88,0,2.69,2.69,0,0,0-1,2,2.66,2.66,0,0,0,.78,2.07L3.6,20.72A2.68,2.68,0,0,0,7.06,21l.47-.32a8.13,8.13,0,0,1,1-.55,1.85,1.85,0,0,0,1-2.3l-.09-.24a10.49,10.49,0,0,1,5.22,0l-.09.24a1.85,1.85,0,0,0,1,2.3,8.13,8.13,0,0,1,1,.55l.47.32a2.58,2.58,0,0,0,1.54.5,2.72,2.72,0,0,0,1.92-.79l1.81-1.82A2.66,2.66,0,0,0,23,16.83,2.69,2.69,0,0,0,21.94,14.85ZM20.8,17.49,19,19.3a.68.68,0,0,1-.86.1c-.19-.14-.38-.27-.59-.4a11.65,11.65,0,0,0-1.09-.61l.4-1.09a1,1,0,0,0-.6-1.28,12.42,12.42,0,0,0-8.5,0,1,1,0,0,0-.6,1.28l.4,1.1a9.8,9.8,0,0,0-1.1.6l-.58.4A.66.66,0,0,1,5,19.3L3.2,17.49A.67.67,0,0,1,3,17a.76.76,0,0,1,.28-.53,14.29,14.29,0,0,1,17.44,0A.76.76,0,0,1,21,17,.67.67,0,0,1,20.8,17.49Z"
@@ -4295,10 +4292,7 @@
     24,
     "M15,13H9a1,1,0,0,0,0,2h2v2a1,1,0,0,0,2,0V15h2a1,1,0,0,0,0-2Zm2-7H7A1,1,0,0,0,7,8h4v2a1,1,0,0,0,2,0V8h4a1,1,0,0,0,0-2Z"
   ],
-  "l-text": [
-    24,
-    "M17,6H7A1,1,0,0,0,7,8h4v9a1,1,0,0,0,2,0V8h4a1,1,0,0,0,0-2Z"
-  ],
+  "l-text": [24, "M17,6H7A1,1,0,0,0,7,8h4v9a1,1,0,0,0,2,0V8h4a1,1,0,0,0,0-2Z"],
   "l-th-large": [
     24,
     "M20,3H4A1,1,0,0,0,3,4V20a1,1,0,0,0,1,1H20a1,1,0,0,0,1-1V4A1,1,0,0,0,20,3ZM11,19H5V13h6Zm0-8H5V5h6Zm8,8H13V13h6Zm0-8H13V5h6Z"
@@ -4841,4 +4835,4 @@
     256,
     "M204.73 51.85A108.07 108.07 0 0 0 20 128v56a28 28 0 0 0 28 28h16a28 28 0 0 0 28-28v-40a28 28 0 0 0-28-28H44.84A84.05 84.05 0 0 1 128 44h.64a83.7 83.7 0 0 1 82.52 72H192a28 28 0 0 0-28 28v40a28 28 0 0 0 28 28h19.6a20 20 0 0 1-19.6 16h-56a12 12 0 0 0 0 24h56a44.05 44.05 0 0 0 44-44v-80a107.34 107.34 0 0 0-31.27-76.15ZM64 140a4 4 0 0 1 4 4v40a4 4 0 0 1-4 4H48a4 4 0 0 1-4-4v-44Zm124 44v-40a4 4 0 0 1 4-4h20v48h-20a4 4 0 0 1-4-4Z"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
index 0d2445ffbc9..02ee0e3d90e 100644
--- a/src/CAREUI/misc/PaginatedList.tsx
+++ b/src/CAREUI/misc/PaginatedList.tsx
@@ -121,7 +121,7 @@ PaginatedList.Refresh = Refresh;
 
 interface ItemsProps<TItem> {
   className?: string;
-  children: (item: TItem) => JSX.Element | JSX.Element[];
+  children: (item: TItem, items: TItem[]) => JSX.Element | JSX.Element[];
   shimmer?: JSX.Element;
   shimmerCount?: number;
 }
@@ -137,9 +137,9 @@ const Items = <TItem extends object>(props: ItemsProps<TItem>) => {
               {props.shimmer}
             </li>
           ))
-        : items.map((item, index) => (
+        : items.map((item, index, items) => (
             <li key={index} className="w-full">
-              {props.children(item)}
+              {props.children(item, items)}
             </li>
           ))}
     </ul>
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index 0b08b4b9a42..065e7ccd759 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -332,14 +332,6 @@ export const CONSULTATION_SUGGESTION = [
   { id: "DD", text: "Declare Death" },
 ];
 
-export const CONSULTATION_STATUS = [
-  { id: "1", text: "Brought Dead" },
-  { id: "2", text: "Transferred from ward" },
-  { id: "3", text: "Transferred from ICU" },
-  { id: "4", text: "Referred from other hospital" },
-  { id: "5", text: "Out-patient (walk in)" },
-];
-
 export const ADMITTED_TO = [
   { id: "1", text: "Isolation" },
   { id: "2", text: "ICU" },
@@ -610,6 +602,11 @@ export const NOTIFICATION_EVENTS = [
     text: "Shifting Updated",
     icon: "fa-solid fa-truck-medical",
   },
+  {
+    id: "PATIENT_NOTE_ADDED",
+    text: "Patient Note Added",
+    icon: "fa-solid fa-message",
+  },
 ];
 
 export const BREATHLESSNESS_LEVEL = [
@@ -1023,6 +1020,23 @@ export const XLSXAssetImportSchema = {
   },
 };
 
+export const USER_TYPES_MAP = {
+  Pharmacist: "Pharmacist",
+  Volunteer: "Volunteer",
+  StaffReadOnly: "Staff",
+  Staff: "Staff",
+  Doctor: "Doctor",
+  WardAdmin: "Ward Admin",
+  LocalBodyAdmin: "Local Body Admin",
+  DistrictLabAdmin: "District Lab Admin",
+  DistrictReadOnlyAdmin: "District Admin",
+  DistrictAdmin: "District Admin",
+  StateLabAdmin: "State Lab Admin",
+  StateReadOnlyAdmin: "State Admin",
+  StateAdmin: "State Admin",
+  RemoteSpecialist: "Remote Specialist",
+};
+
 export const AREACODES: Record<string, string[]> = {
   CA: [
     "403",
diff --git a/src/Components/ABDM/ConfigureHealthFacility.tsx b/src/Components/ABDM/ConfigureHealthFacility.tsx
index 16e6bf90ea4..a84e4b6d4b9 100644
--- a/src/Components/ABDM/ConfigureHealthFacility.tsx
+++ b/src/Components/ABDM/ConfigureHealthFacility.tsx
@@ -1,7 +1,7 @@
 import { lazy, useReducer, useState } from "react";
 import * as Notification from "../../Utils/Notifications.js";
 import { navigate } from "raviger";
-import { Cancel, Submit } from "../Common/components/ButtonV2";
+import { Submit } from "../Common/components/ButtonV2";
 import TextFormField from "../Form/FormFields/TextFormField";
 import { classNames } from "../../Utils/utils";
 import useQuery from "../../Utils/request/useQuery";
@@ -218,7 +218,6 @@ export const ConfigureHealthFacility = (props: any) => {
           </div>
         </div>
         <div className="flex flex-col gap-3 sm:flex-row sm:justify-end">
-          <Cancel onClick={() => navigate(`/facility/${facilityId}`)} />
           <Submit
             onClick={handleSubmit}
             disabled={
diff --git a/src/Components/Assets/AssetServiceEditModal.tsx b/src/Components/Assets/AssetServiceEditModal.tsx
index 3964dfe0770..13a91e36477 100644
--- a/src/Components/Assets/AssetServiceEditModal.tsx
+++ b/src/Components/Assets/AssetServiceEditModal.tsx
@@ -192,6 +192,7 @@ export const AssetServiceEditModal = (props: {
                 className="mt-2"
                 position="LEFT"
                 value={new Date(form.serviced_on)}
+                max={new Date(props.service_record.created_date)}
                 onChange={(date) => {
                   if (
                     dayjs(date.value).format("YYYY-MM-DD") >
diff --git a/src/Components/Assets/AssetsList.tsx b/src/Components/Assets/AssetsList.tsx
index 8c19928fbee..447bff1c1d0 100644
--- a/src/Components/Assets/AssetsList.tsx
+++ b/src/Components/Assets/AssetsList.tsx
@@ -63,6 +63,10 @@ const AssetsList = () => {
     asset_class: qParams.asset_class || "",
     location: qParams.facility ? qParams.location || "" : "",
     status: qParams.status || "",
+    warranty_amc_end_of_validity_before:
+      qParams.warranty_amc_end_of_validity_before || "",
+    warranty_amc_end_of_validity_after:
+      qParams.warranty_amc_end_of_validity_after || "",
   };
 
   const { loading } = useQuery(routes.listAssets, {
@@ -189,12 +193,12 @@ const AssetsList = () => {
           <Link
             key={asset.id}
             href={`/facility/${asset?.location_object.facility.id}/assets/${asset.id}`}
-            className="text-inherit"
+            className="h-full text-inherit"
             data-testid="created-asset-list"
           >
             <div
               key={asset.id}
-              className="border-1 w-full cursor-pointer items-center justify-center rounded-lg border border-transparent bg-white p-5 shadow hover:border-primary-500"
+              className="border-1 h-full w-full cursor-pointer items-center justify-center rounded-lg border border-transparent bg-white p-5 shadow hover:border-primary-500"
             >
               <div className="md:flex">
                 <p className="flex break-words text-xl font-medium capitalize">
diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index 95652e68638..da974fbe0e9 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -4,6 +4,8 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import { Popover } from "@headlessui/react";
 import { classNames } from "../../Utils/utils";
 import dayjs from "../../Utils/dayjs";
+import * as Notification from "../../Utils/Notifications.js";
+import { t } from "i18next";
 
 type DatePickerType = "date" | "month" | "year";
 export type DatePickerPosition = "LEFT" | "RIGHT" | "CENTER";
@@ -16,6 +18,7 @@ interface Props {
   value: Date | undefined;
   min?: Date;
   max?: Date;
+  outOfLimitsErrorMessage?: string;
   onChange: (date: Date) => void;
   position?: DatePickerPosition;
   disabled?: boolean;
@@ -34,6 +37,7 @@ const DateInputV2: React.FC<Props> = ({
   value,
   min,
   max,
+  outOfLimitsErrorMessage,
   onChange,
   position,
   disabled,
@@ -100,16 +104,21 @@ const DateInputV2: React.FC<Props> = ({
   ) => void;
 
   const setDateValue = (date: number, close: CloseFunction) => () => {
-    isDateWithinConstraints(date) &&
-      onChange(
-        new Date(
-          datePickerHeaderDate.getFullYear(),
-          datePickerHeaderDate.getMonth(),
-          date
-        )
-      );
-    close();
-    setIsOpen?.(false);
+    isDateWithinConstraints(date)
+      ? (() => {
+          onChange(
+            new Date(
+              datePickerHeaderDate.getFullYear(),
+              datePickerHeaderDate.getMonth(),
+              date
+            )
+          );
+          close();
+          setIsOpen?.(false);
+        })()
+      : Notification.Error({
+          msg: outOfLimitsErrorMessage ?? "Cannot select date out of range",
+        });
   };
 
   const getDayCount = (date: Date) => {
@@ -220,7 +229,7 @@ const DateInputV2: React.FC<Props> = ({
                   readOnly
                   disabled={disabled}
                   className={`cui-input-base cursor-pointer disabled:cursor-not-allowed ${className}`}
-                  placeholder={placeholder ?? "Select date"}
+                  placeholder={placeholder ?? t("select_date")}
                   value={value && dayjs(value).format("DD/MM/YYYY")}
                 />
                 <div className="absolute right-0 top-1/2 -translate-y-1/2 p-2">
@@ -248,7 +257,7 @@ const DateInputV2: React.FC<Props> = ({
                             [dd, mm, yyyy].filter(Boolean).join("/")
                         ) || ""
                       } // Display the value in DD/MM/YYYY format
-                      placeholder="DD/MM/YYYY"
+                      placeholder={t("DD/MM/YYYY")}
                       onChange={(e) => {
                         setDisplayValue(e.target.value.replaceAll("/", ""));
                         const value = dayjs(e.target.value, "DD/MM/YYYY", true);
@@ -330,26 +339,41 @@ const DateInputV2: React.FC<Props> = ({
                             className="aspect-square w-[14.26%] border border-transparent p-1 text-center text-sm"
                           />
                         ))}
-                        {dayCount.map((d, i) => (
-                          <div
-                            key={i}
-                            id={`date-${d}`}
-                            className="aspect-square w-[14.26%]"
-                          >
+                        {dayCount.map((d, i) => {
+                          const withinConstraints = isDateWithinConstraints(d);
+                          const selected = value && isSelectedDate(d);
+
+                          const baseClasses =
+                            "flex h-full items-center justify-center rounded text-center text-sm leading-loose transition duration-100 ease-in-out";
+                          let conditionalClasses = "";
+
+                          if (withinConstraints) {
+                            if (selected) {
+                              conditionalClasses =
+                                "bg-primary-500 font-bold text-white";
+                            } else {
+                              conditionalClasses =
+                                "hover:bg-gray-300 cursor-pointer";
+                            }
+                          } else {
+                            conditionalClasses =
+                              "!cursor-not-allowed !text-gray-400";
+                          }
+                          return (
                             <div
-                              onClick={setDateValue(d, close)}
-                              className={classNames(
-                                "flex h-full cursor-pointer items-center justify-center rounded text-center text-sm leading-loose text-black transition duration-100 ease-in-out",
-                                value && isSelectedDate(d)
-                                  ? "bg-primary-500 font-bold text-white"
-                                  : "hover:bg-gray-300",
-                                !isDateWithinConstraints(d) && "!text-gray-300"
-                              )}
+                              key={i}
+                              id={`date-${d}`}
+                              className="aspect-square w-[14.26%]"
                             >
-                              {d}
+                              <div
+                                onClick={setDateValue(d, close)}
+                                className={`${baseClasses} ${conditionalClasses}`}
+                              >
+                                {d}
+                              </div>
                             </div>
-                          </div>
-                        ))}
+                          );
+                        })}
                       </div>
                     </>
                   )}
diff --git a/src/Components/Common/FilePreviewDialog.tsx b/src/Components/Common/FilePreviewDialog.tsx
index b7eda93930e..90dde50a249 100644
--- a/src/Components/Common/FilePreviewDialog.tsx
+++ b/src/Components/Common/FilePreviewDialog.tsx
@@ -192,6 +192,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                           />
                         ) : (
                           <iframe
+                            sandbox
                             title="Source Files"
                             src={fileUrl}
                             className="mx-auto h-5/6 w-5/6 border-2 border-black bg-white md:my-6 md:w-4/6"
diff --git a/src/Components/Common/RelativeDateUserMention.tsx b/src/Components/Common/RelativeDateUserMention.tsx
index 55c7a81518b..18fb431574f 100644
--- a/src/Components/Common/RelativeDateUserMention.tsx
+++ b/src/Components/Common/RelativeDateUserMention.tsx
@@ -8,7 +8,7 @@ function RelativeDateUserMention(props: {
   tooltipPosition?: "top" | "bottom" | "left" | "right";
 }) {
   return (
-    <div className="flex flex-row items-center">
+    <div className="flex flex-row flex-wrap items-center justify-center ">
       <div className="tooltip">
         <span
           className={`tooltip-text tooltip-${props.tooltipPosition || "top"}`}
diff --git a/src/Components/Common/RouteToFacilitySelect.tsx b/src/Components/Common/RouteToFacilitySelect.tsx
new file mode 100644
index 00000000000..0f36d632e42
--- /dev/null
+++ b/src/Components/Common/RouteToFacilitySelect.tsx
@@ -0,0 +1,31 @@
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import {
+  FormFieldBaseProps,
+  useFormFieldPropsResolver,
+} from "../Form/FormFields/Utils";
+
+export const ROUTE_TO_FACILITY_OPTIONS = {
+  10: "Outpatient/Emergency Room",
+  20: "Referred from another facility",
+  30: "Internal Transfer within the facility",
+};
+
+export type RouteToFacility = keyof typeof ROUTE_TO_FACILITY_OPTIONS;
+
+export const keys = Object.keys(ROUTE_TO_FACILITY_OPTIONS).map((key) =>
+  parseInt(key)
+) as RouteToFacility[];
+
+type Props = FormFieldBaseProps<keyof typeof ROUTE_TO_FACILITY_OPTIONS>;
+
+export default function RouteToFacilitySelect(props: Props) {
+  const field = useFormFieldPropsResolver(props as any);
+
+  return (
+    <SelectFormField
+      {...field}
+      options={keys}
+      optionLabel={(key) => ROUTE_TO_FACILITY_OPTIONS[key]}
+    />
+  );
+}
diff --git a/src/Components/Facility/AddBedForm.tsx b/src/Components/Facility/AddBedForm.tsx
index 3bb49733141..785c90869ba 100644
--- a/src/Components/Facility/AddBedForm.tsx
+++ b/src/Components/Facility/AddBedForm.tsx
@@ -229,12 +229,21 @@ export const AddBedForm = (props: BedFormProps) => {
                   min={1}
                   max={100}
                   onChange={(e) => setNumberOfBeds(Number(e.value))}
+                  error={
+                    numberOfBeds > 100
+                      ? "Number of beds cannot be greater than 100"
+                      : undefined
+                  }
                 />
               </>
             )}
             <div className="mt-4 flex flex-col gap-3 sm:flex-row sm:justify-end">
               <Cancel onClick={handleCancel} />
-              <Submit onClick={handleSubmit} label={buttonText} />
+              <Submit
+                onClick={handleSubmit}
+                label={buttonText}
+                disabled={numberOfBeds > 100}
+              />
             </div>
           </form>
         </Card>
diff --git a/src/Components/Facility/AddInventoryForm.tsx b/src/Components/Facility/AddInventoryForm.tsx
index 22be0b9fd0c..df217cad3ec 100644
--- a/src/Components/Facility/AddInventoryForm.tsx
+++ b/src/Components/Facility/AddInventoryForm.tsx
@@ -16,6 +16,7 @@ import TextFormField from "../Form/FormFields/TextFormField";
 import { InventoryItemsModel } from "./models";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import useAppHistory from "../../Common/hooks/useAppHistory";
+
 const Loading = lazy(() => import("../Common/Loading"));
 
 const initForm = {
@@ -122,6 +123,7 @@ export const AddInventoryForm = (props: any) => {
         setFacilityName("");
       }
     }
+
     fetchFacilityName();
   }, [dispatchAction, facilityId]);
 
@@ -327,7 +329,7 @@ export const AddInventoryForm = (props: any) => {
                 />
               </div>
             </div>
-            <div className="mt-4 flex flex-col justify-between gap-2 md:flex-row">
+            <div className="cui-form-button-group">
               <Cancel onClick={() => goBack()} />
               <Submit onClick={handleSubmit} label="Add/Update Inventory" />
             </div>
diff --git a/src/Components/Facility/AssetCreate.tsx b/src/Components/Facility/AssetCreate.tsx
index 84fc09188d0..a1e06a8c7ab 100644
--- a/src/Components/Facility/AssetCreate.tsx
+++ b/src/Components/Facility/AssetCreate.tsx
@@ -883,6 +883,7 @@ const AssetCreate = (props: AssetProps) => {
                         name="last_serviced_on"
                         className="mt-2"
                         position="RIGHT"
+                        disableFuture
                         value={last_serviced_on && new Date(last_serviced_on)}
                         onChange={(date) => {
                           if (
diff --git a/src/Components/Facility/ConsultationCard.tsx b/src/Components/Facility/ConsultationCard.tsx
index 4859b981e8f..2c0fa54db21 100644
--- a/src/Components/Facility/ConsultationCard.tsx
+++ b/src/Components/Facility/ConsultationCard.tsx
@@ -112,21 +112,25 @@ export const ConsultationCard = (props: ConsultationProps) => {
       <div className="mt-8 flex flex-col">
         {
           <div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
-            Created:{" "}
+            Created :{" "}
+            <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-gray-700 md:flex-row">
+          Last Modified :{" "}
+          <div className=" ml-1 text-black">
             <RelativeDateUserMention
               tooltipPosition="right"
-              actionDate={itemData.created_date}
-              user={itemData.created_by}
+              actionDate={itemData.modified_date}
+              user={itemData.last_edited_by}
             />
           </div>
-        }
-        <div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
-          Last Modified:{" "}
-          <RelativeDateUserMention
-            tooltipPosition="right"
-            actionDate={itemData.modified_date}
-            user={itemData.last_edited_by}
-          />
         </div>
       </div>
       <div className="mt-4 flex w-full flex-col justify-between gap-1 md:flex-row">
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 6a5a5da242c..7e7664707eb 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -23,9 +23,8 @@ import PatientInfoCard from "../../Patient/PatientInfoCard";
 import { PatientModel } from "../../Patient/models";
 import { formatDateTime, relativeTime } from "../../../Utils/utils";
 
-import { navigate } from "raviger";
+import { navigate, useQueryParams } from "raviger";
 import { useDispatch } from "react-redux";
-import { useQueryParams } from "raviger";
 import { useTranslation } from "react-i18next";
 import { triggerGoal } from "../../../Integrations/Plausible";
 import useAuthUser from "../../../Common/hooks/useAuthUser";
@@ -42,6 +41,7 @@ import { ConsultationPressureSoreTab } from "./ConsultationPressureSoreTab";
 import { ConsultationDialysisTab } from "./ConsultationDialysisTab";
 import { ConsultationNeurologicalMonitoringTab } from "./ConsultationNeurologicalMonitoringTab";
 import { ConsultationNutritionTab } from "./ConsultationNutritionTab";
+import PatientNotesSlideover from "../PatientNotesSlideover";
 import LegacyDiagnosesList from "../../Diagnosis/LegacyDiagnosesList";
 
 const Loading = lazy(() => import("../../Common/Loading"));
@@ -105,6 +105,7 @@ export const ConsultationDetails = (props: any) => {
       return "None";
     }
   };
+  const [showPatientNotesPopup, setShowPatientNotesPopup] = useState(false);
 
   const authUser = useAuthUser();
 
@@ -370,7 +371,7 @@ export const ConsultationDetails = (props: any) => {
             </Link>
             <Link
               id="patient_doctor_notes"
-              href={`/facility/${patientData.facility}/patient/${patientData.id}/notes`}
+              onClick={() => setShowPatientNotesPopup(true)}
               className="btn btn-primary m-1 w-full hover:text-white"
             >
               Doctor&apos;s Notes
@@ -434,14 +435,14 @@ export const ConsultationDetails = (props: any) => {
                   diagnoses={consultationData.diagnoses || []}
                 />
 
-                {(consultationData.verified_by_object ||
+                {(consultationData.treating_physician_object ||
                   consultationData.deprecated_verified_by) && (
                   <div className="mt-2 text-sm">
                     <span className="font-semibold leading-relaxed">
                       Treating Physician:{" "}
                     </span>
-                    {consultationData.verified_by_object
-                      ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
+                    {consultationData.treating_physician_object
+                      ? `${consultationData.treating_physician_object.first_name} ${consultationData.treating_physician_object.last_name}`
                       : consultationData.deprecated_verified_by}
                     <i className="fas fa-check ml-2 fill-current text-lg text-green-500"></i>
                   </div>
@@ -540,6 +541,14 @@ export const ConsultationDetails = (props: any) => {
         show={showDoctors}
         setShow={setShowDoctors}
       />
+
+      {showPatientNotesPopup && (
+        <PatientNotesSlideover
+          patientId={patientId}
+          facilityId={facilityId}
+          setShowPatientNotesPopup={setShowPatientNotesPopup}
+        />
+      )}
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 10397f4e79a..091be6b5968 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -2,7 +2,6 @@ import * as Notification from "../../Utils/Notifications.js";
 
 import { BedModel, FacilityModel } from "./models";
 import {
-  CONSULTATION_STATUS,
   CONSULTATION_SUGGESTION,
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
@@ -59,6 +58,11 @@ import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
 import useVisibility from "../../Utils/useVisibility";
 import dayjs from "../../Utils/dayjs";
+import RouteToFacilitySelect, {
+  RouteToFacility,
+} from "../Common/RouteToFacilitySelect.js";
+import { LocationSelect } from "../Common/LocationSelect.js";
+import { classNames } from "../../Utils/utils.js";
 import {
   ConditionVerificationStatuses,
   ConsultationDiagnosis,
@@ -79,20 +83,25 @@ type FormDetails = {
   other_symptoms: string;
   symptoms_onset_date?: Date;
   suggestion: string;
-  consultation_status: number;
+  route_to_facility?: RouteToFacility;
   patient: string;
   facility: string;
   admitted: BooleanStrings;
   admitted_to: string;
   category: string;
   admission_date?: Date;
+  icu_admission_date?: Date;
   discharge_date: null;
   referred_to?: string;
   referred_to_external?: string;
+  referred_from_facility?: string;
+  referred_from_facility_external?: string;
+  referred_by_external?: string;
+  transferred_from_location?: string;
+  treating_physician: string;
+  treating_physician_object: UserModel | null;
   create_diagnoses: CreateDiagnosis[];
   diagnoses: ConsultationDiagnosis[];
-  verified_by: string;
-  verified_by_object: UserModel | null;
   is_kasp: BooleanStrings;
   kasp_enabled_date: null;
   examination_details: string;
@@ -124,20 +133,25 @@ const initForm: FormDetails = {
   other_symptoms: "",
   symptoms_onset_date: undefined,
   suggestion: "A",
-  consultation_status: 0,
+  route_to_facility: undefined,
   patient: "",
   facility: "",
   admitted: "false",
   admitted_to: "",
   category: "",
   admission_date: new Date(),
+  icu_admission_date: undefined,
   discharge_date: null,
   referred_to: "",
   referred_to_external: "",
+  referred_from_facility: "",
+  referred_from_facility_external: "",
+  referred_by_external: "",
+  transferred_from_location: "",
+  treating_physician: "",
+  treating_physician_object: null,
   create_diagnoses: [],
   diagnoses: [],
-  verified_by: "",
-  verified_by_object: null,
   is_kasp: "false",
   kasp_enabled_date: null,
   examination_details: "",
@@ -224,7 +238,9 @@ export const ConsultationForm = (props: any) => {
     initialState
   );
   const [bed, setBed] = useState<BedModel | BedModel[] | null>(null);
-  const [selectedFacility, setSelectedFacility] =
+  const [referredToFacility, setReferredToFacility] =
+    useState<FacilityModel | null>(null);
+  const [referredFromFacility, setReferredFromFacility] =
     useState<FacilityModel | null>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [patientName, setPatientName] = useState("");
@@ -307,26 +323,13 @@ export const ConsultationForm = (props: any) => {
   const isOtherSymptomsSelected = state.form.symptoms.includes(9);
 
   const handleFormFieldChange: FieldChangeEventHandler<unknown> = (event) => {
-    if (event.name === "consultation_status" && event.value === "1") {
-      dispatch({
-        type: "set_form",
-        form: {
-          ...state.form,
-          consultation_status: 1,
-          symptoms: [1],
-          symptoms_onset_date: new Date(),
-          category: "Critical",
-          suggestion: "DD",
-        },
-      });
-    } else if (event.name === "suggestion" && event.value === "DD") {
+    if (event.name === "suggestion" && event.value === "DD") {
       dispatch({
         type: "set_form",
         form: {
           ...state.form,
           suggestion: "DD",
           consultation_notes: "Patient declared dead",
-          verified_by: "Declared Dead",
         },
       });
     } else {
@@ -353,8 +356,19 @@ export const ConsultationForm = (props: any) => {
       });
       if (res.data.suggestion === "R") {
         if (res.data.referred_to_external)
-          setSelectedFacility({ id: -1, name: res.data.referred_to_external });
-        else setSelectedFacility(res.data.referred_to_object);
+          setReferredToFacility({
+            id: -1,
+            name: res.data.referred_to_external,
+          });
+        else setReferredToFacility(res.data.referred_to_object);
+      }
+      if (res.data.route_to_facility === 20) {
+        if (res.data.referred_from_facility_external)
+          setReferredFromFacility({
+            id: -1,
+            name: res.data.referred_from_facility_external,
+          });
+        else setReferredFromFacility(res.data.referred_from_facility_object);
       }
       if (!status.aborted) {
         if (res?.data) {
@@ -362,6 +376,7 @@ export const ConsultationForm = (props: any) => {
             ...res.data,
             symptoms_onset_date: isoStringToDate(res.data.symptoms_onset_date),
             admission_date: isoStringToDate(res.data.admission_date),
+            icu_admission_date: isoStringToDate(res.data.icu_admission_date),
             admitted: res.data.admitted ? String(res.data.admitted) : "false",
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
             category: res.data.category
@@ -374,8 +389,8 @@ export const ConsultationForm = (props: any) => {
             is_kasp: `${res.data.is_kasp}`,
             assigned_to: res.data.assigned_to || "",
             assigned_to_object: res.data.assigned_to_object,
-            verified_by: res.data.verified_by || "",
-            verified_by_object: res.data.verified_by_object,
+            treating_physician: res.data.treating_physician || "",
+            treating_physician_object: res.data.treating_physician_object,
             ett_tt: res.data.ett_tt ? Number(res.data.ett_tt) : 3,
             special_instruction: res.data.special_instruction || "",
             weight: res.data.weight ? res.data.weight : "",
@@ -440,9 +455,9 @@ export const ConsultationForm = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "consultation_status":
+        case "route_to_facility":
           if (!state.form[field]) {
-            errors[field] = "Please select the consultation status";
+            errors[field] = "Field is required";
             invalidForm = true;
           }
           return;
@@ -506,15 +521,30 @@ export const ConsultationForm = (props: any) => {
             invalidForm = true;
           }
           return;
+        case "referred_from_facility":
+          if (
+            state.form.route_to_facility === 20 &&
+            !state.form[field] &&
+            !state.form["referred_from_facility_external"]
+          ) {
+            errors[field] = "Please select the referred from facility";
+            invalidForm = true;
+          }
+          return;
+        case "transferred_from_location":
+          if (state.form.route_to_facility === 30 && !state.form[field]) {
+            errors[field] =
+              "Name of Ward/ICU the patient is being transferred from is required";
+            invalidForm = true;
+          }
+          return;
         case "consultation_notes":
-          if (state.form.consultation_status != 1) {
-            if (!state.form[field]) {
-              errors[field] = "Required *";
-              invalidForm = true;
-            } else if (!state.form[field].replace(/\s/g, "").length) {
-              errors[field] = "Consultation notes can not be empty";
-              invalidForm = true;
-            }
+          if (!state.form[field]) {
+            errors[field] = "Field is required";
+            invalidForm = true;
+          } else if (!state.form[field].replace(/\s/g, "").length) {
+            errors[field] = "Consultation notes can not be empty";
+            invalidForm = true;
           }
           return;
         case "is_telemedicine":
@@ -577,7 +607,7 @@ export const ConsultationForm = (props: any) => {
           return;
         }
 
-        case "verified_by": {
+        case "treating_physician": {
           if (state.form.suggestion !== "DD" && !state.form[field]) {
             errors[field] = "Please fill treating physician";
             invalidForm = true;
@@ -586,58 +616,6 @@ export const ConsultationForm = (props: any) => {
           return;
         }
 
-        // case "icd11_provisional_diagnoses_object": {
-        //   if (
-        //     state.form[field].length === 0 &&
-        //     state.form["icd11_diagnoses_object"].length === 0
-        //   ) {
-        //     for (const err_field of [field, "icd11_diagnoses_object"])
-        //       errors[err_field] =
-        //         "Please select either Provisional Diagnosis or Final Diagnosis";
-        //     invalidForm = true;
-        //     break;
-        //   }
-        //   return;
-        // }
-
-        // case "icd11_principal_diagnosis": {
-        //   if (!state.form[field]) {
-        //     errors[field] = "Please select Principal Diagnosis";
-        //     invalidForm = true;
-        //     break;
-        //   }
-
-        //   if (
-        //     state.form[field] &&
-        //     state.form["icd11_diagnoses_object"].length &&
-        //     !state.form["icd11_provisional_diagnoses_object"] &&
-        //     !state.form["icd11_diagnoses_object"]
-        //       .map((d) => d.id)
-        //       .includes(state.form[field]!)
-        //   ) {
-        //     errors[field] =
-        //       "Please select Principal Diagnosis from Final Diagnosis";
-        //     invalidForm = true;
-        //     break;
-        //   }
-
-        //   if (
-        //     state.form[field] &&
-        //     state.form["icd11_provisional_diagnoses_object"].length &&
-        //     !state.form["icd11_diagnoses_object"] &&
-        //     !state.form["icd11_provisional_diagnoses_object"]
-        //       .map((d) => d.id)
-        //       .includes(state.form[field]!)
-        //   ) {
-        //     errors[field] =
-        //       "Please select Principal Diagnosis from Provisional Diagnosis";
-        //     invalidForm = true;
-        //     break;
-        //   }
-
-        //   return;
-        // }
-
         default:
           return;
       }
@@ -699,7 +677,7 @@ export const ConsultationForm = (props: any) => {
           ? state.form.symptoms_onset_date
           : undefined,
         suggestion: state.form.suggestion,
-        consultation_status: Number(state.form.consultation_status),
+        route_to_facility: state.form.route_to_facility,
         admitted: state.form.suggestion === "A",
         admission_date: ["A", "DC"].includes(state.form.suggestion)
           ? state.form.admission_date
@@ -713,7 +691,7 @@ export const ConsultationForm = (props: any) => {
         discharge_date: state.form.discharge_date,
         patient_no: state.form.patient_no,
         create_diagnoses: isUpdate ? undefined : state.form.create_diagnoses,
-        verified_by: state.form.verified_by,
+        treating_physician: state.form.treating_physician,
         investigation: state.form.InvestigationAdvice,
         procedure: state.form.procedures,
         patient: patientId,
@@ -726,8 +704,27 @@ export const ConsultationForm = (props: any) => {
           state.form.suggestion === "R" && !state.form.referred_to
             ? state.form.referred_to_external
             : undefined,
+        referred_from_facility:
+          state.form.route_to_facility === 20 &&
+          !state.form.referred_from_facility_external
+            ? state.form.referred_from_facility
+            : undefined,
+        referred_from_facility_external:
+          state.form.route_to_facility === 20 &&
+          !state.form.referred_from_facility
+            ? state.form.referred_from_facility_external
+            : undefined,
+        referred_by_external:
+          state.form.route_to_facility === 20
+            ? state.form.referred_by_external
+            : undefined,
+        transferred_from_location:
+          state.form.route_to_facility === 30
+            ? state.form.transferred_from_location
+            : undefined,
         consultation_notes: state.form.consultation_notes,
         is_telemedicine: state.form.is_telemedicine,
+        icu_admission_date: state.form.icu_admission_date,
         action: state.form.action,
         review_interval: state.form.review_interval,
         assigned_to:
@@ -824,9 +821,11 @@ export const ConsultationForm = (props: any) => {
     );
   };
 
-  const setFacility = (selected: FacilityModel | FacilityModel[] | null) => {
+  const handleReferredToFacilityChange = (
+    selected: FacilityModel | FacilityModel[] | null
+  ) => {
     const selectedFacility = selected as FacilityModel;
-    setSelectedFacility(selectedFacility);
+    setReferredToFacility(selectedFacility);
     const form: FormDetails = { ...state.form };
     if (selectedFacility?.id) {
       if (selectedFacility.id === -1) {
@@ -840,6 +839,24 @@ export const ConsultationForm = (props: any) => {
     dispatch({ type: "set_form", form });
   };
 
+  const handleReferredFromFacilityChange = (
+    selected: FacilityModel | FacilityModel[] | null
+  ) => {
+    const selectedFacility = selected as FacilityModel;
+    setReferredFromFacility(selectedFacility);
+    const form: FormDetails = { ...state.form };
+    if (selectedFacility?.id) {
+      if (selectedFacility.id === -1) {
+        form.referred_from_facility_external = selectedFacility.name ?? "";
+        delete form.referred_from_facility;
+      } else {
+        form.referred_from_facility = selectedFacility.id.toString() || "";
+        delete form.referred_from_facility_external;
+      }
+    }
+    dispatch({ type: "set_form", form });
+  };
+
   const field = (name: string) => {
     return {
       id: name,
@@ -879,9 +896,6 @@ export const ConsultationForm = (props: any) => {
       <div className="top-0 mt-5 flex grow-0 sm:mx-12">
         <div className="fixed hidden h-full w-72 flex-col xl:flex">
           {Object.keys(sections).map((sectionTitle) => {
-            if (state.form.consultation_status === 1) {
-              return null;
-            }
             if (!isUpdate && sectionTitle === "Bed Status") {
               return null;
             }
@@ -923,66 +937,119 @@ export const ConsultationForm = (props: any) => {
                   {sectionTitle("Consultation Details")}
                   <div
                     className="col-span-6"
-                    ref={fieldRef["consultation_status"]}
+                    ref={fieldRef["route_to_facility"]}
                   >
-                    <SelectFormField
+                    <RouteToFacilitySelect
                       required
-                      label="Status during the consultation"
-                      {...selectField("consultation_status")}
-                      options={CONSULTATION_STATUS}
+                      label="Route to Facility"
+                      {...field("route_to_facility")}
+                      disabled={isUpdate}
                     />
                   </div>
 
-                  {String(state.form.consultation_status) !== "1" && (
+                  {state.form.route_to_facility === 20 && (
                     <>
-                      <div className="col-span-6" ref={fieldRef["symptoms"]}>
-                        <SymptomsSelect
-                          required
-                          label="Symptoms"
-                          {...field("symptoms")}
+                      <div
+                        id="referred_from_facility"
+                        className="col-span-6 mb-5"
+                        ref={fieldRef["referred_from_facility"]}
+                      >
+                        <FieldLabel required>
+                          Name of the referring Facility
+                        </FieldLabel>
+                        <FacilitySelect
+                          name="referred_from_facility"
+                          searchAll={true}
+                          selected={referredFromFacility}
+                          setSelected={handleReferredFromFacilityChange}
+                          freeText={true}
+                          errors={state.errors.referred_from_facility}
                         />
                       </div>
-                      {isOtherSymptomsSelected && (
-                        <div
-                          className="col-span-6"
-                          ref={fieldRef["other_symptoms"]}
-                        >
-                          <TextAreaFormField
-                            {...field("other_symptoms")}
-                            label="Other symptom details"
-                            required
-                            placeholder="Enter details of other symptoms here"
-                          />
-                        </div>
-                      )}
-
-                      {hasSymptoms && (
-                        <div
-                          className="col-span-6"
-                          ref={fieldRef["symptoms_onset_date"]}
-                        >
-                          <DateFormField
-                            {...field("symptoms_onset_date")}
-                            disableFuture
-                            required
-                            label="Date of onset of the symptoms"
-                            position="LEFT"
-                          />
-                        </div>
-                      )}
                       <div
                         className="col-span-6"
-                        ref={fieldRef["history_of_present_illness"]}
+                        ref={fieldRef["referred_by_external"]}
                       >
-                        <TextAreaFormField
-                          {...field("history_of_present_illness")}
-                          label="History of present illness"
-                          placeholder="Optional information"
+                        <TextFormField
+                          label="Name of the referring Doctor"
+                          placeholder="Enter name of the referring doctor"
+                          {...field("referred_by_external")}
                         />
                       </div>
                     </>
                   )}
 
+                  {state.form.route_to_facility === 30 && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["transferred_from_location"]}
+                    >
+                      <FieldLabel required>
+                        Name of Ward/ICU the patient is shifted from
+                      </FieldLabel>
+                      <LocationSelect
+                        name="transferred_from_location"
+                        setSelected={(location) =>
+                          field("transferred_from_location").onChange({
+                            name: "transferred_from_location",
+                            value: location,
+                          })
+                        }
+                        selected={field("transferred_from_location").value}
+                        showAll={false}
+                        multiple={false}
+                        facilityId={facilityId}
+                        errors={state.errors.transferred_from_location ?? ""}
+                      />
+                    </div>
+                  )}
+
+                  <div className="col-span-6" ref={fieldRef["symptoms"]}>
+                    <SymptomsSelect
+                      required
+                      label="Symptoms"
+                      {...field("symptoms")}
+                    />
+                  </div>
+                  {isOtherSymptomsSelected && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["other_symptoms"]}
+                    >
+                      <TextAreaFormField
+                        {...field("other_symptoms")}
+                        label="Other symptom details"
+                        required
+                        placeholder="Enter details of other symptoms here"
+                      />
+                    </div>
+                  )}
+
+                  {hasSymptoms && (
+                    <div
+                      className="col-span-6"
+                      ref={fieldRef["symptoms_onset_date"]}
+                    >
+                      <DateFormField
+                        {...field("symptoms_onset_date")}
+                        disableFuture
+                        required
+                        label="Date of onset of the symptoms"
+                        position="LEFT"
+                      />
+                    </div>
+                  )}
+                  <div
+                    className="col-span-6"
+                    ref={fieldRef["history_of_present_illness"]}
+                  >
+                    <TextAreaFormField
+                      {...field("history_of_present_illness")}
+                      label="History of present illness"
+                      placeholder="Optional information"
+                    />
+                  </div>
+
                   <div
                     className="col-span-6"
                     ref={fieldRef["examination_details"]}
@@ -1037,32 +1104,26 @@ export const ConsultationForm = (props: any) => {
                     </div>
                   </div>
 
-                  {String(state.form.consultation_status) !== "1" && (
-                    <div className="col-span-6" ref={fieldRef["category"]}>
-                      <PatientCategorySelect
-                        labelSuffix={
-                          disabledFields.includes("category") && (
-                            <p className="text-xs font-medium text-warning-500">
-                              A daily round already exists.
-                            </p>
-                          )
-                        }
-                        required
-                        label="Category"
-                        {...field("category")}
-                      />
-                    </div>
-                  )}
+                  <div className="col-span-6" ref={fieldRef["category"]}>
+                    <PatientCategorySelect
+                      labelSuffix={
+                        disabledFields.includes("category") && (
+                          <p className="text-xs font-medium text-warning-500">
+                            A daily round already exists.
+                          </p>
+                        )
+                      }
+                      required
+                      label="Category"
+                      {...field("category")}
+                    />
+                  </div>
 
-                  <div
-                    className="col-span-6"
-                    ref={fieldRef["consultation_status"]}
-                  >
+                  <div className="col-span-6" ref={fieldRef["suggestion"]}>
                     <SelectFormField
                       required
                       label="Decision after consultation"
                       {...selectField("suggestion")}
-                      disabled={String(state.form.consultation_status) === "1"}
                       options={CONSULTATION_SUGGESTION.filter(
                         ({ deprecated }) => !deprecated
                       )}
@@ -1079,8 +1140,8 @@ export const ConsultationForm = (props: any) => {
                       <FacilitySelect
                         name="referred_to"
                         searchAll={true}
-                        selected={selectedFacility}
-                        setSelected={setFacility}
+                        selected={referredToFacility}
+                        setSelected={handleReferredToFacilityChange}
                         freeText={true}
                         errors={state.errors.referred_to}
                       />
@@ -1131,40 +1192,71 @@ export const ConsultationForm = (props: any) => {
                   )}
 
                   {["A", "DC"].includes(state.form.suggestion) && (
-                    <>
+                    <div
+                      className={classNames(
+                        "col-span-6",
+                        state.form.route_to_facility &&
+                          [20, 30].includes(state.form.route_to_facility) &&
+                          "xl:col-span-3"
+                      )}
+                      ref={fieldRef["admission_date"]}
+                    >
+                      <TextFormField
+                        {...field("admission_date")}
+                        required
+                        label={
+                          state.form.suggestion === "DC"
+                            ? "Date & Time of Domiciliary Care commencement"
+                            : "Date & Time of Admission to the Facility"
+                        }
+                        type="datetime-local"
+                        value={dayjs(state.form.admission_date).format(
+                          "YYYY-MM-DDTHH:mm"
+                        )}
+                        max={dayjs().format("YYYY-MM-DDTHH:mm")}
+                      />
+                    </div>
+                  )}
+
+                  {state.form.route_to_facility &&
+                    [20, 30].includes(state.form.route_to_facility) && (
                       <div
-                        className="col-span-6"
-                        ref={fieldRef["admission_date"]}
+                        className={classNames(
+                          "col-span-6",
+                          ["A", "DC"].includes(state.form.suggestion) &&
+                            "xl:col-span-3"
+                        )}
+                        ref={fieldRef["icu_admission_date"]}
                       >
-                        <DateFormField
-                          {...field("admission_date")}
-                          required
-                          disableFuture
-                          label={
-                            state.form.suggestion === "A"
-                              ? "Date of Admission"
-                              : "Domiciliary Care Start Date"
+                        <TextFormField
+                          {...field("icu_admission_date")}
+                          label="Date & Time  of admission to the ICU"
+                          type="datetime-local"
+                          value={
+                            state.form.icu_admission_date &&
+                            dayjs(state.form.icu_admission_date).format(
+                              "YYYY-MM-DDTHH:mm"
+                            )
                           }
-                          position="LEFT"
                         />
                       </div>
+                    )}
 
-                      {!isUpdate && (
-                        <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>
-                          <FieldLabel>Bed</FieldLabel>
-                          <BedSelect
-                            name="bed"
-                            setSelected={setBed}
-                            selected={bed}
-                            error=""
-                            multiple={false}
-                            unoccupiedOnly={true}
-                            facility={facilityId}
-                          />
-                        </div>
-                      )}
-                    </>
+                  {["A", "DC"].includes(state.form.suggestion) && !isUpdate && (
+                    <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>
+                      <FieldLabel>Bed</FieldLabel>
+                      <BedSelect
+                        name="bed"
+                        setSelected={setBed}
+                        selected={bed}
+                        error=""
+                        multiple={false}
+                        unoccupiedOnly={true}
+                        facility={facilityId}
+                      />
+                    </div>
                   )}
+
                   <div className="col-span-6 mb-6" ref={fieldRef["patient_no"]}>
                     <TextFormField
                       {...field("patient_no")}
@@ -1204,155 +1296,149 @@ export const ConsultationForm = (props: any) => {
                 </div>
 
                 <div className="grid grid-cols-1 gap-4 gap-x-6">
-                  {String(state.form.consultation_status) !== "1" && (
+                  {sectionTitle("Treatment Plan")}
+                  {state.form.suggestion !== "DD" && (
                     <>
-                      {sectionTitle("Treatment Plan")}
-                      {state.form.suggestion !== "DD" && (
-                        <>
-                          <div
-                            id="investigation"
-                            className="col-span-6"
-                            ref={fieldRef["investigation"]}
-                          >
-                            <FieldLabel>Investigations Suggestions</FieldLabel>
-                            <InvestigationBuilder
-                              investigations={state.form.InvestigationAdvice}
-                              setInvestigations={(investigations) => {
-                                handleFormFieldChange({
-                                  name: "InvestigationAdvice",
-                                  value: investigations,
-                                });
-                              }}
-                            />
-                            <FieldErrorText
-                              error={state.errors.investigation}
-                            />
-                          </div>
-                          <div
-                            id="procedure"
-                            className="col-span-6"
-                            ref={fieldRef["procedure"]}
-                          >
-                            <FieldLabel>Procedures</FieldLabel>
-                            <ProcedureBuilder
-                              procedures={state.form.procedures}
-                              setProcedures={(procedures) => {
-                                handleFormFieldChange({
-                                  name: "procedures",
-                                  value: procedures,
-                                });
-                              }}
-                            />
-                            <FieldErrorText error={state.errors.procedure} />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["treatment_plan"]}
-                          >
-                            <TextAreaFormField
-                              {...field("treatment_plan")}
-                              label="Treatment Plan / Treatment Summary"
-                              placeholder="Optional information"
-                            />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["consultation_notes"]}
-                          >
-                            <TextAreaFormField
-                              label="General Instructions (Advice)"
-                              required
-                              placeholder="Consultation Notes"
-                              {...field("consultation_notes")}
-                            />
-                          </div>
-
-                          {kasp_enabled && (
-                            <CheckBoxFormField
-                              {...field("is_kasp")}
-                              className="flex-1"
-                              required
-                              label={kasp_string}
-                              onChange={handleFormFieldChange}
-                            />
-                          )}
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["special_instruction"]}
-                          >
-                            <TextAreaFormField
-                              label="Special Instructions"
-                              placeholder="Optional information"
-                              {...field("special_instruction")}
-                            />
-                          </div>
-                          <div
-                            className="col-span-6"
-                            ref={fieldRef["verified_by"]}
-                          >
-                            <UserAutocompleteFormField
-                              name={"verified_by"}
-                              label="Treating Physician"
-                              placeholder="Attending Doctors Name and Designation"
-                              required
-                              value={state.form.verified_by_object ?? undefined}
-                              onChange={handleDoctorSelect}
-                              showActiveStatus
-                              userType={"Doctor"}
-                              homeFacility={facilityId}
-                              error={state.errors.verified_by}
-                            />
-                          </div>
-
-                          <div className="col-span-6 flex flex-col gap-3 md:flex-row">
-                            <div
-                              ref={fieldRef["review_interval"]}
-                              className="flex-1"
-                            >
-                              <SelectFormField
-                                {...selectField("review_interval")}
-                                label="Review After"
-                                options={REVIEW_AT_CHOICES}
-                                position="above"
-                              />
-                            </div>
-                            <div className="flex-1" ref={fieldRef["action"]}>
-                              <SelectFormField
-                                {...selectField("action")}
-                                label="Action"
-                                position="above"
-                                options={TELEMEDICINE_ACTIONS}
-                                optionLabel={(option) => option.desc}
-                                optionDescription={() => ""}
-                              />
-                            </div>
-                          </div>
-
-                          <CheckBoxFormField
-                            className="col-span-6"
-                            {...field("is_telemedicine")}
-                            value={JSON.parse(state.form.is_telemedicine)}
-                            label="Is Telemedicine required for the patient?"
+                      <div
+                        id="investigation"
+                        className="col-span-6"
+                        ref={fieldRef["investigation"]}
+                      >
+                        <FieldLabel>Investigations Suggestions</FieldLabel>
+                        <InvestigationBuilder
+                          investigations={state.form.InvestigationAdvice}
+                          setInvestigations={(investigations) => {
+                            handleFormFieldChange({
+                              name: "InvestigationAdvice",
+                              value: investigations,
+                            });
+                          }}
+                        />
+                        <FieldErrorText error={state.errors.investigation} />
+                      </div>
+                      <div
+                        id="procedure"
+                        className="col-span-6"
+                        ref={fieldRef["procedure"]}
+                      >
+                        <FieldLabel>Procedures</FieldLabel>
+                        <ProcedureBuilder
+                          procedures={state.form.procedures}
+                          setProcedures={(procedures) => {
+                            handleFormFieldChange({
+                              name: "procedures",
+                              value: procedures,
+                            });
+                          }}
+                        />
+                        <FieldErrorText error={state.errors.procedure} />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["treatment_plan"]}
+                      >
+                        <TextAreaFormField
+                          {...field("treatment_plan")}
+                          label="Treatment Plan / Treatment Summary"
+                          placeholder="Optional information"
+                        />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["consultation_notes"]}
+                      >
+                        <TextAreaFormField
+                          label="General Instructions (Advice)"
+                          required
+                          placeholder="Consultation Notes"
+                          {...field("consultation_notes")}
+                        />
+                      </div>
+
+                      {kasp_enabled && (
+                        <CheckBoxFormField
+                          {...field("is_kasp")}
+                          className="flex-1"
+                          required
+                          label={kasp_string}
+                          onChange={handleFormFieldChange}
+                        />
+                      )}
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["special_instruction"]}
+                      >
+                        <TextAreaFormField
+                          label="Special Instructions"
+                          placeholder="Optional information"
+                          {...field("special_instruction")}
+                        />
+                      </div>
+                      <div
+                        className="col-span-6"
+                        ref={fieldRef["treating_physician"]}
+                      >
+                        <UserAutocompleteFormField
+                          name={"treating_physician"}
+                          label="Treating Physician"
+                          placeholder="Attending Doctors Name and Designation"
+                          required
+                          value={
+                            state.form.treating_physician_object ?? undefined
+                          }
+                          onChange={handleDoctorSelect}
+                          showActiveStatus
+                          userType={"Doctor"}
+                          homeFacility={facilityId}
+                          error={state.errors.treating_physician}
+                        />
+                      </div>
+
+                      <div className="col-span-6 flex flex-col gap-3 md:flex-row">
+                        <div
+                          ref={fieldRef["review_interval"]}
+                          className="flex-1"
+                        >
+                          <SelectFormField
+                            {...selectField("review_interval")}
+                            label="Review After"
+                            options={REVIEW_AT_CHOICES}
+                            position="above"
                           />
+                        </div>
+                        <div className="flex-1" ref={fieldRef["action"]}>
+                          <SelectFormField
+                            {...selectField("action")}
+                            label="Action"
+                            position="above"
+                            options={TELEMEDICINE_ACTIONS}
+                            optionLabel={(option) => option.desc}
+                            optionDescription={() => ""}
+                          />
+                        </div>
+                      </div>
 
-                          {JSON.parse(state.form.is_telemedicine) && (
-                            <div
-                              className="col-span-6 flex-[2]"
-                              ref={fieldRef["assigned_to"]}
-                            >
-                              <UserAutocompleteFormField
-                                showActiveStatus
-                                value={
-                                  state.form.assigned_to_object ?? undefined
-                                }
-                                onChange={handleDoctorSelect}
-                                userType={"Doctor"}
-                                name={"assigned_to"}
-                                label="Assigned to"
-                              />
-                            </div>
-                          )}
-                        </>
+                      <CheckBoxFormField
+                        className="col-span-6"
+                        {...field("is_telemedicine")}
+                        value={JSON.parse(state.form.is_telemedicine)}
+                        label="Is Telemedicine required for the patient?"
+                      />
+
+                      {JSON.parse(state.form.is_telemedicine) && (
+                        <div
+                          className="col-span-6 flex-[2]"
+                          ref={fieldRef["assigned_to"]}
+                        >
+                          <UserAutocompleteFormField
+                            showActiveStatus
+                            value={state.form.assigned_to_object ?? undefined}
+                            onChange={handleDoctorSelect}
+                            userType={"Doctor"}
+                            name={"assigned_to"}
+                            label="Assigned to"
+                          />
+                        </div>
                       )}
                     </>
                   )}
diff --git a/src/Components/Facility/Consultations/ABGPlots.tsx b/src/Components/Facility/Consultations/ABGPlots.tsx
index 3cb4daa981c..9b5e6fa38c6 100644
--- a/src/Components/Facility/Consultations/ABGPlots.tsx
+++ b/src/Components/Facility/Consultations/ABGPlots.tsx
@@ -1,56 +1,45 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
 import { LinePlot } from "./components/LinePlot";
 import Pagination from "../../Common/Pagination";
 import { PAGINATION_LIMIT } from "../../../Common/constants";
 import { formatDateTime } from "../../../Utils/utils";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 
 export const ABGPlots = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: [
-              "ph",
-              "pco2",
-              "po2",
-              "hco3",
-              "base_excess",
-              "lactate",
-              "sodium",
-              "potassium",
-              "ventilator_fi02",
-            ],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res?.data) {
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (currentPage: number) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: [
+            "ph",
+            "pco2",
+            "po2",
+            "hco3",
+            "base_excess",
+            "lactate",
+            "sodium",
+            "potassium",
+            "ventilator_fi02",
+          ],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res?.ok && data) {
+        setResults(data.results);
+        setTotalCount(data.count);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage]
-  );
+    };
+    fetchDailyRounds(currentPage);
+  }, [currentPage, consultationId]);
 
   const handlePagination = (page: number, _limit: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/Consultations/Beds.tsx b/src/Components/Facility/Consultations/Beds.tsx
index 757c19c788a..518121e6e69 100644
--- a/src/Components/Facility/Consultations/Beds.tsx
+++ b/src/Components/Facility/Consultations/Beds.tsx
@@ -1,12 +1,10 @@
 import * as Notification from "../../../Utils/Notifications.js";
 
 import { BedModel, CurrentBed } from "../models";
-import { Dispatch, SetStateAction, useCallback, useState } from "react";
-import {
-  createConsultationBed,
-  listConsultationBeds,
-} from "../../../Redux/actions";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
+import { Dispatch, SetStateAction, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
+import useQuery from "../../../Utils/request/useQuery";
 
 import { BedSelect } from "../../Common/BedSelect";
 import ButtonV2 from "../../Common/components/ButtonV2";
@@ -16,15 +14,14 @@ import { FieldLabel } from "../../Form/FormFields/FormField";
 import Loading from "../../Common/Loading";
 import TextFormField from "../../Form/FormFields/TextFormField";
 import { formatDateTime } from "../../../Utils/utils";
-import { useDispatch } from "react-redux";
 import dayjs from "../../../Utils/dayjs";
 import { AssetSelect } from "../../Common/AssetSelect.js";
 import DialogModal from "../../Common/Dialog.js";
 import { Link } from "raviger";
 import {
   AssetClass,
-  AssetData,
   assetClassProps,
+  AssetData,
 } from "../../Assets/AssetTypes.js";
 import Chip from "../../../CAREUI/display/Chip.js";
 
@@ -40,7 +37,6 @@ interface BedsProps {
 }
 
 const Beds = (props: BedsProps) => {
-  const dispatch = useDispatch<any>();
   const { facilityId, consultationId, discharged } = props;
   const [bed, setBed] = useState<BedModel>({});
   const [startDate, setStartDate] = useState<string>(
@@ -48,37 +44,23 @@ const Beds = (props: BedsProps) => {
   );
   const [assets, setAssets] = useState<any[]>([]);
   const [consultationBeds, setConsultationBeds] = useState<CurrentBed[]>([]);
-  const [isLoading, setIsLoading] = useState(false);
   const [key, setKey] = useState(0);
   const [showBedDetails, setShowBedDetails] = useState<CurrentBed | null>(null);
 
-  const fetchData = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      const [bedsData]: any = await Promise.all([
-        dispatch(listConsultationBeds({ consultation: consultationId })),
-      ]);
-      if (!status.aborted) {
-        setIsLoading(false);
-        if (!bedsData?.data)
-          Notification.Error({
-            msg: "Something went wrong..!",
-          });
-        else {
-          setConsultationBeds(bedsData.data.results);
-          setBed(bedsData.data.results[0]?.bed_object || {});
-          setAssets(bedsData.data.results[0]?.assets_objects || []);
-        }
+  const { loading } = useQuery(routes.listConsultationBeds, {
+    query: { consultation: consultationId },
+    onResponse: ({ res, data }) => {
+      if (res && res.status === 200 && data?.results) {
+        setConsultationBeds(data.results);
+        setBed(data?.results[0]?.bed_object || {});
+        setAssets(data?.results[0]?.assets_objects || []);
+      } else {
+        Notification.Error({
+          msg: "Something went wrong..!",
+        });
       }
     },
-    [consultationId, dispatch]
-  );
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchData(status);
-    },
-    [dispatch, fetchData, key]
-  );
+  });
 
   const handleSubmit = async (e: React.SyntheticEvent) => {
     e.preventDefault();
@@ -88,13 +70,14 @@ const Beds = (props: BedsProps) => {
         msg: "Please select a bed first..!",
       });
 
-    const res: any = await dispatch(
-      createConsultationBed(
-        { start_date: startDate, assets: assets.map((asset) => asset.id) },
-        consultationId,
-        bed?.id
-      )
-    );
+    const { res } = await request(routes.createConsultationBed, {
+      body: {
+        start_date: startDate,
+        assets: assets.map((asset) => asset.id),
+        consultation: consultationId,
+        bed: bed?.id,
+      },
+    });
 
     if (res && res.status === 201) {
       Notification.Success({
@@ -106,7 +89,7 @@ const Beds = (props: BedsProps) => {
     }
   };
 
-  if (isLoading) {
+  if (loading) {
     if (props.smallLoader && props.smallLoader === true) {
       return (
         <div className="flex w-full items-center justify-center p-5 px-10">
diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 0ec84a0cc87..ffc70ddf175 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -1,14 +1,11 @@
 import { navigate } from "raviger";
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { getDailyReport } from "../../../Redux/actions";
-import Pagination from "../../Common/Pagination";
 import { DailyRoundsModel } from "../../Patient/models";
 import VirtualNursingAssistantLogUpdateCard from "./DailyRounds/VirtualNursingAssistantLogUpdateCard";
 import DefaultLogUpdateCard from "./DailyRounds/DefaultLogUpdateCard";
 import { useTranslation } from "react-i18next";
 import LoadingLogUpdateCard from "./DailyRounds/LoadingCard";
+import routes from "../../../Redux/api";
+import PaginatedList from "../../../CAREUI/misc/PaginatedList";
 
 export const DailyRoundsList = (props: any) => {
   const { t } = useTranslation();
@@ -19,126 +16,78 @@ export const DailyRoundsList = (props: any) => {
     consultationData,
     showAutomatedRounds,
   } = props;
-  const dispatch: any = useDispatch();
-  const [isDailyRoundLoading, setIsDailyRoundLoading] = useState(false);
-  const [dailyRoundsListData, setDailyRoundsListData] = useState<
-    Array<DailyRoundsModel>
-  >([]);
-  const [totalCount, setTotalCount] = useState(0);
-  const [offset, setOffset] = useState(0);
-  const [currentPage, setCurrentPage] = useState(1);
-  const limit = 14;
-
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      setIsDailyRoundLoading(true);
-      const res = await dispatch(
-        getDailyReport(
-          {
-            limit,
-            offset,
-            rounds_type: showAutomatedRounds ? "" : "NORMAL,VENTILATOR,ICU",
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res && res.data) {
-          setDailyRoundsListData(res.data.results);
-          setTotalCount(res.data.count);
-        }
-        setIsDailyRoundLoading(false);
-      }
-    },
-    [consultationId, dispatch, offset, showAutomatedRounds]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage, showAutomatedRounds]
-  );
-
-  const handlePagination = (page: number, limit: number) => {
-    const offset = (page - 1) * limit;
-    setCurrentPage(page);
-    setOffset(offset);
-  };
-
-  let roundsList: any;
-
-  if (isDailyRoundLoading) {
-    roundsList = (
-      <>
-        {Array.from({ length: 3 }).map((_, i) => (
-          <LoadingLogUpdateCard key={i} />
-        ))}
-      </>
-    );
-  } else if (dailyRoundsListData.length === 0) {
-    roundsList = (
-      <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700 shadow">
-        {t("no_consultation_updates")}
-      </span>
-    );
-  } else if (dailyRoundsListData.length) {
-    roundsList = dailyRoundsListData.map((itemData, idx) => {
-      if (itemData.rounds_type === "AUTOMATED") {
-        return (
-          <VirtualNursingAssistantLogUpdateCard
-            round={itemData}
-            previousRound={dailyRoundsListData[idx + 1]}
-          />
-        );
-      }
-
-      return (
-        <DefaultLogUpdateCard
-          round={itemData}
-          consultationData={consultationData}
-          onViewDetails={() => {
-            if (itemData.rounds_type === "NORMAL") {
-              navigate(
-                `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${itemData.id}`
-              );
-            } else {
-              navigate(
-                `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${itemData.id}`
-              );
-            }
-          }}
-          onUpdateLog={() => {
-            if (itemData.rounds_type === "NORMAL") {
-              navigate(
-                `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${itemData.id}/update`
-              );
-            } else {
-              navigate(
-                `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${itemData.id}/update`
-              );
-            }
-          }}
-        />
-      );
-    });
-  }
 
   return (
-    <div className="flex w-full flex-col gap-4">
-      <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
-        {roundsList}
-      </div>
-      {!isDailyRoundLoading && totalCount > limit && (
-        <div className="flex justify-center">
-          <Pagination
-            cPage={currentPage}
-            defaultPerPage={limit}
-            data={{ totalCount }}
-            onChange={handlePagination}
-          />
+    <PaginatedList
+      route={routes.getDailyReports}
+      pathParams={{
+        consultationId,
+      }}
+      query={{
+        rounds_type: showAutomatedRounds ? "" : "NORMAL,VENTILATOR,ICU",
+      }}
+    >
+      {(_) => (
+        <div className="-mt-2 flex w-full flex-col gap-4">
+          <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
+            <PaginatedList.WhenEmpty className="flex w-full justify-center rounded-md border-b border-gray-200 bg-white px-5 py-1 text-center text-2xl font-bold text-gray-500">
+              <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700">
+                {t("no_consultation_updates")}
+              </span>
+            </PaginatedList.WhenEmpty>
+            <PaginatedList.WhenLoading>
+              <>
+                {Array.from({ length: 3 }).map((_, i) => (
+                  <LoadingLogUpdateCard key={i} />
+                ))}
+              </>
+            </PaginatedList.WhenLoading>
+            <PaginatedList.Items<DailyRoundsModel> className="flex grow flex-col gap-3">
+              {(item, items) => {
+                if (item.rounds_type === "AUTOMATED") {
+                  return (
+                    <VirtualNursingAssistantLogUpdateCard
+                      round={item}
+                      previousRound={items[items.indexOf(item) + 1]}
+                    />
+                  );
+                }
+                return (
+                  <DefaultLogUpdateCard
+                    round={item}
+                    consultationData={consultationData}
+                    onViewDetails={() => {
+                      if (item.rounds_type === "NORMAL") {
+                        navigate(
+                          `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${item.id}`
+                        );
+                      } else {
+                        navigate(
+                          `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${item.id}`
+                        );
+                      }
+                    }}
+                    onUpdateLog={() => {
+                      if (item.rounds_type === "NORMAL") {
+                        navigate(
+                          `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${item.id}/update`
+                        );
+                      } else {
+                        navigate(
+                          `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${item.id}/update`
+                        );
+                      }
+                    }}
+                  />
+                );
+              }}
+            </PaginatedList.Items>
+            <div className="flex w-full items-center justify-center">
+              <PaginatedList.Paginator hideIfSinglePage />
+            </div>
+          </div>
         </div>
       )}
-    </div>
+    </PaginatedList>
   );
 };
diff --git a/src/Components/Facility/Consultations/DialysisPlots.tsx b/src/Components/Facility/Consultations/DialysisPlots.tsx
index 4830af3abf0..50bbf911208 100644
--- a/src/Components/Facility/Consultations/DialysisPlots.tsx
+++ b/src/Components/Facility/Consultations/DialysisPlots.tsx
@@ -1,7 +1,6 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import { LinePlot } from "./components/LinePlot";
 import Pagination from "../../Common/Pagination";
 import { PAGINATION_LIMIT } from "../../../Common/constants";
@@ -9,38 +8,28 @@ import { formatDateTime } from "../../../Utils/utils";
 
 export const DialysisPlots = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: ["dialysis_fluid_balance", "dialysis_net_balance"],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res?.data) {
-          setTotalCount(res.data.count);
-          setResults(res.data.results);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (currentPage: number) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: ["dialysis_fluid_balance", "dialysis_net_balance"],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res?.ok && data) {
+        setTotalCount(data.count);
+        setResults(data.results);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [consultationId, currentPage]
-  );
+    };
+    fetchDailyRounds(currentPage);
+  }, [currentPage, consultationId]);
 
   const handlePagination = (page: number, _limit: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/Consultations/Feed.tsx b/src/Components/Facility/Consultations/Feed.tsx
index ac39be325e9..0389fe298dc 100644
--- a/src/Components/Facility/Consultations/Feed.tsx
+++ b/src/Components/Facility/Consultations/Feed.tsx
@@ -1,5 +1,6 @@
 import * as Notification from "../../../Utils/Notifications.js";
-
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import {
   CAMERA_STATES,
   CameraPTZ,
@@ -11,17 +12,9 @@ import {
   useMSEMediaPlayer,
 } from "../../../Common/hooks/useMSEplayer";
 import { PTZState, useFeedPTZ } from "../../../Common/hooks/useFeedPTZ";
-import { useCallback, useEffect, useRef, useState } from "react";
-import {
-  getConsultation,
-  getPermittedFacility,
-  listAssetBeds,
-  partialUpdateAssetBed,
-} from "../../../Redux/actions";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
+import { useEffect, useRef, useState } from "react";
 
 import CareIcon from "../../../CAREUI/icons/CareIcon.js";
-import { ConsultationModel } from "../models";
 import FeedButton from "./FeedButton";
 import Loading from "../../Common/Loading";
 import ReactPlayer from "react-player";
@@ -33,11 +26,13 @@ import useFullscreen from "../../../Common/hooks/useFullscreen.js";
 import { triggerGoal } from "../../../Integrations/Plausible.js";
 import useAuthUser from "../../../Common/hooks/useAuthUser.js";
 import Spinner from "../../Common/Spinner.js";
+import useQuery from "../../../Utils/request/useQuery.js";
 
 interface IFeedProps {
   facilityId: string;
   consultationId: any;
 }
+
 const PATIENT_DEFAULT_PRESET = "Patient View".trim().toLowerCase();
 
 export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
@@ -51,10 +46,8 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
     middleware_address: "",
     location_middleware: "",
   });
-  const [facilityMiddlewareHostname, setFacilityMiddlewareHostname] =
-    useState("");
+
   const [cameraConfig, setCameraConfig] = useState<any>({});
-  const [isLoading, setIsLoading] = useState(true);
   const [bedPresets, setBedPresets] = useState<any>([]);
   const [bed, setBed] = useState<any>();
   const [precision, setPrecision] = useState(1);
@@ -64,17 +57,16 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
   const [statusReported, setStatusReported] = useState(false);
   const authUser = useAuthUser();
 
-  useEffect(() => {
-    const fetchFacility = async () => {
-      const res = await dispatch(getPermittedFacility(facilityId));
+  let facilityMiddlewareHostname = "";
 
-      if (res.status === 200 && res.data) {
-        setFacilityMiddlewareHostname(res.data.middleware_address);
+  useQuery(routes.getPermittedFacility, {
+    pathParams: { id: facilityId || "" },
+    onResponse: ({ res, data }) => {
+      if (res && res.status === 200 && data && data.middleware_address) {
+        facilityMiddlewareHostname = data.middleware_address;
       }
-    };
-
-    if (facilityId) fetchFacility();
-  }, [dispatch, facilityId]);
+    },
+  });
 
   const fallbackMiddleware =
     cameraAsset.location_middleware || facilityMiddlewareHostname;
@@ -106,57 +98,55 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
 
   const liveFeedPlayerRef = useRef<HTMLVideoElement | ReactPlayer | null>(null);
 
-  const fetchData = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      const res = await dispatch(getConsultation(consultationId));
-      if (!status.aborted && res?.data) {
-        const consultation = res.data as ConsultationModel;
-        const consultationBedId = consultation.current_bed?.bed_object?.id;
+  const { loading: getConsultationLoading } = useQuery(routes.getConsultation, {
+    pathParams: { id: consultationId },
+    onResponse: ({ res, data }) => {
+      if (res && res.status === 200 && data) {
+        const consultationBedId = data.current_bed?.bed_object?.id;
         if (consultationBedId) {
-          let bedAssets = await dispatch(
-            listAssetBeds({ bed: consultationBedId })
-          );
-          setBed(consultationBedId);
-          bedAssets = {
-            ...bedAssets,
-            data: {
-              ...bedAssets.data,
-              results: bedAssets.data.results.filter(
-                (asset: { asset_object: { meta: { asset_type: string } } }) => {
+          (async () => {
+            const { res: listAssetBedsRes, data: listAssetBedsData } =
+              await request(routes.listAssetBeds, {
+                query: {
+                  bed: consultationBedId,
+                },
+              });
+            setBed(consultationBedId);
+            const bedAssets: any = {
+              ...listAssetBedsRes,
+              data: {
+                ...listAssetBedsData,
+                results: listAssetBedsData?.results.filter((asset) => {
                   return asset?.asset_object?.meta?.asset_type === "CAMERA";
-                }
-              ),
-            },
-          };
-
-          if (bedAssets?.data?.results?.length) {
-            const { camera_access_key } =
-              bedAssets.data.results[0].asset_object.meta;
-            const config = camera_access_key.split(":");
-            setCameraAsset({
-              id: bedAssets.data.results[0].asset_object.id,
-              accessKey: config[2] || "",
-              middleware_address:
-                bedAssets.data.results[0].asset_object?.meta
-                  ?.middleware_hostname,
-              location_middleware:
-                bedAssets.data.results[0].asset_object.location_object
-                  ?.middleware_address,
-            });
-            setCameraConfig(bedAssets.data.results[0].meta);
-            setCameraState({
-              ...bedAssets.data.results[0].meta.position,
-              precision: 1,
-            });
-          }
+                }),
+              },
+            };
+
+            if (bedAssets?.data?.results?.length) {
+              const { camera_access_key } =
+                bedAssets.data.results[0].asset_object.meta;
+              const config = camera_access_key.split(":");
+              setCameraAsset({
+                id: bedAssets.data.results[0].asset_object.id,
+                accessKey: config[2] || "",
+                middleware_address:
+                  bedAssets.data.results[0].asset_object?.meta
+                    ?.middleware_hostname,
+                location_middleware:
+                  bedAssets.data.results[0].asset_object.location_object
+                    ?.middleware_address,
+              });
+              setCameraConfig(bedAssets.data.results[0].meta);
+              setCameraState({
+                ...bedAssets.data.results[0].meta.position,
+                precision: 1,
+              });
+            }
+          })();
         }
-
-        setIsLoading(false);
       }
     },
-    [consultationId, dispatch]
-  );
+  });
 
   // const [position, setPosition] = useState<any>();
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -225,13 +215,35 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
 
   const getBedPresets = async (asset: any) => {
     if (asset.id && bed) {
-      const bedAssets = await dispatch(listAssetBeds({ asset: asset.id, bed }));
-      setBedPresets(bedAssets?.data?.results);
+      const { data: bedAssets } = await request(routes.listAssetBeds, {
+        query: { asset: asset.id, bed },
+      });
+      setBedPresets(bedAssets?.results);
     }
   };
 
+  const startStreamFeed = () => {
+    startStream({
+      onSuccess: () => setStreamStatus(StreamStatus.Playing),
+      onError: () => {
+        setStreamStatus(StreamStatus.Offline);
+        if (!statusReported) {
+          triggerGoal("Camera Feed Viewed", {
+            consultationId,
+            userId: authUser.id,
+            result: "error",
+          });
+          setStatusReported(true);
+        }
+      },
+    });
+  };
+
   useEffect(() => {
     if (cameraAsset.id) {
+      setTimeout(() => {
+        startStreamFeed();
+      }, 1000);
       getPresets({
         onSuccess: (resp) => setPresets(resp),
         onError: (_) => {
@@ -251,21 +263,8 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
         setStreamStatus(StreamStatus.Loading);
       }
       tId = setTimeout(() => {
-        startStream({
-          onSuccess: () => setStreamStatus(StreamStatus.Playing),
-          onError: () => {
-            setStreamStatus(StreamStatus.Offline);
-            if (!statusReported) {
-              triggerGoal("Camera Feed Viewed", {
-                consultationId,
-                userId: authUser.id,
-                result: "error",
-              });
-              setStatusReported(true);
-            }
-          },
-        });
-      }, 100);
+        startStreamFeed();
+      }, 5000);
     } else if (!statusReported) {
       triggerGoal("Camera Feed Viewed", {
         consultationId,
@@ -280,10 +279,6 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
     };
   }, [startStream, streamStatus]);
 
-  useAbortableEffect((status: statusType) => {
-    fetchData(status);
-  }, []);
-
   useEffect(() => {
     if (!currentPreset && streamStatus === StreamStatus.Playing) {
       setLoading(CAMERA_STATES.MOVING.GENERIC);
@@ -367,9 +362,10 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
         onSuccess: async (data) => {
           if (currentPreset?.asset_object?.id && data?.position) {
             setLoading(option.loadingLabel);
-            const response = await dispatch(
-              partialUpdateAssetBed(
-                {
+            const { res, data: assetBedData } = await request(
+              routes.partialUpdateAssetBed,
+              {
+                body: {
                   asset: currentPreset.asset_object.id,
                   bed: currentPreset.bed_object.id,
                   meta: {
@@ -377,12 +373,12 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
                     position: data?.position,
                   },
                 },
-                currentPreset?.id
-              )
+                pathParams: { id: currentPreset?.id },
+              }
             );
-            if (response && response.status === 200) {
+            if (res && assetBedData && res.status === 200) {
               Notification.Success({ msg: "Preset Updated" });
-              getBedPresets(cameraAsset?.id);
+              await getBedPresets(cameraAsset?.id);
               getPresets({});
             }
             setLoading(CAMERA_STATES.IDLE);
@@ -414,7 +410,7 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
     useKeyboardShortcut(option.shortcutKey, option.callback);
   }
 
-  if (isLoading) return <Loading />;
+  if (getConsultationLoading) return <Loading />;
 
   return (
     <div className="flex h-[calc(100vh-1.5rem)] flex-col px-2">
@@ -459,9 +455,9 @@ export const Feed: React.FC<IFeedProps> = ({ consultationId, facilityId }) => {
                   getCameraStatus({});
                 }}
                 className={classNames(
-                  "block border border-gray-500 px-4 py-2",
+                  "block border border-gray-500 px-4 py-2 first:rounded-l last:rounded-r",
                   currentPreset === preset
-                    ? "rounded border-primary-500 bg-primary-500 text-white"
+                    ? "border-primary-500 bg-primary-500 text-white"
                     : "bg-transparent"
                 )}
               >
diff --git a/src/Components/Facility/Consultations/LiveFeed.tsx b/src/Components/Facility/Consultations/LiveFeed.tsx
index aba473e958d..cd3f055921e 100644
--- a/src/Components/Facility/Consultations/LiveFeed.tsx
+++ b/src/Components/Facility/Consultations/LiveFeed.tsx
@@ -177,6 +177,9 @@ const LiveFeed = (props: any) => {
   useEffect(() => {
     if (cameraAsset?.hostname) {
       fetchCameraPresets();
+      setTimeout(() => {
+        startStreamFeed();
+      }, 1000);
     }
   }, []);
 
@@ -192,6 +195,13 @@ const LiveFeed = (props: any) => {
     }
   }, [page.offset, cameraAsset.id, refreshPresetsHash]);
 
+  const startStreamFeed = () => {
+    startStream({
+      onSuccess: () => setStreamStatus(StreamStatus.Playing),
+      onError: () => setStreamStatus(StreamStatus.Offline),
+    });
+  };
+
   const viewOptions = (page: number) => {
     return presets
       ? Object.entries(presets)
@@ -207,11 +217,8 @@ const LiveFeed = (props: any) => {
     if (streamStatus !== StreamStatus.Playing) {
       setStreamStatus(StreamStatus.Loading);
       tId = setTimeout(() => {
-        startStream({
-          onSuccess: () => setStreamStatus(StreamStatus.Playing),
-          onError: () => setStreamStatus(StreamStatus.Offline),
-        });
-      }, 500);
+        startStreamFeed();
+      }, 5000);
     }
 
     return () => {
diff --git a/src/Components/Facility/Consultations/NeurologicalTables.tsx b/src/Components/Facility/Consultations/NeurologicalTables.tsx
index 36fae175480..cb3eed92144 100644
--- a/src/Components/Facility/Consultations/NeurologicalTables.tsx
+++ b/src/Components/Facility/Consultations/NeurologicalTables.tsx
@@ -1,13 +1,14 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
+
 import Pagination from "../../Common/Pagination";
 import {
-  PAGINATION_LIMIT,
   EYE_OPEN_SCALE,
-  VERBAL_RESPONSE_SCALE,
   MOTOR_RESPONSE_SCALE,
+  PAGINATION_LIMIT,
+  VERBAL_RESPONSE_SCALE,
 } from "../../../Common/constants";
 import { formatDateTime } from "../../../Utils/utils";
 
@@ -87,7 +88,7 @@ const DataDescription = (props: any) => {
 
 export const NeurologicalTable = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
+  // const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
@@ -95,11 +96,10 @@ export const NeurologicalTable = (props: any) => {
   const LOC_OPTIONS = [
     { id: 0, value: "Unknown" },
     { id: 5, value: "Alert" },
-    { id: 10, value: "Responds to Voice" },
-    { id: 15, value: "Responds to Pain" },
-    { id: 20, value: "Unresponsive" },
-    { id: 25, value: "Agitated or Confused" },
-    { id: 30, value: "Onset of Agitation and Confusion" },
+    { id: 10, value: "Drowsy" },
+    { id: 15, value: "Stuporous" },
+    { id: 20, value: "Comatose" },
+    { id: 25, value: "Cannot Be Assessed" },
   ];
 
   const REACTION_OPTIONS = [
@@ -120,52 +120,47 @@ export const NeurologicalTable = (props: any) => {
     { id: 30, value: "None" },
   ];
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: [
-              "consciousness_level",
-              "consciousness_level_detail",
-              "left_pupil_size",
-              "left_pupil_size_detail",
-              "right_pupil_size",
-              "right_pupil_size_detail",
-              "left_pupil_light_reaction",
-              "left_pupil_light_reaction_detail",
-              "right_pupil_light_reaction",
-              "right_pupil_light_reaction_detail",
-              "limb_response_upper_extremity_right",
-              "limb_response_upper_extremity_left",
-              "limb_response_lower_extremity_left",
-              "limb_response_lower_extremity_right",
-              "glasgow_eye_open",
-              "glasgow_verbal_response",
-              "glasgow_motor_response",
-              "glasgow_total_calculated",
-            ],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res && res.data && res.data.results) {
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
-      }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: [
+            "consciousness_level",
+            "consciousness_level_detail",
+            "left_pupil_size",
+            "left_pupil_size_detail",
+            "right_pupil_size",
+            "right_pupil_size_detail",
+            "left_pupil_light_reaction",
+            "left_pupil_light_reaction_detail",
+            "right_pupil_light_reaction",
+            "right_pupil_light_reaction_detail",
+            "limb_response_upper_extremity_right",
+            "limb_response_upper_extremity_left",
+            "limb_response_lower_extremity_left",
+            "limb_response_lower_extremity_right",
+            "glasgow_eye_open",
+            "glasgow_verbal_response",
+            "glasgow_motor_response",
+            "glasgow_total_calculated",
+          ],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage]
-  );
+      if (res && res.ok && data?.results) {
+        setResults(data.results);
+        setTotalCount(data.count);
+      }
+    };
+    fetchDailyRounds(currentPage, consultationId);
+  }, [currentPage, consultationId]);
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const handlePagination = (page: number, limit: number) => {
@@ -299,9 +294,9 @@ export const NeurologicalTable = (props: any) => {
             {locData.map((x: any, i: any) => (
               <div
                 key={`loc_${i}`}
-                className="min-w-max-content flex  flex-col divide-x divide-gray-200"
+                className="min-w-max-content flex  flex-col  divide-x divide-gray-200"
               >
-                <div className="whitespace-nowrap border-r bg-gray-50 px-2 py-3 text-center text-xs font-medium leading-4 text-gray-700">
+                <div className="border-r bg-gray-50 px-2 py-3 text-center text-xs font-medium leading-4 text-gray-700">
                   {x.date}
                 </div>
                 <div className="whitespace-nowrap bg-white px-6 py-4 text-center text-sm leading-5 text-gray-700">
diff --git a/src/Components/Facility/Consultations/NursingPlot.tsx b/src/Components/Facility/Consultations/NursingPlot.tsx
index a5d129f68e3..83444b6c50f 100644
--- a/src/Components/Facility/Consultations/NursingPlot.tsx
+++ b/src/Components/Facility/Consultations/NursingPlot.tsx
@@ -1,48 +1,42 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import {
   NURSING_CARE_FIELDS,
   PAGINATION_LIMIT,
 } from "../../../Common/constants";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+
 import Pagination from "../../Common/Pagination";
 import { formatDateTime } from "../../../Utils/utils";
 
 export const NursingPlot = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState<any>({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: ["nursing"],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res?.data) {
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: ["nursing"],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res && res.ok && data) {
+        setResults(data.results);
+        setTotalCount(data.count);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+    };
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage]
-  );
+    fetchDailyRounds(currentPage, consultationId);
+  }, [consultationId, currentPage]);
 
   const handlePagination = (page: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/Consultations/NutritionPlots.tsx b/src/Components/Facility/Consultations/NutritionPlots.tsx
index 07dd6422555..93d7ba09010 100644
--- a/src/Components/Facility/Consultations/NutritionPlots.tsx
+++ b/src/Components/Facility/Consultations/NutritionPlots.tsx
@@ -1,7 +1,7 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
+
 import { LinePlot } from "./components/LinePlot";
 import { StackedLinePlot } from "./components/StackedLinePlot";
 import Pagination from "../../Common/Pagination";
@@ -11,7 +11,6 @@ import CareIcon from "../../../CAREUI/icons/CareIcon";
 
 export const NutritionPlots = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [showIO, setShowIO] = useState(true);
   const [showIntake, setShowIntake] = useState(false);
@@ -19,40 +18,35 @@ export const NutritionPlots = (props: any) => {
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: [
-              "infusions",
-              "iv_fluids",
-              "feeds",
-              "total_intake_calculated",
-              "total_output_calculated",
-              "output",
-            ],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res && res.data) {
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: [
+            "infusions",
+            "iv_fluids",
+            "feeds",
+            "total_intake_calculated",
+            "total_output_calculated",
+            "output",
+          ],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res && res.ok && data) {
+        setResults(data.results);
+        setTotalCount(data.count);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+    };
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage]
-  );
+    fetchDailyRounds(currentPage, consultationId);
+  }, [consultationId, currentPage]);
 
   const handlePagination = (page: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/Consultations/PainDiagrams.tsx b/src/Components/Facility/Consultations/PainDiagrams.tsx
index afb070ba14a..183fd6066b3 100644
--- a/src/Components/Facility/Consultations/PainDiagrams.tsx
+++ b/src/Components/Facility/Consultations/PainDiagrams.tsx
@@ -1,13 +1,13 @@
-import { useCallback, useState, useEffect } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { make as CriticalCare__PainViewer } from "../../CriticalCareRecording/Pain/CriticalCare__PainViewer.bs";
 import { formatDateTime } from "../../../Utils/utils";
 
 export const PainDiagrams = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [results, setResults] = useState<any>({});
   const [selectedData, setData] = useState<any>({
@@ -15,48 +15,47 @@ export const PainDiagrams = (props: any) => {
     id: "",
   });
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
+  useEffect(() => {
+    const fetchDailyRounds = async (consultationId: string) => {
       setIsLoading(true);
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
+      const { res, data: dailyRound } = await request(
+        routes.dailyRoundsAnalyse,
+        {
+          body: {
             fields: ["pain_scale_enhanced"],
           },
-          { consultationId }
-        )
+          pathParams: {
+            consultationId,
+          },
+        }
       );
-      if (!status.aborted) {
-        if (res && res.data) {
-          const keys = Object.keys(res.data.results || {}).filter(
-            (key) => res.data.results[key].pain_scale_enhanced.length
-          );
-          const data: any = {};
-          keys.forEach((key) => (data[key] = res.data.results[key]));
+      if (res && res.ok && dailyRound?.results) {
+        const keys = Object.keys(dailyRound.results || {}).filter(
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
+          (key) => dailyRound.results[key].pain_scale_enhanced.length
+        );
+        const data: any = {};
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        keys.forEach((key) => (data[key] = dailyRound.results[key]));
 
-          setResults(data);
-          if (keys.length > 0) {
-            setSelectedDateData(data, keys[0]);
-          }
+        setResults(data);
+        if (keys.length > 0) {
+          setSelectedDateData(data, keys[0]);
         }
-        setIsLoading(false);
       }
-    },
-    [consultationId, dispatch]
-  );
+      setIsLoading(false);
+    };
+
+    fetchDailyRounds(consultationId);
+  }, [consultationId]);
 
   useEffect(() => {
     if (Object.keys(results).length > 0)
       setSelectedDateData(results, Object.keys(results)[0]);
   }, [results]);
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [consultationId]
-  );
-
   useEffect(() => {
     if (Object.keys(results).length > 0)
       setSelectedDateData(results, Object.keys(results)[0]);
diff --git a/src/Components/Facility/Consultations/PressureSoreDiagrams.tsx b/src/Components/Facility/Consultations/PressureSoreDiagrams.tsx
index 84be0fc827a..bf3f4704114 100644
--- a/src/Components/Facility/Consultations/PressureSoreDiagrams.tsx
+++ b/src/Components/Facility/Consultations/PressureSoreDiagrams.tsx
@@ -1,15 +1,15 @@
-import { useCallback, useState, useEffect } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import { make as CriticalCare__PressureScoreViewer } from "../../CriticalCareRecording/PressureSore/CriticalCare__PressureSoreViewer.bs";
 import Pagination from "../../Common/Pagination";
 import { PAGINATION_LIMIT } from "../../../Common/constants";
+
 import { formatDateTime } from "../../../Utils/utils";
+import { PressureSoreDiagramsRes } from "../models";
 
 export const PressureSoreDiagrams = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [results, setResults] = useState<any>({});
   const [selectedData, setData] = useState<any>({
@@ -19,49 +19,49 @@ export const PressureSoreDiagrams = (props: any) => {
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, _setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
       setIsLoading(true);
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
+      const { res, data: dailyRounds } = await request(
+        routes.dailyRoundsAnalyse,
+        {
+          body: {
             page: currentPage,
             fields: ["pressure_sore"],
           },
-          { consultationId }
-        )
+          pathParams: {
+            consultationId,
+          },
+        }
       );
-      if (!status.aborted) {
-        if (res && res.data) {
-          const keys = Object.keys(res.data.results || {}).filter(
-            (key) => res.data.results[key].pressure_sore.length
-          );
-          const data: any = {};
-          keys.forEach((key) => (data[key] = res.data.results[key]));
+      if (res && res.ok && dailyRounds) {
+        const keys = Object.keys(dailyRounds.results || {}).filter(
+          (key) =>
+            (dailyRounds.results[key] as PressureSoreDiagramsRes).pressure_sore
+              .length
+        );
+        const data: any = {};
+        keys.forEach((key) => (data[key] = dailyRounds.results[key]));
 
-          setResults(data);
-          if (keys.length > 0) {
-            setSelectedDateData(data, keys[0]);
-          }
+        setResults(data);
+        if (keys.length > 0) {
+          setSelectedDateData(data, keys[0]);
         }
-        setIsLoading(false);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+      setIsLoading(false);
+    };
+
+    fetchDailyRounds(currentPage, consultationId);
+  }, [consultationId, currentPage]);
 
   useEffect(() => {
     if (Object.keys(results).length > 0)
       setSelectedDateData(results, Object.keys(results)[0]);
   }, [results]);
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [consultationId, currentPage]
-  );
-
   const handlePagination = (page: number, _limit: number) => {
     setCurrentPage(page);
   };
diff --git a/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx b/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
index f7d74a024a1..4ff81acf868 100644
--- a/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
+++ b/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
@@ -1,7 +1,6 @@
-import { useCallback, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import { LinePlot } from "./components/LinePlot";
 import { StackedLinePlot } from "./components/StackedLinePlot";
 import Pagination from "../../Common/Pagination";
@@ -21,50 +20,44 @@ interface PrimaryParametersPlotProps {
 export const PrimaryParametersPlot = ({
   consultationId,
 }: PrimaryParametersPlotProps) => {
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: [
-              "bp",
-              "pulse",
-              "temperature",
-              "resp",
-              "blood_sugar_level",
-              "insulin_intake_frequency",
-              "insulin_intake_dose",
-              "ventilator_spo2",
-              "ventilator_fi02",
-              "rhythm",
-              "rhythm_detail",
-            ],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res && res.data) {
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: [
+            "bp",
+            "pulse",
+            "temperature",
+            "resp",
+            "blood_sugar_level",
+            "insulin_intake_frequency",
+            "insulin_intake_dose",
+            "ventilator_spo2",
+            "ventilator_fi02",
+            "rhythm",
+            "rhythm_detail",
+          ],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res && res.ok && data) {
+        setResults(data.results);
+        setTotalCount(data.count);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+    };
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [consultationId, currentPage]
-  );
+    fetchDailyRounds(currentPage, consultationId);
+  }, [consultationId, currentPage]);
 
   const handlePagination = (page: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/Consultations/VentilatorPlot.tsx b/src/Components/Facility/Consultations/VentilatorPlot.tsx
index c1800823b66..9dfe0ce8a1e 100644
--- a/src/Components/Facility/Consultations/VentilatorPlot.tsx
+++ b/src/Components/Facility/Consultations/VentilatorPlot.tsx
@@ -1,7 +1,6 @@
-import { useCallback, useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../../Common/utils";
-import { dailyRoundsAnalyse } from "../../../Redux/actions";
+import { useEffect, useState } from "react";
+import routes from "../../../Redux/api";
+import request from "../../../Utils/request/request";
 import { LinePlot } from "./components/LinePlot";
 import Pagination from "../../Common/Pagination";
 import { PAGINATION_LIMIT } from "../../../Common/constants";
@@ -30,52 +29,45 @@ const modality: Array<ModalityType> = [
 
 export const VentilatorPlot = (props: any) => {
   const { consultationId } = props;
-  const dispatch: any = useDispatch();
   const [results, setResults] = useState({});
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
 
-  const fetchDailyRounds = useCallback(
-    async (status: statusType) => {
-      const res = await dispatch(
-        dailyRoundsAnalyse(
-          {
-            page: currentPage,
-            fields: [
-              "ventilator_pip",
-              "ventilator_mean_airway_pressure",
-              "ventilator_resp_rate",
-              "ventilator_pressure_support",
-              "ventilator_tidal_volume",
-              "ventilator_peep",
-              "ventilator_fi02",
-              "ventilator_spo2",
-              "etco2",
-              "bilateral_air_entry",
-              "ventilator_oxygen_modality_oxygen_rate",
-              "ventilator_oxygen_modality_flow_rate",
-            ],
-          },
-          { consultationId }
-        )
-      );
-      if (!status.aborted) {
-        if (res && res.data) {
-          console.log(res);
-          setResults(res.data.results);
-          setTotalCount(res.data.count);
-        }
+  useEffect(() => {
+    const fetchDailyRounds = async (
+      currentPage: number,
+      consultationId: string
+    ) => {
+      const { res, data } = await request(routes.dailyRoundsAnalyse, {
+        body: {
+          page: currentPage,
+          fields: [
+            "ventilator_pip",
+            "ventilator_mean_airway_pressure",
+            "ventilator_resp_rate",
+            "ventilator_pressure_support",
+            "ventilator_tidal_volume",
+            "ventilator_peep",
+            "ventilator_fi02",
+            "ventilator_spo2",
+            "etco2",
+            "bilateral_air_entry",
+            "ventilator_oxygen_modality_oxygen_rate",
+            "ventilator_oxygen_modality_flow_rate",
+          ],
+        },
+        pathParams: {
+          consultationId,
+        },
+      });
+      if (res && res.ok && data) {
+        setResults(data.results);
+        setTotalCount(data.count);
       }
-    },
-    [consultationId, dispatch, currentPage]
-  );
+    };
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchDailyRounds(status);
-    },
-    [currentPage]
-  );
+    fetchDailyRounds(currentPage, consultationId);
+  }, [consultationId, currentPage]);
 
   const handlePagination = (page: number) => {
     setCurrentPage(page);
diff --git a/src/Components/Facility/CoverImageEditModal.tsx b/src/Components/Facility/CoverImageEditModal.tsx
index 988bc288f58..a1394c6441f 100644
--- a/src/Components/Facility/CoverImageEditModal.tsx
+++ b/src/Components/Facility/CoverImageEditModal.tsx
@@ -301,11 +301,10 @@ const CoverImageEditModal = ({
           </form>
         ) : (
           <div className="flex max-h-screen min-h-[24rem] flex-col overflow-auto">
-            <div className="flex flex-col bg-gray-300">
+            <div className="mb-1 mt-2 flex flex-col">
               <span className="text-xl font-medium">
                 {t("capture_cover_photo")}
               </span>
-              <span className="mt-1 text-gray-700">{facility.name}</span>
             </div>
             <div className="flex flex-1 items-center justify-center">
               {!previewImage ? (
@@ -326,10 +325,13 @@ const CoverImageEditModal = ({
               )}
             </div>
             {/* buttons for mobile screens */}
-            <div className="m-4 flex justify-evenly sm:hidden ">
+            <div className="m-4 flex flex-col justify-evenly sm:hidden ">
               <div>
                 {!previewImage ? (
-                  <ButtonV2 onClick={handleSwitchCamera} className="m-2">
+                  <ButtonV2
+                    onClick={handleSwitchCamera}
+                    className="my-2 w-full"
+                  >
                     {t("switch")}
                   </ButtonV2>
                 ) : (
@@ -344,7 +346,7 @@ const CoverImageEditModal = ({
                         onClick={() => {
                           captureImage();
                         }}
-                        className="m-2"
+                        className="my-2 w-full"
                       >
                         {t("capture")}
                       </ButtonV2>
@@ -352,17 +354,17 @@ const CoverImageEditModal = ({
                   </>
                 ) : (
                   <>
-                    <div className="flex space-x-2">
+                    <div className="flex flex-col">
                       <ButtonV2
                         onClick={() => {
                           setPreviewImage(null);
                         }}
-                        className="m-2"
+                        className="my-2 w-full"
                         disabled={isUploading}
                       >
                         {t("retake")}
                       </ButtonV2>
-                      <ButtonV2 onClick={handleUpload} className="m-2">
+                      <ButtonV2 onClick={handleUpload} className="my-2 w-full">
                         {isCaptureImgBeingUploaded && (
                           <CareIcon className="care-l-spinner animate-spin text-lg" />
                         )}
@@ -380,7 +382,7 @@ const CoverImageEditModal = ({
                     setIsCameraOpen(false);
                     webRef.current.stopCamera();
                   }}
-                  className="m-2"
+                  className="border-grey-200 my-2 w-full border-2"
                 >
                   {t("close")}
                 </ButtonV2>
diff --git a/src/Components/Facility/FacilityCard.tsx b/src/Components/Facility/FacilityCard.tsx
index ab37ac20c96..e8e0dbef70f 100644
--- a/src/Components/Facility/FacilityCard.tsx
+++ b/src/Components/Facility/FacilityCard.tsx
@@ -157,109 +157,109 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
                 </div>
               </div>
               <div className="flex flex-wrap border-t bg-gray-50 px-2 py-1 md:px-3">
-                <div className="flex justify-between py-2">
-                  <div className="flex w-full flex-wrap justify-between gap-2">
-                    <div className="flex flex-wrap gap-2">
-                      <div
-                        className={`tooltip ml-auto flex h-[38px] w-fit items-center justify-center rounded-md px-2 text-xl ${
+                {/* <div className="flex justify-between py-2"> */}
+                <div className="flex w-full flex-wrap justify-between gap-2 py-2">
+                  <div className="flex flex-wrap gap-2">
+                    <div
+                      className={`tooltip ml-auto flex h-[38px] w-fit items-center justify-center rounded-md px-2 text-xl ${
+                        facility.patient_count / facility.bed_count > 0.85
+                          ? "button-danger-border bg-red-500"
+                          : "button-primary-border bg-primary-100"
+                      }`}
+                    >
+                      <span className="tooltip-text tooltip-top">
+                        Live Patients / Total beds
+                      </span>{" "}
+                      <CareIcon
+                        className={classNames(
+                          "care-l-bed mr-2",
+                          facility.patient_count / facility.bed_count > 0.85
+                            ? "text-white"
+                            : "text-primary-600"
+                        )}
+                      />{" "}
+                      <dt
+                        className={`my-1 text-sm font-semibold ${
                           facility.patient_count / facility.bed_count > 0.85
-                            ? "button-danger-border bg-red-500"
-                            : "button-primary-border bg-primary-100"
+                            ? "text-white"
+                            : "text-gray-700"
                         }`}
                       >
-                        <span className="tooltip-text tooltip-top">
-                          Live Patients / Total beds
-                        </span>{" "}
-                        <CareIcon
-                          className={classNames(
-                            "care-l-bed mr-2",
-                            facility.patient_count / facility.bed_count > 0.85
-                              ? "text-white"
-                              : "text-primary-600"
-                          )}
-                        />{" "}
-                        <dt
-                          className={`my-1 text-sm font-semibold ${
-                            facility.patient_count / facility.bed_count > 0.85
-                              ? "text-white"
-                              : "text-gray-700"
-                          }`}
-                        >
-                          Occupancy: {facility.patient_count} /{" "}
-                          {facility.bed_count}{" "}
-                        </dt>{" "}
-                      </div>
-                      <DialogModal
-                        show={notifyModalFor === facility.id}
-                        title={
-                          <span className="flex justify-center text-2xl">
-                            Notify: {facility.name}
-                          </span>
-                        }
-                        onClose={() => setNotifyModalFor(undefined)}
+                        Occupancy: {facility.patient_count} /{" "}
+                        {facility.bed_count}{" "}
+                      </dt>{" "}
+                    </div>
+                    <DialogModal
+                      show={notifyModalFor === facility.id}
+                      title={
+                        <span className="flex justify-center text-2xl">
+                          Notify: {facility.name}
+                        </span>
+                      }
+                      onClose={() => setNotifyModalFor(undefined)}
+                    >
+                      <form
+                        onSubmit={(event) => {
+                          event.preventDefault();
+                          handleNotifySubmit(notifyModalFor);
+                        }}
+                        className="flex w-full flex-col bg-white text-center"
                       >
-                        <form
-                          onSubmit={(event) => {
-                            event.preventDefault();
-                            handleNotifySubmit(notifyModalFor);
-                          }}
-                          className="flex w-full flex-col bg-white text-center"
-                        >
-                          <TextAreaFormField
-                            id="NotifyModalMessageInput"
-                            name="message"
-                            rows={5}
-                            className="pb-2 pt-4"
-                            onChange={(e) => setNotifyMessage(e.value)}
-                            placeholder="Type your message..."
-                            error={notifyError}
+                        <TextAreaFormField
+                          id="NotifyModalMessageInput"
+                          name="message"
+                          rows={5}
+                          className="pb-2 pt-4"
+                          onChange={(e) => setNotifyMessage(e.value)}
+                          placeholder="Type your message..."
+                          error={notifyError}
+                        />
+                        <div className="flex flex-col-reverse justify-between gap-2 md:flex-row">
+                          <Cancel
+                            onClick={() => setNotifyModalFor(undefined)}
                           />
-                          <div className="flex flex-col-reverse justify-between gap-2 md:flex-row">
-                            <Cancel
-                              onClick={() => setNotifyModalFor(undefined)}
-                            />
-                            <Submit label="Notify" />
-                          </div>
-                        </form>
-                      </DialogModal>
-                    </div>
-                    <div className="flex flex-wrap gap-2">
-                      {userType !== "Staff" ? (
-                        <ButtonV2
-                          id="facility-notify"
-                          ghost
-                          border
-                          className="h-[38px]"
-                          onClick={(_) => setNotifyModalFor(facility.id)}
-                        >
-                          <CareIcon className="care-l-megaphone text-lg" />
-                          <span className="hidden md:block">Notify</span>
-                        </ButtonV2>
-                      ) : (
-                        <></>
-                      )}
+                          <Submit label="Notify" />
+                        </div>
+                      </form>
+                    </DialogModal>
+                  </div>
+                  <div className="flex flex-wrap gap-2">
+                    {userType !== "Staff" ? (
                       <ButtonV2
-                        href={`/facility/${facility.id}`}
-                        id="facility-details"
-                        border
+                        id="facility-notify"
                         ghost
-                        className="h-[38px]"
-                      >
-                        <CareIcon className="care-l-hospital text-lg" />
-                        <span className="hidden md:inline">
-                          {t("view_faciliy")}
-                        </span>
-                      </ButtonV2>
-                      <ButtonV2
-                        href={`/patients?facility=${facility.id}`}
-                        id="facility-patients"
                         border
-                        ghost
+                        className="h-[38px]"
+                        onClick={(_) => setNotifyModalFor(facility.id)}
                       >
-                        <CareIcon className="care-l-user-injured text-lg" />
-                        {t("view_patients")}
+                        <CareIcon className="care-l-megaphone text-lg" />
+                        <span className="hidden md:block">Notify</span>
                       </ButtonV2>
-                    </div>
+                    ) : (
+                      <></>
+                    )}
+                    <ButtonV2
+                      href={`/facility/${facility.id}`}
+                      id="facility-details"
+                      border
+                      ghost
+                      className="h-[38px]"
+                    >
+                      <CareIcon className="care-l-hospital text-lg" />
+                      <span className="hidden md:inline">
+                        {t("view_faciliy")}
+                      </span>
+                    </ButtonV2>
+                    <ButtonV2
+                      href={`/patients?facility=${facility.id}`}
+                      id="facility-patients"
+                      border
+                      ghost
+                    >
+                      <CareIcon className="care-l-user-injured text-lg" />
+                      {t("view_patients")}
+                    </ButtonV2>
+                    {/* </div> */}
                   </div>
                 </div>
               </div>
diff --git a/src/Components/Facility/FacilityConfigure.tsx b/src/Components/Facility/FacilityConfigure.tsx
index 58547bfc585..fae832e50f3 100644
--- a/src/Components/Facility/FacilityConfigure.tsx
+++ b/src/Components/Facility/FacilityConfigure.tsx
@@ -1,7 +1,7 @@
 import { lazy, useReducer, useState } from "react";
 import * as Notification from "../../Utils/Notifications.js";
 import { navigate } from "raviger";
-import { Cancel, Submit } from "../Common/components/ButtonV2";
+import { Submit } from "../Common/components/ButtonV2";
 import TextFormField from "../Form/FormFields/TextFormField";
 import Page from "../Common/components/Page";
 import { ConfigureHealthFacility } from "../ABDM/ConfigureHealthFacility";
@@ -155,7 +155,6 @@ export const FacilityConfigure = (props: IProps) => {
               </div>
             </div>
             <div className="flex flex-col gap-3 sm:flex-row sm:justify-end">
-              <Cancel onClick={() => navigate(`/facility/${facilityId}`)} />
               <Submit onClick={handleSubmit} label="Update" />
             </div>
           </form>
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index 405ba236f05..f14057d4a91 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -370,11 +370,8 @@ export const FacilityHome = (props: any) => {
       />
       {hasCoverImage ? (
         <div
-          className={`group relative h-48 w-full text-clip rounded-t bg-gray-200 opacity-100 transition-all duration-200 ease-in-out md:h-0 md:opacity-0 ${
-            hasPermissionToEditCoverImage && "cursor-pointer"
-          }`}
-          onClick={() =>
-            hasPermissionToEditCoverImage && setEditCoverImage(true)
+          className={
+            "group relative h-48 w-full text-clip rounded-t bg-gray-200 opacity-100 transition-all duration-200 ease-in-out md:h-0 md:opacity-0"
           }
         >
           <CoverImage />
diff --git a/src/Components/Facility/FacilityUsers.tsx b/src/Components/Facility/FacilityUsers.tsx
index caff279ad7e..6963c4006db 100644
--- a/src/Components/Facility/FacilityUsers.tsx
+++ b/src/Components/Facility/FacilityUsers.tsx
@@ -1,28 +1,28 @@
 import { lazy, useCallback, useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
+import CountBlock from "../../CAREUI/display/Count";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { RESULTS_PER_PAGE_LIMIT } from "../../Common/constants";
+import useAuthUser from "../../Common/hooks/useAuthUser";
 import { statusType, useAbortableEffect } from "../../Common/utils";
 import {
   addUserFacility,
-  deleteUserFacility,
-  getUserListFacility,
   deleteUser,
-  getFacilityUsers,
+  deleteUserFacility,
   getAnyFacility,
+  getFacilityUsers,
+  getUserListFacility,
 } from "../../Redux/actions";
-import Pagination from "../Common/Pagination";
-import { USER_TYPES, RESULTS_PER_PAGE_LIMIT } from "../../Common/constants";
-import { FacilityModel } from "../Facility/models";
-import LinkFacilityDialog from "../Users/LinkFacilityDialog";
-import UserDeleteDialog from "../Users/UserDeleteDialog";
 import * as Notification from "../../Utils/Notifications.js";
-import UserDetails from "../Common/UserDetails";
-import UnlinkFacilityDialog from "../Users/UnlinkFacilityDialog";
 import { classNames, isUserOnline, relativeTime } from "../../Utils/utils";
-import CountBlock from "../../CAREUI/display/Count";
-import CareIcon from "../../CAREUI/icons/CareIcon";
+import Pagination from "../Common/Pagination";
+import UserDetails from "../Common/UserDetails";
 import ButtonV2 from "../Common/components/ButtonV2";
 import Page from "../Common/components/Page";
-import useAuthUser from "../../Common/hooks/useAuthUser";
+import { FacilityModel } from "../Facility/models";
+import LinkFacilityDialog from "../Users/LinkFacilityDialog";
+import UnlinkFacilityDialog from "../Users/UnlinkFacilityDialog";
+import UserDeleteDialog from "../Users/UserDeleteDialog";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -273,26 +273,6 @@ export default function FacilityUsers(props: any) {
     loadFacilities(username);
   };
 
-  const showDelete = (user: any) => {
-    const STATE_ADMIN_LEVEL = USER_TYPES.indexOf("StateAdmin");
-    const STATE_READ_ONLY_ADMIN_LEVEL =
-      USER_TYPES.indexOf("StateReadOnlyAdmin");
-    const DISTRICT_ADMIN_LEVEL = USER_TYPES.indexOf("DistrictAdmin");
-    const level = USER_TYPES.indexOf(user.user_type);
-    const currentUserLevel = USER_TYPES.indexOf(authUser.user_type);
-    if (user.is_superuser) return true;
-
-    if (currentUserLevel >= STATE_ADMIN_LEVEL)
-      return user.state_object?.id === authUser.state;
-    if (
-      currentUserLevel < STATE_READ_ONLY_ADMIN_LEVEL &&
-      currentUserLevel >= DISTRICT_ADMIN_LEVEL &&
-      currentUserLevel > level
-    )
-      return facilityData?.district_object_id === authUser.district;
-    return false;
-  };
-
   let userList: any[] = [];
 
   users &&
@@ -340,7 +320,7 @@ export default function FacilityUsers(props: any) {
                       aria-label="Online"
                     ></i>
                   ) : null}
-                  {showDelete(user) && (
+                  {authUser.user_type === "StateAdmin" && (
                     <button
                       type="button"
                       className="focus:ring-blue m-3 w-20 self-end rounded-md border border-red-500 bg-white px-3 py-2 text-center text-sm font-medium leading-4 text-red-700 transition duration-150 ease-in-out hover:text-red-500 hover:shadow focus:border-red-300 focus:outline-none active:bg-gray-50 active:text-red-800"
diff --git a/src/Components/Facility/PatientNoteCard.tsx b/src/Components/Facility/PatientNoteCard.tsx
new file mode 100644
index 00000000000..2f07702504a
--- /dev/null
+++ b/src/Components/Facility/PatientNoteCard.tsx
@@ -0,0 +1,37 @@
+import { relativeDate, formatDateTime, classNames } from "../../Utils/utils";
+import { USER_TYPES_MAP } from "../../Common/constants";
+import { PatientNotesModel } from "./models";
+
+const PatientNoteCard = ({ note }: { note: PatientNotesModel }) => {
+  return (
+    <div
+      className={classNames(
+        "mt-4 flex w-full flex-col rounded-lg border border-gray-300 bg-white p-3 text-gray-800",
+        note.user_type === "RemoteSpecialist" && "border-primary-400"
+      )}
+    >
+      <div className="flex">
+        <span className="text-sm font-semibold text-gray-700">
+          {note.created_by_object?.first_name || "Unknown"}{" "}
+          {note.created_by_object?.last_name}
+        </span>
+        {note.user_type && (
+          <span className="pl-2 text-sm text-gray-700">
+            {`(${USER_TYPES_MAP[note.user_type]})`}
+          </span>
+        )}
+      </div>
+      <span className="whitespace-pre-wrap break-words">{note.note}</span>
+      <div className="mt-3 text-end text-xs text-gray-500">
+        <div className="tooltip inline">
+          <span className="tooltip-text tooltip-left">
+            {formatDateTime(note.created_date)}
+          </span>
+          {relativeDate(note.created_date)}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PatientNoteCard;
diff --git a/src/Components/Facility/PatientNotesList.tsx b/src/Components/Facility/PatientNotesList.tsx
new file mode 100644
index 00000000000..330bca4b06d
--- /dev/null
+++ b/src/Components/Facility/PatientNotesList.tsx
@@ -0,0 +1,127 @@
+import { useCallback, useState, useEffect } from "react";
+import { useDispatch } from "react-redux";
+import { statusType, useAbortableEffect } from "../../Common/utils";
+import { getPatientNotes } from "../../Redux/actions";
+import { RESULTS_PER_PAGE_LIMIT } from "../../Common/constants";
+import CircularProgress from "../Common/components/CircularProgress";
+import PatientNoteCard from "./PatientNoteCard";
+import InfiniteScroll from "react-infinite-scroll-component";
+import { NoteType } from "./PatientNoteCard";
+
+interface PatientNotesProps {
+  patientId: any;
+  facilityId: any;
+  reload?: boolean;
+  setReload?: any;
+}
+
+interface StateType {
+  notes: NoteType[];
+  cPage: number;
+  totalPages: number;
+}
+
+const pageSize = RESULTS_PER_PAGE_LIMIT;
+
+const PatientNotesList = (props: PatientNotesProps) => {
+  const { reload, setReload } = props;
+
+  const dispatch: any = useDispatch();
+  const initialData: StateType = { notes: [], cPage: 1, totalPages: 1 };
+  const [state, setState] = useState(initialData);
+  const [isLoading, setIsLoading] = useState(true);
+
+  const fetchData = useCallback(
+    async (page = 1, status: statusType = { aborted: false }) => {
+      setIsLoading(true);
+      const res = await dispatch(
+        getPatientNotes(props.patientId, pageSize, (page - 1) * pageSize)
+      );
+      if (!status.aborted) {
+        if (res && res.data) {
+          if (page === 1) {
+            setState({
+              notes: res.data?.results,
+              cPage: page,
+              totalPages: Math.ceil(res.data.count / pageSize),
+            });
+          } else {
+            setState((prevState: any) => ({
+              ...prevState,
+              notes: [...prevState.notes, ...res.data.results],
+              cPage: page,
+              totalPages: Math.ceil(res.data.count / pageSize),
+            }));
+          }
+        }
+        setIsLoading(false);
+      }
+    },
+    [props.patientId, dispatch]
+  );
+
+  useEffect(() => {
+    if (reload) {
+      fetchData(1);
+      setReload(false);
+    }
+  }, [reload]);
+
+  useAbortableEffect(
+    (status: statusType) => {
+      fetchData(1, status);
+    },
+    [fetchData]
+  );
+
+  const handleNext = () => {
+    if (state.cPage < state.totalPages) {
+      fetchData(state.cPage + 1);
+      setState((prevState: any) => ({
+        ...prevState,
+        cPage: prevState.cPage + 1,
+      }));
+    }
+  };
+
+  if (isLoading && !state.notes.length) {
+    return (
+      <div className=" flex h-[400px] w-full items-center justify-center bg-white">
+        <CircularProgress />
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className="m-2 flex h-[390px] grow flex-col-reverse overflow-auto bg-white"
+      id="patient-notes-list"
+    >
+      {state.notes.length ? (
+        <InfiniteScroll
+          next={handleNext}
+          hasMore={state.cPage < state.totalPages}
+          loader={
+            <div className="flex items-center justify-center">
+              <CircularProgress />
+            </div>
+          }
+          className="flex h-full flex-col-reverse p-2"
+          inverse={true}
+          dataLength={state.notes.length}
+          scrollableTarget="patient-notes-list"
+        >
+          {state.notes.map((note: any) => (
+            <PatientNoteCard note={note} key={note.id} />
+          ))}
+        </InfiniteScroll>
+      ) : (
+        <div className="mt-2 flex items-center justify-center text-2xl font-bold text-gray-500">
+          No Notes Found
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default PatientNotesList;
diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx
new file mode 100644
index 00000000000..27a961b9d9b
--- /dev/null
+++ b/src/Components/Facility/PatientNotesSlideover.tsx
@@ -0,0 +1,160 @@
+import { useState, useEffect, Dispatch, SetStateAction } from "react";
+import { getPatient, addPatientNote } from "../../Redux/actions";
+import * as Notification from "../../Utils/Notifications.js";
+import { useDispatch } from "react-redux";
+import PatientNotesList from "./PatientNotesList";
+import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { classNames } from "../../Utils/utils";
+import TextFormField from "../Form/FormFields/TextFormField";
+import ButtonV2 from "../Common/components/ButtonV2";
+import { make as Link } from "../Common/components/Link.bs";
+import { useMessageListener } from "../../Common/hooks/useMessageListener";
+
+interface PatientNotesProps {
+  patientId: string;
+  facilityId: string;
+  setShowPatientNotesPopup: Dispatch<SetStateAction<boolean>>;
+}
+
+export default function PatientNotesSlideover(props: PatientNotesProps) {
+  const [show, setShow] = useState(false);
+  const [patientActive, setPatientActive] = useState(true);
+  const [noteField, setNoteField] = useState("");
+  const [reload, setReload] = useState(false);
+
+  const dispatch = useDispatch();
+
+  const { facilityId, patientId, setShowPatientNotesPopup } = props;
+
+  const onAddNote = () => {
+    const payload = {
+      note: noteField,
+    };
+    if (!/\S+/.test(noteField)) {
+      Notification.Error({
+        msg: "Note Should Contain At Least 1 Character",
+      });
+      return;
+    }
+    dispatch(addPatientNote(patientId, payload)).then(() => {
+      Notification.Success({ msg: "Note added successfully" });
+      setNoteField("");
+      setReload(!reload);
+    });
+  };
+
+  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);
+    }
+  });
+
+  useEffect(() => {
+    async function fetchPatientName() {
+      if (patientId) {
+        const res = await dispatch(getPatient({ id: patientId }));
+        if (res.data) {
+          setPatientActive(res.data.is_active);
+        }
+      }
+    }
+    fetchPatientName();
+  }, [dispatch, patientId]);
+
+  const notesActionIcons = (
+    <div className="flex gap-1">
+      {show && (
+        <Link
+          className="flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-gray-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
+          href={`/facility/${facilityId}/patient/${patientId}/notes`}
+        >
+          <CareIcon className="care-l-window-maximize text-lg transition-all delay-150 duration-300 ease-out" />
+        </Link>
+      )}
+      <div
+        id="expand_doctor_notes"
+        className={classNames(
+          "flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-gray-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100",
+          show && "rotate-180"
+        )}
+        onClick={() => setShow(!show)}
+      >
+        <CareIcon className="care-l-angle-up text-lg transition-all delay-150 duration-300 ease-out" />
+      </div>
+      <div
+        className="flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-gray-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
+        onClick={() => setShowPatientNotesPopup(false)}
+      >
+        <CareIcon className="care-l-times text-lg transition-all delay-150 duration-300 ease-out" />
+      </div>
+    </div>
+  );
+
+  return (
+    <div
+      className={classNames(
+        "fixed bottom-0 z-20 sm:right-8",
+        show
+          ? "right-0 h-screen w-screen sm:h-fit sm:w-[400px]"
+          : "right-8 w-[250px]"
+      )}
+    >
+      {!show ? (
+        <div
+          className="flex w-full cursor-pointer items-center justify-around rounded-t-md bg-primary-800 p-2 text-white"
+          onClick={() => setShow(!show)}
+        >
+          <span className="font-semibold">{"Doctor's Notes"}</span>
+          {notesActionIcons}
+        </div>
+      ) : (
+        <div className="flex h-screen w-full -translate-y-0 flex-col text-clip border-2 border-b-0 border-primary-800 bg-white pb-3 transition-all sm:h-[500px] sm:rounded-t-md ">
+          {/* Doctor Notes Header */}
+          <div className="flex w-full items-center justify-between bg-primary-800 p-2 px-4 text-white">
+            <span className="font-semibold">{"Doctor's Notes"}</span>
+            {notesActionIcons}
+          </div>
+          {/* Doctor Notes Body */}
+          <PatientNotesList
+            facilityId={facilityId}
+            patientId={patientId}
+            reload={reload}
+            setReload={setReload}
+          />
+          <div className="relative mx-4 flex items-center">
+            <TextFormField
+              id="doctor_notes_textarea"
+              name="note"
+              value={noteField}
+              onChange={(e) => setNoteField(e.value)}
+              className="grow"
+              type="text"
+              errorClassName="hidden"
+              placeholder="Type your Note"
+              disabled={!patientActive}
+            />
+            <ButtonV2
+              id="add_doctor_note_button"
+              onClick={onAddNote}
+              border={false}
+              className="absolute right-2"
+              ghost
+              size="small"
+              disabled={!patientActive}
+              authorizeFor={NonReadOnlyUsers}
+            >
+              <CareIcon className="care-l-message text-lg" />
+            </ButtonV2>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index 674c161428d..3ff5d47d5e0 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -139,7 +139,7 @@ const TreatmentSummary = (props: any) => {
                   <b>Date of admission :</b>
                   <span>
                     {consultationData.admitted
-                      ? formatDate(consultationData.admission_date)
+                      ? formatDateTime(consultationData.admission_date)
                       : " --/--/----"}
                   </span>
                 </div>
diff --git a/src/Components/Facility/TriageForm.tsx b/src/Components/Facility/TriageForm.tsx
index 3c8e6b1497b..9264661fc45 100644
--- a/src/Components/Facility/TriageForm.tsx
+++ b/src/Components/Facility/TriageForm.tsx
@@ -21,7 +21,7 @@ import { FieldChangeEvent } from "../Form/FormFields/Utils";
 const Loading = lazy(() => import("../Common/Loading"));
 import Page from "../Common/components/Page";
 import dayjs from "dayjs";
-import { dateQueryString } from "../../Utils/utils";
+import { dateQueryString, scrollTo } from "../../Utils/utils";
 
 interface triageFormProps extends PatientStatsModel {
   facilityId: number;
@@ -172,6 +172,10 @@ export const TriageForm = (props: triageFormProps) => {
     });
     if (invalidForm) {
       dispatch({ type: "set_error", errors });
+      const firstError = Object.keys(errors).find((e) => errors[e]);
+      if (firstError) {
+        scrollTo(firstError);
+      }
       return false;
     }
     dispatch({ type: "set_error", errors });
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 3d240200a34..aa4edb18810 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -3,6 +3,7 @@ import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import { AssetData } from "../Assets/AssetTypes";
 import { UserBareMinimum } from "../Users/models";
+import { RouteToFacility } from "../Common/RouteToFacilitySelect";
 import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types";
 import { PaginatedResponse } from "../../Utils/request/types";
 
@@ -12,21 +13,25 @@ export interface LocalBodyModel {
   localbody_code: string;
   district: number;
 }
+
 export interface DistrictModel {
   id: number;
   name: string;
   state: number;
 }
+
 export interface StateModel {
   id: number;
   name: string;
 }
+
 export interface WardModel {
   id: number;
   name: string;
   number: number;
   local_body: number;
 }
+
 export interface FacilityModel {
   id?: number;
   name?: string;
@@ -89,6 +94,7 @@ export type PatientCategory =
 
 export interface ConsultationModel {
   admission_date?: string;
+  icu_admission_date?: string;
   admitted?: boolean;
   test_id?: string;
   admitted_to?: string;
@@ -108,19 +114,25 @@ export interface ConsultationModel {
   other_symptoms?: string;
   patient?: string;
   treatment_plan?: string;
-  referred_to?: number | null;
+  referred_to?: FacilityModel["id"];
   referred_to_object?: FacilityModel;
   referred_to_external?: string;
+  referred_from_facility?: FacilityModel["id"];
+  referred_from_facility_object?: FacilityModel;
+  referred_from_facility_external?: string;
+  referred_by_external?: string;
+  transferred_from_location?: LocationModel["id"];
+  transferred_from_location_object?: LocationModel;
   suggestion?: string;
   patient_no?: string;
-  consultation_status?: number;
+  route_to_facility?: RouteToFacility;
   is_kasp?: boolean;
   kasp_enabled_date?: string;
   readonly diagnoses?: ConsultationDiagnosis[];
   create_diagnoses?: CreateDiagnosis[]; // Used for bulk creating diagnoses upon consultation creation
   deprecated_verified_by?: string;
-  verified_by?: string;
-  verified_by_object?: UserBareMinimum;
+  treating_physician?: UserBareMinimum["id"];
+  treating_physician_object?: UserBareMinimum;
   suggestion_text?: string;
   symptoms?: Array<number>;
   symptoms_text?: string;
@@ -149,6 +161,7 @@ export interface ConsultationModel {
   is_readmission?: boolean;
   medico_legal_case?: boolean;
 }
+
 export interface PatientStatsModel {
   id?: number;
   entryDate?: string;
@@ -235,3 +248,250 @@ export type IStateListResponse = PaginatedResponse<{
   id: number;
   name: string;
 }>;
+
+export type ABGPlotsFields =
+  | "ph"
+  | "pco2"
+  | "po2"
+  | "hco3"
+  | "base_excess"
+  | "lactate"
+  | "sodium"
+  | "potassium"
+  | "ventilator_fi02";
+
+export type ABGPlotsRes = {
+  ph: string;
+  pco2: number;
+  po2: number;
+  hco3: string;
+  base_excess: number;
+  lactate: string;
+  sodium: string;
+  potassium: string;
+  ventilator_fi02: number;
+};
+
+export type DialysisPlotsFields =
+  | "dialysis_fluid_balance"
+  | "dialysis_net_balance";
+
+export type DialysisPlotsRes = {
+  dialysis_fluid_balance: number;
+  dialysis_net_balance: number;
+};
+
+export type NeurologicalTablesFields =
+  | "consciousness_level"
+  | "consciousness_level_detail"
+  | "left_pupil_size"
+  | "left_pupil_size_detail"
+  | "right_pupil_size"
+  | "right_pupil_size_detail"
+  | "left_pupil_light_reaction"
+  | "left_pupil_light_reaction_detail"
+  | "right_pupil_light_reaction"
+  | "right_pupil_light_reaction_detail"
+  | "limb_response_upper_extremity_right"
+  | "limb_response_upper_extremity_left"
+  | "limb_response_lower_extremity_left"
+  | "limb_response_lower_extremity_right"
+  | "glasgow_eye_open"
+  | "glasgow_verbal_response"
+  | "glasgow_motor_response"
+  | "glasgow_total_calculated";
+
+export type NeurologicalTablesRes = {
+  consciousness_level: number;
+  consciousness_level_detail: string;
+  left_pupil_size: number;
+  left_pupil_size_detail: string;
+  right_pupil_size: number;
+  right_pupil_size_detail: string;
+  left_pupil_light_reaction: number;
+  left_pupil_light_reaction_detail: string;
+  right_pupil_light_reaction: number;
+  right_pupil_light_reaction_detail: string;
+  limb_response_upper_extremity_right: number;
+  limb_response_upper_extremity_left: number;
+  limb_response_lower_extremity_left: number;
+  limb_response_lower_extremity_right: number;
+  glasgow_eye_open: number;
+  glasgow_verbal_response: number;
+  glasgow_motor_response: number;
+  glasgow_total_calculated: number;
+};
+
+export type NursingPlotFields = "nursing";
+
+export type NursingPlotRes = {
+  nursing: any[];
+};
+
+export type NutritionPlotsFields =
+  | "infusions"
+  | "iv_fluids"
+  | "feeds"
+  | "total_intake_calculated"
+  | "total_output_calculated"
+  | "output";
+
+export type NutritionPlotsRes = {
+  infusions: any[];
+  iv_fluids: any[];
+  feeds: any[];
+  total_intake_calculated: string;
+  total_output_calculated: string;
+  output: any[];
+};
+
+export type PainDiagramsFields = "pain_scale_enhanced";
+
+export type PainDiagramsRes = {
+  pain_scale_enhanced: any[];
+};
+
+export type PressureSoreDiagramsFields = "pressure_sore";
+
+export type PressureSoreDiagramsRes = {
+  pressure_sore: any[];
+};
+
+export type PrimaryParametersPlotFields =
+  | "bp"
+  | "pulse"
+  | "temperature"
+  | "resp"
+  | "blood_sugar_level"
+  | "insulin_intake_frequency"
+  | "insulin_intake_dose"
+  | "ventilator_spo2"
+  | "ventilator_fi02"
+  | "rhythm"
+  | "rhythm_detail";
+
+export type PrimaryParametersPlotRes = {
+  bp: {
+    mean?: number;
+    systolic?: number;
+    diastolic?: number;
+  };
+  pulse: number;
+  temperature: string;
+  resp: number;
+  blood_sugar_level: number;
+  insulin_intake_frequency: number;
+  insulin_intake_dose: string;
+  ventilator_spo2: number;
+  ventilator_fi02: number;
+  rhythm: number;
+  rhythm_detail: string;
+};
+
+export type VentilatorPlotFields =
+  | "ventilator_pip"
+  | "ventilator_mean_airway_pressure"
+  | "ventilator_resp_rate"
+  | "ventilator_pressure_support"
+  | "ventilator_tidal_volume"
+  | "ventilator_peep"
+  | "ventilator_fi02"
+  | "ventilator_spo2"
+  | "etco2"
+  | "bilateral_air_entry"
+  | "ventilator_oxygen_modality_oxygen_rate"
+  | "ventilator_oxygen_modality_flow_rate";
+
+export type VentilatorPlotRes = {
+  ventilator_pip: number;
+  ventilator_mean_airway_pressure: number;
+  ventilator_resp_rate: number;
+  ventilator_pressure_support: number;
+  ventilator_tidal_volume: number;
+  ventilator_peep: string;
+  ventilator_fi02: number;
+  ventilator_spo2: number;
+  etco2: number;
+  bilateral_air_entry: boolean;
+  ventilator_oxygen_modality_oxygen_rate: number;
+  ventilator_oxygen_modality_flow_rate: number;
+};
+
+export interface DailyRoundsBody {
+  page?: number;
+  fields:
+    | ABGPlotsFields[]
+    | DialysisPlotsFields[]
+    | NeurologicalTablesFields[]
+    | NursingPlotFields[]
+    | NutritionPlotsFields[]
+    | PainDiagramsFields[]
+    | PressureSoreDiagramsFields[]
+    | PrimaryParametersPlotFields[]
+    | VentilatorPlotFields[];
+}
+
+export interface DailyRoundsRes {
+  count: number;
+  page_size: number;
+  results: {
+    [date: string]:
+      | PressureSoreDiagramsRes
+      | ABGPlotsRes
+      | DialysisPlotsRes
+      | NeurologicalTablesRes
+      | NursingPlotRes
+      | NutritionPlotsRes
+      | PainDiagramsRes
+      | PrimaryParametersPlotRes
+      | VentilatorPlotRes;
+  };
+}
+
+export interface CreateBedBody {
+  start_date: string;
+  assets: string[];
+  consultation: string;
+  bed: string;
+}
+
+// Patient Notes Model
+export interface BaseFacilityModel {
+  id: string;
+  name: string;
+  local_body: number;
+  district: number;
+  state: number;
+  ward_object: WardModel;
+  local_body_object?: LocalBodyModel;
+  district_object?: DistrictModel;
+  state_object?: StateModel;
+  facility_type: FacilityType;
+  read_cover_image_url: any;
+  features: any[];
+  patient_count: number;
+  bed_count: number;
+}
+
+export interface FacilityType {
+  id: number;
+  name: string;
+}
+
+export interface BaseUserModel {
+  id: number;
+  first_name: string;
+  username: string;
+  email: string;
+  last_name: string;
+  user_type: string;
+  last_login: string;
+}
+
+export interface PatientNotesModel {
+  note: string;
+  facility: BaseFacilityModel;
+  created_by_object: BaseUserModel;
+  user_type?: string;
+  created_date: string;
+}
diff --git a/src/Components/HCX/models.ts b/src/Components/HCX/models.ts
index 7e624c474d7..a8a9812d31d 100644
--- a/src/Components/HCX/models.ts
+++ b/src/Components/HCX/models.ts
@@ -26,8 +26,8 @@ export interface HCXPolicyModel {
   patient_object?: PatientModel;
   subscriber_id: string;
   policy_id: string;
-  insurer_id: string;
-  insurer_name: string;
+  insurer_id?: string;
+  insurer_name?: string;
   status?: HCXPolicyStatus;
   priority?: "Immediate" | "Normal" | "Deferred";
   purpose?: "Auth Requirements" | "Benefits" | "Discovery" | "Validation";
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 187d5447314..9b37c53f599 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -39,7 +39,11 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
 
   const discontinuedPrescriptions = useQuery(MedicineRoutes.listPrescriptions, {
     pathParams: { consultation },
-    query: { ...filters, discontinued: true },
+    query: {
+      ...filters,
+      limit: showDiscontinued ? 100 : 1,
+      discontinued: true,
+    },
     prefetch: !showDiscontinued,
   });
 
@@ -97,47 +101,60 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           )
         }
       />
-
-      <ScrollOverlay
-        className="rounded-lg border shadow"
-        overlay={
-          <div className="flex items-center gap-2 pb-2">
-            <span className="text-sm">Scroll to view more prescriptions</span>
-            <CareIcon icon="l-arrow-down" className="animate-bounce text-2xl" />
-          </div>
-        }
-        disableOverlay={loading || !prescriptions?.length}
-      >
-        {loading && <Loading />}
-        {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
-
-        {!!prescriptions?.length && (
-          <MedicineAdministrationTable
-            prescriptions={prescriptions}
-            pagination={pagination}
-            onRefetch={() => {
-              refetch();
-              discontinuedPrescriptions.refetch();
-            }}
-          />
-        )}
-
-        {!showDiscontinued && !!discontinuedCount && (
+      <div className="rounded-lg border shadow">
+        <ScrollOverlay
+          overlay={
+            <div className="flex items-center gap-2 pb-2">
+              <span className="text-sm">Scroll to view more prescriptions</span>
+              <CareIcon
+                icon="l-arrow-down"
+                className="animate-bounce text-2xl"
+              />
+            </div>
+          }
+          disableOverlay={
+            loading || !prescriptions?.length || !(prescriptions?.length > 1)
+          }
+        >
+          {loading ? (
+            <Loading />
+          ) : (
+            <>
+              {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
+              {!!prescriptions?.length && (
+                <MedicineAdministrationTable
+                  prescriptions={prescriptions}
+                  pagination={pagination}
+                  onRefetch={() => {
+                    refetch();
+                    discontinuedPrescriptions.refetch();
+                  }}
+                />
+              )}
+            </>
+          )}
+        </ScrollOverlay>
+        {!!discontinuedCount && (
           <ButtonV2
             variant="secondary"
             className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
-            onClick={() => setShowDiscontinued(true)}
+            disabled={loading || discontinuedPrescriptions.loading}
+            onClick={() => setShowDiscontinued(!showDiscontinued)}
           >
             <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-              <CareIcon icon="l-eye" className="text-lg" />
+              <CareIcon
+                icon={showDiscontinued ? "l-eye-slash" : "l-eye"}
+                className="text-lg"
+              />
               <span>
-                Show <strong>{discontinuedCount}</strong> discontinued
+                {showDiscontinued ? "Hide" : "Show"}{" "}
+                <strong>{discontinuedCount}</strong> discontinued
                 prescription(s)
               </span>
             </span>
           </ButtonV2>
         )}
-      </ScrollOverlay>
+      </div>
     </div>
   );
 };
diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx
index 425bdecd894..03b9f746bba 100644
--- a/src/Components/Medicine/PrescrpitionTimeline.tsx
+++ b/src/Components/Medicine/PrescrpitionTimeline.tsx
@@ -1,7 +1,7 @@
 import dayjs from "../../Utils/dayjs";
 import useSlug from "../../Common/hooks/useSlug";
 import useQuery from "../../Utils/request/useQuery";
-import { classNames, formatDateTime } from "../../Utils/utils";
+import { classNames, formatDateTime, formatTime } from "../../Utils/utils";
 import { MedicineAdministrationRecord, Prescription } from "./models";
 import MedicineRoutes from "./routes";
 import Timeline, {
@@ -120,7 +120,9 @@ const MedicineAdministeredNode = ({
         event={event}
         className={classNames(event.cancelled && "opacity-70")}
         // TODO: to add administered dosage when Titrated Prescriptions are implemented
-        // titleSuffix={`administered ${event.administration.dosage}.`}
+        titleSuffix={`administered the medicine at ${formatTime(
+          event.administration.administered_date
+        )}.`}
         actions={
           !event.cancelled &&
           !hideArchive && (
@@ -198,13 +200,14 @@ const compileEvents = (
   administrations
     .sort(
       (a, b) =>
-        new Date(a.created_date).getTime() - new Date(b.created_date).getTime()
+        new Date(a.administered_date!).getTime() -
+        new Date(b.administered_date!).getTime()
     )
     .forEach((administration) => {
       events.push({
         type: "administered",
         icon: "l-syringe",
-        timestamp: administration.created_date,
+        timestamp: administration.administered_date!,
         by: administration.administered_by,
         cancelled: !!administration.archived_on,
         administration,
diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
index 864208a432f..6066bf6c66b 100644
--- a/src/Components/Notifications/NotificationsList.tsx
+++ b/src/Components/Notifications/NotificationsList.tsx
@@ -62,6 +62,8 @@ const NotificationTile = ({
         return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/daily-rounds/${data.daily_round}`;
       case "INVESTIGATION_SESSION_CREATED":
         return `/facility/${data.facility}/patient/${data.patient}/consultation/${data.consultation}/investigation/${data.session}`;
+      case "PATIENT_NOTE_ADDED":
+        return `/facility/${data.facility}/patient/${data.patient}/notes`;
       case "MESSAGE":
         return "/notice_board/";
       default:
@@ -356,6 +358,7 @@ export default function NotificationsList({
     manageResults = (
       <>
         {data
+          .filter((notification: any) => notification.event != "PUSH_MESSAGE")
           .filter((notification: any) =>
             showUnread ? notification.read_at === null : true
           )
diff --git a/src/Components/Notifications/ShowPushNotification.tsx b/src/Components/Notifications/ShowPushNotification.tsx
index 35e9ecd7e70..2d2faa5ff5f 100644
--- a/src/Components/Notifications/ShowPushNotification.tsx
+++ b/src/Components/Notifications/ShowPushNotification.tsx
@@ -29,6 +29,8 @@ export default function ShowPushNotification({ id }: DetailRoute) {
         return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/daily-rounds/${caused_objects?.daily_round}`;
       case "INVESTIGATION_SESSION_CREATED":
         return `/facility/${caused_objects?.facility}/patient/${caused_objects?.patient}/consultation/${caused_objects?.consultation}/investigation/${caused_objects?.session}`;
+      case "PATIENT_NOTE_ADDED":
+        return `/facility/${caused_objects.facility}/patient/${caused_objects.patient}/notes`;
       case "MESSAGE":
         return "/notice_board/";
       default:
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index ff749aed29e..72075939bd7 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -609,7 +609,6 @@ export const DailyRounds = (props: any) => {
 
                 <SelectFormField
                   {...field("rhythm")}
-                  required
                   label="Rhythm"
                   options={RHYTHM_CHOICES}
                   optionLabel={(option) => option.desc}
diff --git a/src/Components/Patient/InsuranceDetails.tsx b/src/Components/Patient/InsuranceDetails.tsx
new file mode 100644
index 00000000000..dc8df8ff8a9
--- /dev/null
+++ b/src/Components/Patient/InsuranceDetails.tsx
@@ -0,0 +1,62 @@
+import { lazy } from "react";
+
+import Page from "../Common/components/Page";
+
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import { HCXPolicyModel } from "../HCX/models";
+import { InsuranceDetialsCard } from "./InsuranceDetailsCard";
+
+const Loading = lazy(() => import("../Common/Loading"));
+
+interface IProps {
+  facilityId: string;
+  id: string;
+}
+
+export const InsuranceDetails = (props: IProps) => {
+  const { facilityId, id } = props;
+
+  const { data: insuranceDetials, loading } = useQuery(routes.listHCXPolicies, {
+    query: {
+      patient: id,
+    },
+  });
+
+  if (loading) {
+    return <Loading />;
+  }
+
+  return (
+    <Page
+      title="Insurance Details"
+      crumbsReplacements={{
+        [facilityId]: {
+          name: insuranceDetials?.results[0]?.patient_object?.facility_object
+            ?.name,
+        },
+        [id]: {
+          name: insuranceDetials?.results[0]?.patient_object?.name,
+        },
+      }}
+      className="w-full overflow-x-hidden"
+    >
+      {loading ? (
+        <Loading />
+      ) : insuranceDetials?.count === 0 ? (
+        <div className="mt-5 flex w-full items-center justify-center text-xl font-bold text-gray-500">
+          No Insurance Details Available
+        </div>
+      ) : (
+        <section
+          className="mt-5 grid grid-cols-1 gap-6 lg:grid-cols-3"
+          data-testid="patient-details"
+        >
+          {insuranceDetials?.results.map((data: HCXPolicyModel) => (
+            <InsuranceDetialsCard data={data} />
+          ))}
+        </section>
+      )}
+    </Page>
+  );
+};
diff --git a/src/Components/Patient/InsuranceDetailsCard.tsx b/src/Components/Patient/InsuranceDetailsCard.tsx
new file mode 100644
index 00000000000..b928ce7bffd
--- /dev/null
+++ b/src/Components/Patient/InsuranceDetailsCard.tsx
@@ -0,0 +1,78 @@
+import ButtonV2 from "../Common/components/ButtonV2";
+import { HCXPolicyModel } from "../HCX/models";
+import { navigate } from "raviger";
+
+interface InsuranceDetails {
+  data?: HCXPolicyModel;
+  showViewAllDetails?: boolean;
+}
+
+export const InsuranceDetialsCard = (props: InsuranceDetails) => {
+  const { data, showViewAllDetails } = props;
+
+  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-gray-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>
+            <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>
+            <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="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>
+            {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
+                    onClick={() => {
+                      navigate(
+                        `/facility/${data.patient_object?.facility_object?.id}/patient/${data.patient_object?.id}/insurance`
+                      );
+                    }}
+                    className="h-auto whitespace-pre-wrap border border-gray-500 bg-white text-black hover:bg-gray-300"
+                  >
+                    View All Details
+                  </ButtonV2>
+                </div>
+              </div>
+            )}
+          </div>
+        ) : (
+          <div className="flex w-full items-center justify-center text-xl font-bold text-gray-500">
+            No Insurance Details Available
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index 7bc7f7b861f..4ab7f14c895 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -671,7 +671,7 @@ export default function PatientFilter(props: any) {
             COVID Details based
           </h1>
         }
-        expanded={true}
+        expanded={false}
         className="w-full rounded-md"
       >
         <div className="grid w-full grid-cols-1 gap-4">
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index b6ceaf2e4dc..fad482934ac 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -32,6 +32,9 @@ import UserAutocompleteFormField from "../Common/UserAutocompleteFormField";
 import dayjs from "../../Utils/dayjs";
 import { triggerGoal } from "../../Integrations/Plausible";
 import useAuthUser from "../../Common/hooks/useAuthUser";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import { InsuranceDetialsCard } from "./InsuranceDetailsCard";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -91,6 +94,13 @@ export const PatientHome = (props: any) => {
     });
   };
 
+  const { data: insuranceDetials } = useQuery(routes.listHCXPolicies, {
+    query: {
+      patient: id,
+      limit: 1,
+    },
+  });
+
   const handleAssignedVolunteer = () => {
     dispatch(
       patchPatient(
@@ -457,7 +467,7 @@ export const PatientHome = (props: any) => {
             </div>
             <div className="mt-4 flex items-center">
               <ButtonV2
-                className="w-full"
+                className="mb-2 w-full"
                 disabled={!patientData.is_active}
                 onClick={() =>
                   navigate(
@@ -717,7 +727,7 @@ export const PatientHome = (props: any) => {
                   </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">
+                  <div className="w-1/2 border-r-2 pb-1 pr-2">
                     <div className="text-sm font-normal leading-5 text-gray-500">
                       Created
                     </div>
@@ -730,7 +740,7 @@ export const PatientHome = (props: any) => {
                       </div>
                     </div>
                   </div>
-                  <div className="w-1/2 pb-1">
+                  <div className="w-1/2 pb-1 pl-2">
                     <div className="text-sm font-normal leading-5 text-gray-500">
                       Last Edited
                     </div>
@@ -975,7 +985,7 @@ export const PatientHome = (props: any) => {
         </section>
 
         <section
-          className="mt-5 grid grid-cols-1 gap-6 lg:grid-cols-2"
+          className="mt-5 grid grid-cols-1 gap-6 lg:grid-cols-3"
           data-testid="patient-details"
         >
           <div className="w-full">
@@ -1110,6 +1120,14 @@ export const PatientHome = (props: any) => {
               </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">
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index fd6213d8e08..f3436fb8acc 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -161,10 +161,10 @@ export default function PatientInfoCard(props: {
                 Number(consultation?.review_interval) > 0 && (
                   <div
                     className={
-                      "mb-2 inline-flex w-full items-center justify-center rounded-lg border border-gray-500 text-xs font-semibold leading-4 " +
+                      "mb-2 inline-flex w-full items-center justify-center rounded-lg border border-gray-500 p-1 text-xs font-semibold leading-4 " +
                       (dayjs().isBefore(patient.review_time)
-                        ? " bg-gray-100"
-                        : " bg-red-400 p-1 text-white")
+                        ? " bg-gray-100 "
+                        : " bg-red-400 text-white")
                     }
                   >
                     <i className="text-md fas fa-clock mr-2"></i>
@@ -291,7 +291,7 @@ export default function PatientInfoCard(props: {
                       )?.text
                     }{" "}
                     on{" "}
-                    {formatDate(
+                    {formatDateTime(
                       ["A", "DC"].includes(consultation?.suggestion ?? "")
                         ? consultation?.admission_date
                         : consultation?.created_date
@@ -441,14 +441,14 @@ export default function PatientInfoCard(props: {
                   (action: any, i) =>
                     action[3] && (
                       <div key={i}>
-                        <a
+                        <Link
                           key={i}
                           className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
                           href={
                             consultation?.admitted &&
                             !consultation?.current_bed &&
                             i === 1
-                              ? undefined
+                              ? ""
                               : `${action[0]}`
                           }
                           onClick={() => {
@@ -473,7 +473,7 @@ export default function PatientInfoCard(props: {
                             className={`care-l-${action[2]} text-lg text-primary-500`}
                           />
                           <span>{action[1]}</span>
-                        </a>
+                        </Link>
                         {action?.[4]?.[0] && (
                           <>
                             <p className="mt-1 text-xs text-red-500">
diff --git a/src/Components/Patient/PatientNotes.tsx b/src/Components/Patient/PatientNotes.tsx
index c105619678b..333c25eef4a 100644
--- a/src/Components/Patient/PatientNotes.tsx
+++ b/src/Components/Patient/PatientNotes.tsx
@@ -1,201 +1,117 @@
-import { useCallback, useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import {
-  getPatientNotes,
-  addPatientNote,
-  getPatient,
-} from "../../Redux/actions";
+import { addPatientNote, getPatient } from "../../Redux/actions";
 import * as Notification from "../../Utils/Notifications.js";
-import PageTitle from "../Common/PageTitle";
-import Pagination from "../Common/Pagination";
-import { navigate } from "raviger";
-import { RESULTS_PER_PAGE_LIMIT } from "../../Common/constants";
-import Loading from "../Common/Loading";
-import { formatDateTime } from "../../Utils/utils";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import TextFormField from "../Form/FormFields/TextFormField";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import PatientNotesList from "../Facility/PatientNotesList";
+import Page from "../Common/components/Page";
+import { useMessageListener } from "../../Common/hooks/useMessageListener";
 
 interface PatientNotesProps {
   patientId: any;
   facilityId: any;
 }
 
-const pageSize = RESULTS_PER_PAGE_LIMIT;
-
 const PatientNotes = (props: PatientNotesProps) => {
   const { patientId, facilityId } = props;
 
-  const dispatch: any = useDispatch();
-  const initialData: any = { notes: [], cPage: 1, count: 1 };
-  const [state, setState] = useState(initialData);
+  const [patientActive, setPatientActive] = useState(true);
   const [noteField, setNoteField] = useState("");
-  const [isLoading, setIsLoading] = useState(true);
+  const [reload, setReload] = useState(false);
   const [facilityName, setFacilityName] = useState("");
   const [patientName, setPatientName] = useState("");
-  const [patientActive, setPatientActive] = useState(true);
 
-  const fetchData = useCallback(
-    async (page = 1, status: statusType = { aborted: false }) => {
-      setIsLoading(true);
-      const res = await dispatch(
-        getPatientNotes(props.patientId, pageSize, (page - 1) * pageSize)
-      );
-      if (!status.aborted) {
-        if (res && res.data) {
-          setState({
-            ...state,
-            count: res.data?.count,
-            notes: res.data?.results,
-            cPage: page,
-          });
-        }
-        setIsLoading(false);
-      }
-    },
-    [props.patientId, dispatch]
-  );
+  const dispatch = useDispatch();
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchData(1, status);
-    },
-    [fetchData]
-  );
+  const onAddNote = () => {
+    const payload = {
+      note: noteField,
+    };
+    if (!/\S+/.test(noteField)) {
+      Notification.Error({
+        msg: "Note Should Contain At Least 1 Character",
+      });
+      return;
+    }
+    dispatch(addPatientNote(patientId, payload)).then(() => {
+      Notification.Success({ msg: "Note added successfully" });
+      setNoteField("");
+      setReload(!reload);
+    });
+  };
 
   useEffect(() => {
     async function fetchPatientName() {
       if (patientId) {
         const res = await dispatch(getPatient({ id: patientId }));
         if (res.data) {
+          setPatientActive(res.data.is_active);
           setPatientName(res.data.name);
           setFacilityName(res.data.facility_object.name);
-          setPatientActive(res.data.is_active);
         }
-      } else {
-        setPatientName("");
-        setFacilityName("");
       }
     }
     fetchPatientName();
   }, [dispatch, patientId]);
 
-  function handlePagination(page: number) {
-    fetchData(page);
-  }
-
-  const onAddNote = () => {
-    const payload = {
-      note: noteField,
-    };
-    if (!/\S+/.test(noteField)) {
-      Notification.Error({
-        msg: "Note Should Contain At Least 1 Character",
-      });
-      return;
+  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);
     }
-    dispatch(addPatientNote(props.patientId, payload)).then(() => {
-      Notification.Success({ msg: "Note added successfully" });
-      setNoteField("");
-      fetchData();
-    });
-  };
+  });
 
   return (
-    <div className="flex w-full flex-col">
-      <PageTitle
-        title="Patient Notes"
-        className="mb-5"
-        crumbsReplacements={{
-          [facilityId]: { name: facilityName },
-          [patientId]: { name: patientName },
-        }}
-        backUrl={`/facility/${facilityId}/patient/${patientId}`}
-      />
-      <h3 className="pl-10 text-lg">Add new notes</h3>
-      <textarea
-        id="doctor_notes_textarea"
-        rows={3}
-        value={noteField}
-        placeholder="Type your Note"
-        className="mx-10 my-4 rounded-lg border border-gray-500 p-4 focus:border-primary-500 focus:outline-none focus:ring-primary-500"
-        onChange={(e) => setNoteField(e.target.value)}
-      />
-      <div className="flex w-full justify-end pr-10">
-        <ButtonV2
-          id="submit"
-          authorizeFor={NonReadOnlyUsers}
-          onClick={onAddNote}
-          disabled={!patientActive}
-        >
-          Post Your Note
-        </ButtonV2>
-      </div>
-      {isLoading ? (
-        <Loading />
-      ) : (
-        <div className="px-10 py-5">
-          <h3 className="text-lg">Added Notes</h3>
-          <div className="w-full">
-            {state.notes.length ? (
-              state.notes.map((note: any) => (
-                <div
-                  key={note.id}
-                  className="mt-4 flex w-full flex-col rounded-lg border border-gray-300 bg-white p-4 text-gray-800"
-                >
-                  <span className="whitespace-pre-wrap break-words">
-                    {note.note}
-                  </span>
-                  <div className="mt-3">
-                    <span className="text-xs text-gray-500">
-                      {formatDateTime(note.created_date) || "-"}
-                    </span>
-                  </div>
+    <Page
+      title="Patient Notes"
+      className="flex h-screen flex-col"
+      crumbsReplacements={{
+        [facilityId]: { name: facilityName },
+        [patientId]: { name: patientName },
+      }}
+      backUrl={`/facility/${facilityId}/patient/${patientId}`}
+    >
+      <div className="mx-3 my-2 flex grow flex-col rounded-lg bg-white p-2 sm:mx-10 sm:my-5 sm:p-5">
+        <PatientNotesList
+          patientId={patientId}
+          facilityId={facilityId}
+          reload={reload}
+          setReload={setReload}
+        />
 
-                  <div className="space-y-2 sm:flex sm:space-y-0">
-                    <div className="mr-2 inline-flex w-full items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto">
-                      <div className="flex h-8 w-8 items-center justify-center rounded-full">
-                        <i className="fas fa-user" />
-                      </div>
-                      <span className="text-sm text-gray-700">
-                        {note.created_by_object?.first_name || "Unknown"}{" "}
-                        {note.created_by_object?.last_name}
-                      </span>
-                    </div>
-
-                    <div
-                      className="inline-flex w-full cursor-pointer items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto"
-                      onClick={() => navigate(`/facility/${note.facility?.id}`)}
-                    >
-                      <div className="flex h-8 w-8 items-center justify-center rounded-full">
-                        <i className="fas fa-hospital" />
-                      </div>
-                      <span className="text-sm text-gray-700">
-                        {note.facility?.name || "Unknown"}
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              ))
-            ) : (
-              <div className="mt-2 flex items-center justify-center text-2xl font-bold text-gray-500">
-                No Notes Found
-              </div>
-            )}
-            {state.count > pageSize && (
-              <div className="mt-4 flex w-full justify-center">
-                <Pagination
-                  data={{ totalCount: state.count }}
-                  onChange={handlePagination}
-                  defaultPerPage={pageSize}
-                  cPage={state.cPage}
-                />
-              </div>
-            )}
-          </div>
+        <div className="relative mx-4 flex items-center">
+          <TextFormField
+            name="note"
+            value={noteField}
+            onChange={(e) => setNoteField(e.value)}
+            className="grow"
+            type="text"
+            errorClassName="hidden"
+            placeholder="Type your Note"
+            disabled={!patientActive}
+          />
+          <ButtonV2
+            onClick={onAddNote}
+            border={false}
+            className="absolute right-2"
+            ghost
+            size="small"
+            disabled={!patientActive}
+            authorizeFor={NonReadOnlyUsers}
+          >
+            <CareIcon className="care-l-message text-lg" />
+          </ButtonV2>
         </div>
-      )}
-    </div>
+      </div>
+    </Page>
   );
 };
 
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 57a06877269..e051ecd70fe 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -26,6 +26,7 @@ import {
   getPincodeDetails,
   includesIgnoreCase,
   parsePhoneNumber,
+  scrollTo,
 } from "../../Utils/utils";
 import { navigate, useQueryParams } from "raviger";
 import { statusType, useAbortableEffect } from "../../Common/utils";
@@ -177,11 +178,6 @@ const patientFormReducer = (state = initialState, action: any) => {
   }
 };
 
-const scrollTo = (id: string | boolean) => {
-  const element = document.querySelector(`#${id}`);
-  element?.scrollIntoView({ behavior: "smooth", block: "center" });
-};
-
 export const PatientRegister = (props: PatientRegisterProps) => {
   const { goBack } = useAppHistory();
   const { gov_data_api_key, enable_hcx, enable_abdm } = useConfig();
diff --git a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
index 071da764676..6533d133089 100644
--- a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
+++ b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
@@ -43,7 +43,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
     <div className="flex flex-col gap-1 rounded bg-[#020617] p-2">
       {props.patientAssetBed && (
         <div className="flex items-center justify-between px-2 tracking-wide">
-          <div className="flex items-center gap-2">
+          <div className="flex flex-col gap-2 md:flex-row">
             {patient ? (
               <Link
                 href={`/facility/${patient.last_consultation?.facility}/patient/${patient.id}/consultation/${patient.last_consultation?.id}`}
@@ -64,7 +64,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
               </span>
             )}
           </div>
-          <div className="flex items-center gap-3 text-xs md:text-sm">
+          <div className="flex flex-col items-center gap-2 text-xs md:flex-row md:text-sm">
             {asset && (
               <Link
                 className="flex items-center gap-1 text-gray-500"
@@ -76,7 +76,7 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
             )}
             {bed && (
               <Link
-                className="flex items-center gap-2 text-gray-500"
+                className="flex flex-col items-center gap-2 text-gray-500 md:flex-row"
                 href={`/facility/${patient?.facility_object?.id}/location/${bed?.location_object?.id}/beds`}
               >
                 <span className="flex items-center gap-1">
diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json
index 0fe1ba1a8bf..7e357bc04b5 100644
--- a/src/Locale/en/Common.json
+++ b/src/Locale/en/Common.json
@@ -155,5 +155,7 @@
   "all_changes_have_been_saved": "All changes have been saved",
   "no_data_found": "No data found",
   "edit": "Edit",
-  "clear_selection": "Clear selection"
-}
\ No newline at end of file
+  "clear_selection": "Clear selection",
+  "select_date": "Select date",
+  "DD/MM/YYYY": "DD/MM/YYYY"
+}
diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json
index 336a76e5285..a40f03c4f24 100644
--- a/src/Locale/en/Consultation.json
+++ b/src/Locale/en/Consultation.json
@@ -13,4 +13,4 @@
   "download_discharge_summary": "Download discharge summary",
   "email_discharge_summary_description": "Enter your valid email address to receive the discharge summary",
   "generated_summary_caution": "This is a computer generated summary using the information captured in the CARE system."
-}
\ No newline at end of file
+}
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 2182942a923..8294cebd5d0 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -5,18 +5,18 @@ import {
   IAadhaarOtpTBody,
   ICheckAndGenerateMobileOtp,
   IConfirmMobileOtp,
+  IcreateHealthFacilityTBody,
   ICreateHealthIdRequest,
   ICreateHealthIdResponse,
   IGenerateMobileOtpTBody,
+  IgetAbhaCardTBody,
   IHealthFacility,
   IHealthId,
+  IinitiateAbdmAuthenticationTBody,
   ILinkABHANumber,
+  IpartialUpdateHealthFacilityTBody,
   ISearchByHealthIdTBody,
   IVerifyAadhaarOtpTBody,
-  IcreateHealthFacilityTBody,
-  IgetAbhaCardTBody,
-  IinitiateAbdmAuthenticationTBody,
-  IpartialUpdateHealthFacilityTBody,
 } from "../Components/ABDM/models";
 import {
   AssetBedBody,
@@ -31,7 +31,10 @@ import {
 import {
   CapacityModal,
   ConsultationModel,
+  CreateBedBody,
   CurrentBed,
+  DailyRoundsBody,
+  DailyRoundsRes,
   DistrictModel,
   DoctorModal,
   FacilityModel,
@@ -49,15 +52,19 @@ import {
   ILocalBodyByDistrict,
   IPartialUpdateExternalResult,
 } from "../Components/ExternalResult/models";
+
+import { Prescription } from "../Components/Medicine/models";
 import { UserModel } from "../Components/Users/models";
+import { DailyRoundsModel, PatientModel } from "../Components/Patient/models";
 import { PaginatedResponse } from "../Utils/request/types";
 import {
   NotificationData,
   PNconfigData,
 } from "../Components/Notifications/models";
-import { PatientModel } from "../Components/Patient/models";
+
 import { IComment, IResource } from "../Components/Resource/models";
 import { IShift } from "../Components/Shifting/models";
+import { HCXPolicyModel } from "../Components/HCX/models";
 
 /**
  * A fake function that returns an empty object casted to type T
@@ -98,7 +105,9 @@ const routes = {
     path: "/api/v1/auth/token/refresh/",
     method: "POST",
     TRes: Type<JwtTokenObtainPair>(),
-    TBody: Type<{ refresh: string }>(),
+    TBody: Type<{
+      refresh: string;
+    }>(),
   },
 
   token_verify: {
@@ -111,7 +120,9 @@ const routes = {
     method: "POST",
     noAuth: true,
     TRes: Type<Record<string, never>>(),
-    TBody: Type<{ token: string }>(),
+    TBody: Type<{
+      token: string;
+    }>(),
   },
 
   resetPassword: {
@@ -119,7 +130,10 @@ const routes = {
     method: "POST",
     noAuth: true,
     TRes: Type<Record<string, never>>(),
-    TBody: Type<{ password: string; confirm: string }>(),
+    TBody: Type<{
+      password: string;
+      confirm: string;
+    }>(),
   },
 
   forgotPassword: {
@@ -127,7 +141,9 @@ const routes = {
     method: "POST",
     noAuth: true,
     TRes: Type<Record<string, never>>(),
-    TBody: Type<{ username: string }>(),
+    TBody: Type<{
+      username: string;
+    }>(),
   },
 
   updatePassword: {
@@ -334,6 +350,9 @@ const routes = {
   deleteAssetBed: {
     path: "/api/v1/assetbed/{external_id}/",
     method: "DELETE",
+    TRes: Type<null | {
+      detail?: string;
+    }>(),
   },
   operateAsset: {
     path: "/api/v1/asset/{external_id}/operate_assets/",
@@ -378,6 +397,8 @@ const routes = {
   createConsultationBed: {
     path: "/api/v1/consultationbed/",
     method: "POST",
+    TBody: Type<CreateBedBody>(),
+    TRes: Type<PaginatedResponse<CurrentBed>>(),
   },
   getConsultationBed: {
     path: "/api/v1/consultationbed/{external_id}/",
@@ -425,6 +446,8 @@ const routes = {
   },
   getConsultation: {
     path: "/api/v1/consultation/{id}/",
+    method: "GET",
+    TRes: Type<ConsultationModel>(),
   },
   updateConsultation: {
     path: "/api/v1/consultation/{id}/",
@@ -454,6 +477,8 @@ const routes = {
   },
   getDailyReports: {
     path: "/api/v1/consultation/{consultationId}/daily_rounds/",
+    method: "GET",
+    TRes: Type<PaginatedResponse<DailyRoundsModel>>(),
   },
 
   getDailyReport: {
@@ -462,6 +487,8 @@ const routes = {
   dailyRoundsAnalyse: {
     path: "/api/v1/consultation/{consultationId}/daily_rounds/analyse/",
     method: "POST",
+    TBody: Type<DailyRoundsBody>(),
+    TRes: Type<DailyRoundsRes>(),
   },
 
   // Hospital Beds
@@ -1158,6 +1185,49 @@ const routes = {
     method: "GET",
   },
 
+  // Prescription endpoints
+
+  listPrescriptions: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescriptions/",
+    method: "GET",
+  },
+
+  createPrescription: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescriptions/",
+    method: "POST",
+    TBody: Type<Prescription>(),
+    TRes: Type<Prescription>(),
+  },
+
+  listAdministrations: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescription_administration/",
+    method: "GET",
+  },
+
+  getAdministration: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescription_administration/{external_id}/",
+    method: "GET",
+  },
+
+  getPrescription: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescriptions/{external_id}/",
+    method: "GET",
+  },
+
+  administerPrescription: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescriptions/{external_id}/administer/",
+    method: "POST",
+  },
+
+  discontinuePrescription: {
+    path: "/api/v1/consultation/{consultation_external_id}/prescriptions/{external_id}/discontinue/",
+    method: "POST",
+    TBody: Type<{
+      discontinued_reason: string;
+    }>(),
+    TRes: Type<Record<string, never>>(),
+  },
+
   // HCX Endpoints
 
   listPMJYPackages: {
@@ -1178,6 +1248,7 @@ const routes = {
   listHCXPolicies: {
     path: "/api/v1/hcx/policy/",
     method: "GET",
+    TRes: Type<PaginatedResponse<HCXPolicyModel>>(),
   },
 
   createHCXPolicy: {
diff --git a/src/Routers/routes/PatientRoutes.tsx b/src/Routers/routes/PatientRoutes.tsx
index ae594d767ec..ce2798c4492 100644
--- a/src/Routers/routes/PatientRoutes.tsx
+++ b/src/Routers/routes/PatientRoutes.tsx
@@ -6,6 +6,7 @@ import PatientNotes from "../../Components/Patient/PatientNotes";
 import { PatientRegister } from "../../Components/Patient/PatientRegister";
 import { DetailRoute } from "../types";
 import DeathReport from "../../Components/DeathReport/DeathReport";
+import { InsuranceDetails } from "../../Components/Patient/InsuranceDetails";
 
 export default {
   "/patients": () => <PatientManager />,
@@ -21,6 +22,9 @@ export default {
   "/facility/:facilityId/patient/:id": ({ facilityId, id }: any) => (
     <PatientHome facilityId={facilityId} id={id} />
   ),
+  "/facility/:facilityId/patient/:id/insurance": ({ facilityId, id }: any) => (
+    <InsuranceDetails facilityId={facilityId} id={id} />
+  ),
   "/facility/:facilityId/patient/:id/update": ({ facilityId, id }: any) => (
     <PatientRegister facilityId={facilityId} id={id} />
   ),
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 61c0b939695..cd75fdba7e7 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -78,8 +78,20 @@ const DATE_TIME_FORMAT = `${TIME_FORMAT}; ${DATE_FORMAT}`;
 
 type DateLike = Parameters<typeof dayjs>[0];
 
-export const formatDateTime = (date: DateLike, format = DATE_TIME_FORMAT) =>
-  dayjs(date).format(format);
+export const formatDateTime = (date: DateLike, format?: string) => {
+  const obj = dayjs(date);
+
+  if (format) {
+    return obj.format(format);
+  }
+
+  // If time is 00:00:00 of local timezone, format as date only
+  if (obj.isSame(obj.startOf("day"))) {
+    return obj.format(DATE_FORMAT);
+  }
+
+  return obj.format(DATE_TIME_FORMAT);
+};
 
 export const formatDate = (date: DateLike, format = DATE_FORMAT) =>
   formatDateTime(date, format);
@@ -437,3 +449,8 @@ export const formatAge = (
   }
   return `${age} ${yearSuffix}`;
 };
+
+export const scrollTo = (id: string | boolean) => {
+  const element = document.querySelector(`#${id}`);
+  element?.scrollIntoView({ behavior: "smooth", block: "center" });
+};
diff --git a/src/service-worker.ts b/src/service-worker.ts
index 9820e6054aa..0b1c40288f5 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -105,14 +105,14 @@ self.addEventListener("push", async function (event) {
   if (event.data) {
     const data = JSON.parse(event.data.text());
 
-    if (data?.type === "MESSAGE") {
+    if (["MESSAGE", "PUSH_MESSAGE"].includes(data?.type)) {
       self.clients.matchAll().then((clients) => {
         clients[0].postMessage(data);
       });
     } else {
       event.waitUntil(
-        self.registration.showNotification("Care - CoronaSafe Network", {
-          body: data.title,
+        self.registration.showNotification("Care - Open Health Care Network", {
+          body: data.message,
           tag: data.external_id,
         })
       );