diff --git a/README.md b/README.md
index 7f2c3e926bd..c1dd7f37564 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Authenticate to staging API with any of the following credentials
 
 - username: staffdev
   password: Coronasafe@123
-  role: Staff
+  role: Nurse
 
 - username: doctordev
   password: Coronasafe@123
diff --git a/cypress/e2e/facility_spec/inventory.cy.ts b/cypress/e2e/facility_spec/inventory.cy.ts
index 79077d6e6a6..e7f1c35cb93 100644
--- a/cypress/e2e/facility_spec/inventory.cy.ts
+++ b/cypress/e2e/facility_spec/inventory.cy.ts
@@ -1,10 +1,12 @@
 import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
+import FacilityHome from "../../pageobject/Facility/FacilityHome";
 
 describe("Inventory Management Section", () => {
   const facilityPage = new FacilityPage();
   const loginPage = new LoginPage();
+  const facilityHome = new FacilityHome();
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -16,18 +18,64 @@ describe("Inventory Management Section", () => {
     cy.clearLocalStorage(/filters--.+/);
     cy.awaitUrl("/");
     cy.viewport(1280, 720);
-  });
-
-  it("Adds Inventory", () => {
     facilityPage.visitAlreadyCreatedFacility();
     facilityPage.clickManageFacilityDropdown();
     facilityPage.clickInventoryManagementOption();
+  });
+
+  it("Add New Inventory | Modify data and delete last entry ", () => {
+    // add a new item
     facilityPage.clickManageInventory();
-    facilityPage.fillInventoryDetails("Liquid Oxygen", "Add Stock", "120");
+    facilityPage.fillInventoryDetails("PPE", "Add Stock", "10");
     facilityPage.clickAddInventory();
     facilityPage.verifySuccessNotification("Inventory created successfully");
+    facilityPage.clickManageInventory();
+    // modify the new item
+    facilityPage.fillInventoryDetails("PPE", "Use Stock", "5");
+    facilityPage.clickAddInventory();
+    facilityPage.verifySuccessNotification("Inventory created successfully");
+    // verify the new modification
+    facilityPage.verifyPpeQuantity("PPE");
+    facilityPage.verifyPpeQuantity("5");
+    // delete the last Entry
+    facilityPage.clickPpeQuantity();
+    facilityPage.clickLastEntry();
+    // verify the last entry deletion
+    facilityPage.verifyStockInRow("#row-0", "Added Stock");
+    facilityPage.verifyStockInRow("#row-1", "Used Stock");
+    cy.wait(3000);
+    facilityHome.navigateBack();
+    facilityPage.verifyPpeQuantity("PPE");
   });
 
+  it("Add New Inventory | Verify Backend and manual Minimum", () => {
+    // Add Inventory
+    facilityPage.clickManageInventory();
+    facilityPage.fillInventoryDetails("PPE", "Add Stock", "5");
+    facilityPage.clickAddInventory();
+    facilityPage.verifySuccessNotification("Inventory created successfully");
+    // Verify Backend minimum badge
+    facilityPage.verifyBadgeWithText(".badge-danger", "Low Stock");
+    // modify with manual minimum badge
+    facilityPage.clickAddMinimumQuanitity();
+    cy.wait(3000);
+    cy.get("body").then(($body) => {
+      if ($body.find("#update-minimum-quantity").is(":visible")) {
+        // If the 'update-minimum-quantity' element is visible, click it
+        facilityPage.clickUpdateMinimumQuantity();
+        facilityPage.setQuantity("5");
+        facilityPage.clickSaveUpdateMinimumQuantity();
+      } else {
+        // Otherwise, click the 'set-minimum-quantity' element
+        facilityPage.clickSetMinimumQuantity();
+        facilityPage.fillInventoryMinimumDetails("PPE", "1");
+        facilityPage.clickSetButton();
+        facilityPage.verifySuccessNotification(
+          "Minimum quantiy updated successfully"
+        );
+      }
+    });
+  });
   afterEach(() => {
     cy.saveLocalStorage();
   });
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index 06a27333b9e..66c8b35e236 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -8,7 +8,7 @@ import {
   emergency_phone_number,
   phone_number,
 } from "../../pageobject/constants";
-const yearOfBirth = "2023";
+const yearOfBirth = "2001";
 
 const calculateAge = () => {
   const currentYear = new Date().getFullYear();
diff --git a/cypress/e2e/users_spec/user_profile.cy.ts b/cypress/e2e/users_spec/user_profile.cy.ts
new file mode 100644
index 00000000000..b6fe64b2455
--- /dev/null
+++ b/cypress/e2e/users_spec/user_profile.cy.ts
@@ -0,0 +1,85 @@
+import { cy, describe, before, beforeEach, it, afterEach } from "local-cypress";
+import LoginPage from "../../pageobject/Login/LoginPage";
+import UserProfilePage from "../../pageobject/Users/UserProfilePage";
+import ManageUserPage from "../../pageobject/Users/ManageUserPage";
+
+describe("Manage User Profile", () => {
+  const loginPage = new LoginPage();
+  const userProfilePage = new UserProfilePage();
+  const manageUserPage = new ManageUserPage();
+
+  const age = "30";
+  const gender = "Male";
+  const email = "test@example.com";
+  const phone = "+918899887788";
+  const workinghours = "8";
+  const doctorQualification = "MBBS";
+  const doctorYoE = "10";
+  const medicalCouncilRegistration = "1234567890";
+
+  const facilitySearch = "Dummy Facility 1";
+
+  before(() => {
+    loginPage.loginAsDevDoctor();
+    cy.saveLocalStorage();
+  });
+
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    console.log(localStorage);
+    cy.clearLocalStorage(/filters--.+/);
+    console.log(localStorage);
+    cy.awaitUrl("/user/profile");
+  });
+
+  it("Set Age, Gender, Email, Phone and Working Hours for a user and verify its reflection in user profile", () => {
+    userProfilePage.clickEditProfileButton();
+
+    userProfilePage.typeAge(age);
+    userProfilePage.selectGender(gender);
+    userProfilePage.typeEmail(email);
+    userProfilePage.typePhone(phone);
+    userProfilePage.typeWhatsApp(phone);
+    userProfilePage.typeWorkingHours(workinghours);
+    userProfilePage.typeDoctorQualification(doctorQualification);
+    userProfilePage.typeDoctorYoE(doctorYoE);
+    userProfilePage.typeMedicalCouncilRegistration(medicalCouncilRegistration);
+
+    userProfilePage.clickUpdateButton();
+
+    cy.verifyNotification("Details updated successfully");
+
+    userProfilePage.assertAge(age);
+    userProfilePage.assertGender(gender);
+    userProfilePage.assertEmail(email);
+    userProfilePage.assertPhone(phone);
+    userProfilePage.assertWhatsApp(phone);
+    userProfilePage.assertWorkingHours(workinghours);
+  });
+
+  it("Adding video connect link for a user and verify its reflection in user profile and doctor connect", () => {
+    // verify the user doesn't have any video connect link
+    userProfilePage.assertVideoConnectLink("-");
+    //  Link a new video connect link and ensure it is under video connect link
+    userProfilePage.clickEditProfileButton();
+    userProfilePage.typeVideoConnectLink("https://www.example.com");
+    userProfilePage.clickUpdateButton();
+    userProfilePage.assertVideoConnectLink("https://www.example.com");
+    // Edit the video connect link and ensure it is updated
+    userProfilePage.clickEditProfileButton();
+    userProfilePage.typeVideoConnectLink("https://www.test.com");
+    userProfilePage.clickUpdateButton();
+    userProfilePage.assertVideoConnectLink("https://www.test.com");
+    //  Go to particular facility doctor connect and verify the video connect link is present
+    manageUserPage.navigateToFacility();
+    manageUserPage.typeFacilitySearch(facilitySearch);
+    manageUserPage.assertFacilityInCard(facilitySearch);
+    manageUserPage.clickFacilityPatients();
+    manageUserPage.clickDoctorConnectButton();
+    manageUserPage.assertVideoConnectLink("Dev Doctor", "https://www.test.com");
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+});
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index 2d6aa9ff375..bb6cf0e19f2 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -372,6 +372,12 @@ class FacilityPage {
     cy.get("[name='quantity']").type(quantity);
   }
 
+  fillInventoryMinimumDetails(name: string, quantity: string) {
+    cy.get("div#id").click();
+    cy.get("div#id ul li").contains(name).click();
+    cy.get("[name='quantity']").type(quantity);
+  }
+
   clickAddInventory() {
     cy.intercept("POST", "**/api/v1/facility/*/inventory/").as(
       "createInventory"
@@ -380,6 +386,10 @@ class FacilityPage {
     cy.wait("@createInventory").its("response.statusCode").should("eq", 201);
   }
 
+  clickSetButton() {
+    cy.get("#submit").contains("Set").click();
+  }
+
   fillResourceRequestDetails(
     name: string,
     phone_number: string,
@@ -443,6 +453,46 @@ class FacilityPage {
         }
       });
   }
+
+  verifyPpeQuantity(text: string) {
+    cy.get("#PPE").contains(text).should("be.visible");
+  }
+
+  clickPpeQuantity() {
+    cy.get("#PPE").click();
+  }
+
+  clickLastEntry() {
+    cy.get("#delete-last-entry").click();
+  }
+
+  verifyStockInRow(rowId: string, stockText: string) {
+    cy.get(rowId).contains(stockText).should("be.visible");
+  }
+
+  verifyBadgeWithText(badgeClass: string, text: string) {
+    cy.get(badgeClass).contains(text).should("exist");
+  }
+
+  clickAddMinimumQuanitity() {
+    cy.get("#add-minimum-quantity").click();
+  }
+
+  clickUpdateMinimumQuantity() {
+    cy.get("#update-minimum-quantity").first().click();
+  }
+
+  setQuantity(quantity: string) {
+    cy.get("#quantity").click().clear().click().type(quantity);
+  }
+
+  clickSaveUpdateMinimumQuantity() {
+    cy.get("#save-update-minimumquanitity").click();
+  }
+
+  clickSetMinimumQuantity() {
+    cy.get("#set-minimum-quantity").click();
+  }
 }
 
 export default FacilityPage;
diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts
index f691d5f9e15..f4f188f11d6 100644
--- a/cypress/pageobject/Login/LoginPage.ts
+++ b/cypress/pageobject/Login/LoginPage.ts
@@ -6,6 +6,10 @@ class LoginPage {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");
   }
 
+  loginAsDevDoctor(): void {
+    cy.loginByApi("devdoctor", "Coronasafe@123");
+  }
+
   login(username: string, password: string): void {
     cy.loginByApi(username, password);
   }
diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
index 2d1ebbc14f0..622229745f7 100644
--- a/cypress/pageobject/Users/ManageUserPage.ts
+++ b/cypress/pageobject/Users/ManageUserPage.ts
@@ -149,6 +149,18 @@ export class ManageUserPage {
     cy.get("#doctor-connect-home-doctor").should("contain.text", realName);
     cy.get("#doctor-connect-remote-doctor").should("contain.text", realName);
   }
+
+  assertVideoConnectLink(docName: string, link: string) {
+    cy.get("ul#options")
+      .find("li")
+      .contains(docName)
+      .within(() => {
+        cy.get("a").should(($a) => {
+          const hrefs = $a.map((i, el) => Cypress.$(el).attr("href")).get();
+          expect(hrefs).to.include(link);
+        });
+      });
+  }
 }
 
 export default ManageUserPage;
diff --git a/cypress/pageobject/Users/UserProfilePage.ts b/cypress/pageobject/Users/UserProfilePage.ts
new file mode 100644
index 00000000000..3f71a29181b
--- /dev/null
+++ b/cypress/pageobject/Users/UserProfilePage.ts
@@ -0,0 +1,84 @@
+export default class UserProfilePage {
+  assertVideoConnectLink(link: string) {
+    cy.get("#videoconnectlink-profile-details").should("contain.text", link);
+  }
+
+  clickEditProfileButton() {
+    cy.get("#edit-cancel-profile-button").click();
+  }
+
+  typeVideoConnectLink(link: string) {
+    cy.get("#video_connect_link").click().clear().type(link);
+  }
+
+  clickUpdateButton() {
+    cy.get("#submit").click();
+  }
+
+  typeAge(age: string) {
+    cy.get("#age").click().clear().type(age);
+  }
+
+  selectGender(gender: string) {
+    cy.get("#gender").click();
+    cy.get("#gender-option-" + gender).click();
+  }
+
+  typeEmail(email: string) {
+    cy.get("#email").click().clear().type(email);
+  }
+
+  typePhone(phone: string) {
+    cy.get("#phoneNumber").click().clear().type(phone);
+  }
+
+  typeWhatsApp(phone: string) {
+    cy.get("#altPhoneNumber").click().clear().type(phone);
+  }
+
+  typeWorkingHours(workinghours: string) {
+    cy.get("#weekly_working_hours").click().clear().type(workinghours);
+  }
+
+  typeDoctorQualification = (doctorQualification: string) => {
+    cy.get("#doctor_qualification").click().clear().type(doctorQualification);
+  };
+
+  typeDoctorYoE = (doctorYoE: string) => {
+    cy.get("#doctor_experience_commenced_on").click().clear().type(doctorYoE);
+  };
+
+  typeMedicalCouncilRegistration = (medicalCouncilRegistration: string) => {
+    cy.get("#doctor_medical_council_registration")
+      .click()
+      .clear()
+      .type(medicalCouncilRegistration);
+  };
+
+  assertAge(age: string) {
+    cy.get("#age-profile-details").should("contain.text", age);
+  }
+
+  assertGender(gender: string) {
+    cy.get("#gender-profile-details").should("contain.text", gender);
+  }
+
+  assertEmail(email: string) {
+    cy.get("#emailid-profile-details").should("contain.text", email);
+  }
+
+  assertPhone(phone: string) {
+    cy.get("#contactno-profile-details").should("contain.text", phone);
+  }
+
+  assertWhatsApp(phone: string) {
+    cy.get("#whatsapp-profile-details").should("contain.text", phone);
+  }
+
+  assertWorkingHours(workinghours: string) {
+    cy.get("#averageworkinghour-profile-details").should(
+      "contain.text",
+      workinghours
+    );
+  }
+}
diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
index d4d32e437c8..5e1e117f9d6 100644
--- a/src/CAREUI/display/RecordMeta.tsx
+++ b/src/CAREUI/display/RecordMeta.tsx
@@ -1,7 +1,8 @@
 import CareIcon from "../icons/CareIcon";
 import {
-  formatDateTime,
+  formatDate,
   formatName,
+  formatTime,
   isUserOnline,
   relativeTime,
 } from "../../Utils/utils";
@@ -37,8 +38,9 @@ const RecordMeta = ({
   let child = (
     <div className="tooltip">
       <span className="underline">{relativeTime(time)}</span>
-      <span className="tooltip-text tooltip-left flex gap-1 text-xs font-medium tracking-wider">
-        {formatDateTime(time)}
+      <span className="tooltip-text tooltip-bottom flex -translate-x-1/2 gap-1 text-xs font-medium tracking-wider">
+        {formatTime(time)} <br />
+        {formatDate(time)}
         {user && !inlineUser && (
           <span className="flex items-center gap-1">
             by
diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
index 61c67f97ae2..1487d69e4fa 100644
--- a/src/CAREUI/misc/PaginatedList.tsx
+++ b/src/CAREUI/misc/PaginatedList.tsx
@@ -130,7 +130,7 @@ interface ItemsProps<TItem> {
 const Items = <TItem extends object>(props: ItemsProps<TItem>) => {
   const { loading, items } = useContextualized<TItem>();
 
-  if (loading) {
+  if (loading || items.length === 0) {
     return null;
   }
 
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index 7ebe4b87859..ef80a01a035 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -28,6 +28,8 @@ export type UserRole =
   | "Volunteer"
   | "StaffReadOnly"
   | "Staff"
+  | "NurseReadOnly"
+  | "Nurse"
   | "Doctor"
   | "WardAdmin"
   | "LocalBodyAdmin"
@@ -47,6 +49,8 @@ export const USER_TYPE_OPTIONS: {
   { id: "Volunteer", role: "Volunteer", readOnly: false },
   { id: "StaffReadOnly", role: "Staff", readOnly: true },
   { id: "Staff", role: "Staff", readOnly: false },
+  { id: "NurseReadOnly", role: "Nurse", readOnly: true },
+  { id: "Nurse", role: "Nurse", readOnly: false },
   { id: "Doctor", role: "Doctor", readOnly: false },
   { id: "WardAdmin", role: "Ward Admin", readOnly: false },
   { id: "LocalBodyAdmin", role: "Local Body Admin", readOnly: false },
@@ -294,10 +298,23 @@ export const SYMPTOM_CHOICES = [
 ];
 
 export const DISCHARGE_REASONS = [
-  { id: "REC", text: "Recovered" },
-  { id: "EXP", text: "Expired" },
-  { id: "REF", text: "Referred" },
-  { id: "LAMA", text: "LAMA" },
+  { id: 1, text: "Recovered" },
+  { id: 2, text: "Referred" },
+  { id: 3, text: "Expired" },
+  { id: 4, text: "LAMA" },
+];
+
+export const CONSCIOUSNESS_LEVEL = [
+  { id: "UNRESPONSIVE", text: "Unresponsive" },
+  { id: "RESPONDS_TO_PAIN", text: "Responds to Pain" },
+  { id: "RESPONDS_TO_VOICE", text: "Responds to Voice" },
+  { id: "ALERT", text: "Alert" },
+  { id: "AGITATED_OR_CONFUSED", text: "Agitated or Confused" },
+  {
+    id: "ONSET_OF_AGITATION_AND_CONFUSION",
+    text: "Onset of Agitation and Confusion",
+  },
+  { id: "UNKNOWN", text: "Unknown" },
 ];
 
 export const LINES_CATHETER_CHOICES: Array<OptionsType> = [
@@ -405,24 +422,6 @@ export const SAMPLE_FLOW_RULES = {
   RECEIVED_AT_LAB: ["COMPLETED"],
 };
 
-export const ROLE_STATUS_MAP = {
-  Staff: ["SENT_TO_COLLECTON_CENTRE"],
-  DistrictAdmin: [
-    "APPROVED",
-    "DENIED",
-    "SENT_TO_COLLECTON_CENTRE",
-    "RECEIVED_AND_FORWARED",
-  ],
-  StateLabAdmin: [
-    "APPROVED",
-    "DENIED",
-    "SENT_TO_COLLECTON_CENTRE",
-    "RECEIVED_AND_FORWARED",
-    "RECEIVED_AT_LAB",
-    "COMPLETED",
-  ],
-};
-
 export const DISEASE_STATUS = [
   "POSITIVE",
   "SUSPECTED",
@@ -1037,6 +1036,8 @@ export const USER_TYPES_MAP = {
   StaffReadOnly: "Staff",
   Staff: "Staff",
   Doctor: "Doctor",
+  Nurse: "Nurse",
+  NurseReadOnly: "Nurse",
   WardAdmin: "Ward Admin",
   LocalBodyAdmin: "Local Body Admin",
   DistrictLabAdmin: "District Lab Admin",
@@ -1046,7 +1047,7 @@ export const USER_TYPES_MAP = {
   StateReadOnlyAdmin: "State Admin",
   StateAdmin: "State Admin",
   RemoteSpecialist: "Remote Specialist",
-};
+} as const;
 
 export const AREACODES: Record<string, string[]> = {
   CA: [
diff --git a/src/Common/hooks/useFilters.tsx b/src/Common/hooks/useFilters.tsx
index 5781eaca54f..117a14ba418 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/Common/hooks/useFilters.tsx
@@ -1,4 +1,4 @@
-import { useQueryParams } from "raviger";
+import { QueryParam, setQueryParamsOptions, useQueryParams } from "raviger";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import GenericFilterBadge from "../../CAREUI/display/FilterBadge";
@@ -23,7 +23,15 @@ export default function useFilters({ limit = 14 }: { limit?: number }) {
   const { kasp_string } = useConfig();
   const hasPagination = limit > 0;
   const [showFilters, setShowFilters] = useState(false);
-  const [qParams, setQueryParams] = useQueryParams();
+  const [qParams, _setQueryParams] = useQueryParams();
+
+  const setQueryParams = (
+    query: QueryParam,
+    options?: setQueryParamsOptions
+  ) => {
+    _setQueryParams(query, options);
+    updateFiltersCache(query);
+  };
 
   const updateQuery = (filter: FilterState) => {
     filter = hasPagination ? { page: 1, limit, ...filter } : filter;
@@ -38,8 +46,6 @@ export default function useFilters({ limit = 14 }: { limit?: number }) {
   };
   const removeFilter = (param: string) => removeFilters([param]);
 
-  useEffect(() => updateFiltersCache(qParams), [qParams]);
-
   useEffect(() => {
     const cache = getFiltersCache();
     const qParamKeys = Object.keys(qParams);
diff --git a/src/Components/Assets/AssetFilter.tsx b/src/Components/Assets/AssetFilter.tsx
index 9aeac85e734..5d2ad9e30ae 100644
--- a/src/Components/Assets/AssetFilter.tsx
+++ b/src/Components/Assets/AssetFilter.tsx
@@ -20,7 +20,7 @@ const getDate = (value: any) =>
 
 function AssetFilter(props: any) {
   const { filter, onChange, closeFilter, removeFilters } = props;
-  const [facility, setFacility] = useState<FacilityModel>({ name: "" });
+  const [facility, setFacility] = useState<FacilityModel | null>(null);
   const [asset_type, setAssetType] = useState<string>(
     filter.asset_type ? filter.asset_type : ""
   );
@@ -51,7 +51,7 @@ function AssetFilter(props: any) {
     setLocationId(
       facility?.id === qParams.facility ? qParams.location ?? "" : ""
     );
-  }, [facility.id, qParams.facility, qParams.location]);
+  }, [facility?.id, qParams.facility, qParams.location]);
 
   const clearFilter = useCallback(() => {
     removeFilters([
@@ -81,8 +81,8 @@ function AssetFilter(props: any) {
     onChange(data);
   };
 
-  const handleFacilitySelect = (selected: FacilityModel) => {
-    setFacility(selected ? selected : facility);
+  const handleFacilitySelect = (selected: FacilityModel | null) => {
+    setFacility(selected);
     handleLocationSelect("");
   };
   const handleLocationSelect = (selectedId: string) => {
@@ -107,7 +107,7 @@ function AssetFilter(props: any) {
         <FacilitySelect
           name="Facilities"
           setSelected={(selected) =>
-            handleFacilitySelect(selected as FacilityModel)
+            handleFacilitySelect(selected as FacilityModel | null)
           }
           selected={facility}
           errors=""
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index c2acb88cf0c..371a3510859 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -92,15 +92,14 @@ export const Login = (props: { forgot?: boolean }) => {
 
   const handleSubmit = async (e: any) => {
     e.preventDefault();
-
     setLoading(true);
     invalidateFiltersCache();
-
     const validated = validateData();
-    if (!validated) return;
-
+    if (!validated) {
+      setLoading(false);
+      return;
+    }
     const { res } = await signIn(validated);
-
     setCaptcha(res?.status === 429);
     setLoading(false);
   };
diff --git a/src/Components/CameraFeed/utils.ts b/src/Components/CameraFeed/utils.ts
index e2793d76b41..fc940558aa0 100644
--- a/src/Components/CameraFeed/utils.ts
+++ b/src/Components/CameraFeed/utils.ts
@@ -1,5 +1,5 @@
 import { MutableRefObject } from "react";
-import { AssetData } from "../Assets/AssetTypes";
+import { AssetClass, AssetData } from "../Assets/AssetTypes";
 import { getCameraConfig } from "../../Utils/transformUtils";
 import { isIOS } from "../../Utils/utils";
 
@@ -18,6 +18,10 @@ export const calculateVideoDelay = (
 };
 
 export const getStreamUrl = (asset: AssetData) => {
+  if (asset.asset_class !== AssetClass.ONVIF) {
+    throw "getStreamUrl can be invoked only for ONVIF Assets";
+  }
+
   const config = getCameraConfig(asset);
   const host = asset.resolved_middleware?.hostname;
   const uuid = config.accessKey;
diff --git a/src/Components/Common/AssetSelect.tsx b/src/Components/Common/AssetSelect.tsx
index 0e47c7cfbfd..3f4f928032d 100644
--- a/src/Components/Common/AssetSelect.tsx
+++ b/src/Components/Common/AssetSelect.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from "react";
-import { useDispatch } from "react-redux";
-import { listAssets } from "../../Redux/actions";
 import AutoCompleteAsync from "../Form/AutoCompleteAsync";
+import routes from "../../Redux/api";
+import request from "../../Utils/request/request";
 
 interface AssetSelectProps {
   name: string;
@@ -16,7 +16,6 @@ interface AssetSelectProps {
   asset_class?: string;
   showAll?: boolean;
   showNOptions?: number;
-  freeText?: boolean;
   selected: any;
   setSelected: (selected: any) => void;
 }
@@ -33,21 +32,13 @@ export const AssetSelect = (props: AssetSelectProps) => {
     is_permanent = null,
     showNOptions = 10,
     className = "",
-    freeText = false,
     errors = "",
     asset_class = "",
   } = props;
 
-  const dispatchAction: any = useDispatch();
-
   const AssetSearch = useCallback(
     async (text: string) => {
-      const params: Partial<AssetSelectProps> & {
-        limit: number;
-        offset: number;
-        search_text: string;
-        asset_class: string;
-      } = {
+      const query = {
         limit: 50,
         offset: 0,
         search_text: text,
@@ -56,17 +47,12 @@ export const AssetSelect = (props: AssetSelectProps) => {
         in_use_by_consultation,
         is_permanent,
         asset_class,
-      };
+      } as const;
 
-      const res = await dispatchAction(listAssets(params));
-      if (freeText)
-        res?.data?.results?.push({
-          id: -1,
-          name: text,
-        });
-      return res?.data?.results;
+      const { data } = await request(routes.listAssets, { query });
+      return data?.results;
     },
-    [dispatchAction]
+    [asset_class, facility, in_use_by_consultation, is_permanent, is_working]
   );
 
   return (
diff --git a/src/Components/Common/BedSelect.tsx b/src/Components/Common/BedSelect.tsx
index 61ba2520e99..eac45e20670 100644
--- a/src/Components/Common/BedSelect.tsx
+++ b/src/Components/Common/BedSelect.tsx
@@ -1,9 +1,9 @@
 import { useCallback } from "react";
-import { useDispatch } from "react-redux";
-import { listFacilityBeds } from "../../Redux/actions";
 import { BedModel } from "../Facility/models";
 import AutoCompleteAsync from "../Form/AutoCompleteAsync";
 import { useTranslation } from "react-i18next";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
 
 interface BedSelectProps {
   name: string;
@@ -34,13 +34,11 @@ export const BedSelect = (props: BedSelectProps) => {
     location,
     showNOptions = 20,
   } = props;
-
-  const dispatchAction: any = useDispatch();
   const { t } = useTranslation();
 
   const onBedSearch = useCallback(
     async (text: string) => {
-      const params = {
+      const query = {
         limit: 50,
         offset: 0,
         search_text: text,
@@ -49,17 +47,17 @@ export const BedSelect = (props: BedSelectProps) => {
         location,
       };
 
-      const res = await dispatchAction(listFacilityBeds(params));
-      if (res && res.data) {
-        let beds = res.data.results;
-        if (unoccupiedOnly) {
-          beds = beds.filter((bed: BedModel) => bed?.is_occupied === false);
-        }
+      const { data } = await request(routes.listFacilityBeds, { query });
 
-        return beds;
+      if (unoccupiedOnly) {
+        return data?.results?.filter(
+          (bed: BedModel) => bed?.is_occupied === false
+        );
       }
+
+      return data?.results;
     },
-    [dispatchAction, facility, location, searchAll, unoccupiedOnly]
+    [facility, location, searchAll, unoccupiedOnly]
   );
 
   return (
diff --git a/src/Components/Common/BloodPressureFormField.tsx b/src/Components/Common/BloodPressureFormField.tsx
index ed0557ae8e3..e64b2a15ff6 100644
--- a/src/Components/Common/BloodPressureFormField.tsx
+++ b/src/Components/Common/BloodPressureFormField.tsx
@@ -1,3 +1,4 @@
+import { FieldValidator } from "../Form/FieldValidators";
 import FormField from "../Form/FormFields/FormField";
 import RangeAutocompleteFormField from "../Form/FormFields/RangeAutocompleteFormField";
 import {
@@ -5,31 +6,28 @@ import {
   FormFieldBaseProps,
   useFormFieldPropsResolver,
 } from "../Form/FormFields/Utils";
+import { DailyRoundsModel } from "../Patient/models";
 
-export interface BloodPressure {
-  systolic: number;
-  diastolic: number;
-}
+type BloodPressure = NonNullable<DailyRoundsModel["bp"]>;
 
-type Props = FormFieldBaseProps<Partial<BloodPressure>>;
+type Props = FormFieldBaseProps<BloodPressure>;
 
 export default function BloodPressureFormField(props: Props) {
   const field = useFormFieldPropsResolver(props as any);
 
   const handleChange = (event: FieldChangeEvent<number>) => {
-    field.onChange({
-      name: field.name,
-      value: {
-        ...field.value,
-        [event.name]: event.value,
-      },
-    });
+    const value: BloodPressure = {
+      ...field.value,
+      [event.name]: event.value,
+    };
+    value.mean = meanArterialPressure(value);
+    field.onChange({ name: field.name, value });
   };
 
   const map =
     !!props.value?.diastolic &&
     !!props.value.systolic &&
-    meanArterialPressure(props.value as BloodPressure);
+    meanArterialPressure(props.value);
 
   return (
     <FormField
@@ -107,5 +105,19 @@ export const meanArterialPressure = ({
   diastolic,
   systolic,
 }: BloodPressure) => {
-  return (2 * diastolic + systolic) / 3;
+  if (diastolic != null && systolic != null) {
+    return (2 * diastolic + systolic) / 3;
+  }
+};
+
+export const BloodPressureValidator: FieldValidator<BloodPressure> = (bp) => {
+  if (Object.values(bp).every((v) => v == null)) {
+    return;
+  }
+  if (bp.diastolic == null) {
+    return "Diastolic is missing. Either specify both or clear both.";
+  }
+  if (bp.systolic == null) {
+    return "Systolic is missing. Either specify both or clear both.";
+  }
 };
diff --git a/src/Components/Common/DistrictAutocompleteFormField.tsx b/src/Components/Common/DistrictAutocompleteFormField.tsx
index 122b576a2fc..25fef151f2a 100644
--- a/src/Components/Common/DistrictAutocompleteFormField.tsx
+++ b/src/Components/Common/DistrictAutocompleteFormField.tsx
@@ -1,51 +1,27 @@
-import { useDispatch } from "react-redux";
 import { FormFieldBaseProps } from "../Form/FormFields/Utils";
-import { IState } from "./StateAutocompleteFormField";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import { useCallback, useState } from "react";
-import { getDistrictByState } from "../../Redux/actions";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import { DistrictModel, StateModel } from "../Facility/models";
 
-export type IDistrict = {
-  id: number;
-  name: string;
-};
-
-type Props = FormFieldBaseProps<IDistrict["id"]> & {
+type Props = FormFieldBaseProps<DistrictModel["id"]> & {
   placeholder?: string;
-  state?: IState["id"];
+  state?: StateModel["id"];
 };
 
 export default function DistrictAutocompleteFormField(props: Props) {
-  const dispatch = useDispatch<any>();
-  const [districts, setDistricts] = useState<IDistrict[]>();
-
-  const fetchDistricts = useCallback(
-    async (status: any) => {
-      setDistricts(undefined);
-      if (!props.state) {
-        return;
-      }
-      const res = await dispatch(getDistrictByState({ id: props.state }));
-      if (!status.aborted && res.data) {
-        setDistricts(res.data);
-      }
-    },
-    [dispatch, props.state]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => fetchDistricts(status),
-    [props.state]
-  );
+  const { data, loading } = useQuery(routes.getDistrictByState, {
+    pathParams: { id: props.state! },
+    prefetch: !!props.state,
+  });
 
   return (
     <AutocompleteFormField
       {...props}
-      options={districts ?? []}
+      options={data ?? []}
       optionLabel={(option) => option.name}
       optionValue={(option) => option.id}
-      isLoading={!!(props.state && districts === undefined)}
+      isLoading={loading}
       disabled={!props.state}
     />
   );
diff --git a/src/Components/Common/FacilitySelect.tsx b/src/Components/Common/FacilitySelect.tsx
index 1aabc36013b..17f67a7def1 100644
--- a/src/Components/Common/FacilitySelect.tsx
+++ b/src/Components/Common/FacilitySelect.tsx
@@ -1,8 +1,8 @@
 import { useCallback } from "react";
-import { useDispatch } from "react-redux";
-import { getAllFacilities, getPermittedFacilities } from "../../Redux/actions";
 import AutoCompleteAsync from "../Form/AutoCompleteAsync";
 import { FacilityModel } from "../Facility/models";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
 
 interface FacilitySelectProps {
   name: string;
@@ -37,11 +37,9 @@ export const FacilitySelect = (props: FacilitySelectProps) => {
     errors = "",
   } = props;
 
-  const dispatchAction: any = useDispatch();
-
   const facilitySearch = useCallback(
     async (text: string) => {
-      const params = {
+      const query = {
         limit: 50,
         offset: 0,
         search_text: text,
@@ -51,17 +49,19 @@ export const FacilitySelect = (props: FacilitySelectProps) => {
         district,
       };
 
-      const res = await dispatchAction(
-        showAll ? getAllFacilities(params) : getPermittedFacilities(params)
+      const { data } = await request(
+        showAll ? routes.getAllFacilities : routes.getPermittedFacilities,
+        { query }
       );
+
       if (freeText)
-        res?.data?.results?.push({
+        data?.results?.push({
           id: -1,
           name: text,
         });
-      return res?.data?.results;
+      return data?.results;
     },
-    [dispatchAction, searchAll, showAll, facilityType, district]
+    [searchAll, showAll, facilityType, district, exclude_user, freeText]
   );
 
   return (
diff --git a/src/Components/Common/LocalBodyAutocompleteFormField.tsx b/src/Components/Common/LocalBodyAutocompleteFormField.tsx
index eacfbc35b89..8d0821cb43c 100644
--- a/src/Components/Common/LocalBodyAutocompleteFormField.tsx
+++ b/src/Components/Common/LocalBodyAutocompleteFormField.tsx
@@ -1,53 +1,27 @@
-import { useDispatch } from "react-redux";
 import { FormFieldBaseProps } from "../Form/FormFields/Utils";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import { useCallback, useState } from "react";
-import { getLocalbodyByDistrict } from "../../Redux/actions";
-import { IDistrict } from "./DistrictAutocompleteFormField";
+import { DistrictModel, LocalBodyModel } from "../Facility/models";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
 
-export type ILocalBody = {
-  id: number;
-  name: string;
-};
-
-type Props = FormFieldBaseProps<ILocalBody["id"]> & {
+type Props = FormFieldBaseProps<LocalBodyModel["id"]> & {
   placeholder?: string;
-  district?: IDistrict["id"];
+  district?: DistrictModel["id"];
 };
 
 export default function LocalBodyAutocompleteFormField(props: Props) {
-  const dispatch = useDispatch<any>();
-  const [localBodies, setLocalBodies] = useState<ILocalBody[]>();
-
-  const fetchLocalBodies = useCallback(
-    async (status: any) => {
-      setLocalBodies(undefined);
-      if (!props.district) {
-        return;
-      }
-      const res = await dispatch(
-        getLocalbodyByDistrict({ id: props.district })
-      );
-      if (!status.aborted && res && res.data) {
-        setLocalBodies(res.data);
-      }
-    },
-    [dispatch, props.district]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => fetchLocalBodies(status),
-    [props.district]
-  );
+  const { data, loading } = useQuery(routes.getLocalbodyByDistrict, {
+    pathParams: { id: props.district! },
+    prefetch: !!props.district,
+  });
 
   return (
     <AutocompleteFormField
       {...props}
-      options={localBodies ?? []}
+      options={data ?? []}
       optionLabel={(option) => option.name}
       optionValue={(option) => option.id}
-      isLoading={!!(props.district && localBodies === undefined)}
+      isLoading={loading}
       disabled={!props.district}
     />
   );
diff --git a/src/Components/Common/LocationSelect.tsx b/src/Components/Common/LocationSelect.tsx
index d20c843fad8..dcade42a596 100644
--- a/src/Components/Common/LocationSelect.tsx
+++ b/src/Components/Common/LocationSelect.tsx
@@ -1,8 +1,7 @@
-import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import { listFacilityAssetLocation } from "../../Redux/actions";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete";
 import AutocompleteMultiSelectFormField from "../Form/FormFields/AutocompleteMultiselect";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
 interface LocationSelectProps {
   name: string;
   disabled?: boolean;
@@ -11,7 +10,7 @@ interface LocationSelectProps {
   className?: string;
   searchAll?: boolean;
   multiple?: boolean;
-  facilityId: number | string;
+  facilityId: string;
   showAll?: boolean;
   selected: string | string[] | null;
   setSelected: (selected: string | string[] | null) => void;
@@ -19,76 +18,48 @@ interface LocationSelectProps {
 }
 
 export const LocationSelect = (props: LocationSelectProps) => {
-  const {
-    name,
-    multiple,
-    selected,
-    setSelected,
-    errors,
-    className = "",
-    facilityId,
-    disabled = false,
-  } = props;
-  const [locations, setLocations] = useState<{ name: string; id: string }[]>(
-    []
+  const { data, loading, refetch } = useQuery(
+    routes.listFacilityAssetLocation,
+    {
+      query: {
+        limit: 14,
+      },
+      pathParams: {
+        facility_external_id: props.facilityId,
+      },
+      prefetch: props.facilityId !== undefined,
+    }
   );
-  const [query, setQuery] = useState<string>("");
-  const [loading, setLoading] = useState<boolean>(false);
-  const dispatchAction: any = useDispatch();
-
-  const handleValueChange = (current: string[]) => {
-    if (multiple) setSelected(current);
-    else setSelected(current ? current[0] : "");
-  };
-
-  useEffect(() => {
-    if (!facilityId) return;
-    const params = {
-      limit: 14,
-      search_text: query,
-    };
-    setLoading(true);
-    dispatchAction(
-      listFacilityAssetLocation(params, { facility_external_id: facilityId })
-    ).then(({ data }: any) => {
-      setLocations(data.results);
-      setLoading(false);
-    });
-  }, [query, facilityId]);
 
   return props.multiple ? (
     <AutocompleteMultiSelectFormField
-      name={name}
-      disabled={disabled}
-      value={selected as unknown as string[]}
-      options={locations}
-      onChange={({ value }) => handleValueChange(value as unknown as string[])}
-      onQuery={(query) => {
-        setQuery(query);
-      }}
+      name={props.name}
+      disabled={props.disabled}
+      value={props.selected as unknown as string[]}
+      options={data?.results ?? []}
+      onChange={({ value }) => props.setSelected(value)}
+      onQuery={(search_text) => refetch({ query: { search_text } })}
       placeholder="Search by location name"
       optionLabel={(option) => option.name}
       optionValue={(option) => option.id}
-      error={errors}
-      className={className}
+      error={props.errors}
+      className={props.className}
       errorClassName={props.errorClassName}
     />
   ) : (
     <AutocompleteFormField
-      name={name}
-      disabled={disabled}
-      value={selected as string}
-      options={locations}
-      onChange={({ value }) => handleValueChange([value])}
-      onQuery={(query) => {
-        setQuery(query);
-      }}
+      name={props.name}
+      disabled={props.disabled}
+      value={props.selected as string}
+      options={data?.results ?? []}
+      onChange={({ value }) => props.setSelected(value)}
+      onQuery={(search_text) => refetch({ query: { search_text } })}
       isLoading={loading}
       placeholder="Search by location name"
       optionLabel={(option) => option.name}
       optionValue={(option) => option.id}
-      error={errors}
-      className={className}
+      error={props.errors}
+      className={props.className}
       errorClassName={props.errorClassName}
     />
   );
diff --git a/src/Components/Common/Sidebar/Sidebar.tsx b/src/Components/Common/Sidebar/Sidebar.tsx
index fa809571772..9d378df4267 100644
--- a/src/Components/Common/Sidebar/Sidebar.tsx
+++ b/src/Components/Common/Sidebar/Sidebar.tsx
@@ -8,6 +8,7 @@ import useConfig from "../../../Common/hooks/useConfig";
 import SlideOver from "../../../CAREUI/interactive/SlideOver";
 import { classNames } from "../../../Utils/utils";
 import { Link } from "raviger";
+import useAuthUser from "../../../Common/hooks/useAuthUser";
 
 export const SIDEBAR_SHRINK_PREFERENCE_KEY = "sidebarShrinkPreference";
 
@@ -27,28 +28,36 @@ type StatelessSidebarProps =
       onItemClick: (open: boolean) => void;
     };
 
-const NavItems = [
-  { text: "Facilities", to: "/facility", icon: "care-l-hospital" },
-  { text: "Patients", to: "/patients", icon: "care-l-user-injured" },
-  { text: "Assets", to: "/assets", icon: "care-l-shopping-cart-alt" },
-  { text: "Sample Test", to: "/sample", icon: "care-l-medkit" },
-  { text: "Shifting", to: "/shifting", icon: "care-l-ambulance" },
-  { text: "Resource", to: "/resource", icon: "care-l-heart-medical" },
-  {
-    text: "External Results",
-    to: "/external_results",
-    icon: "care-l-clipboard-notes",
-  },
-  { text: "Users", to: "/users", icon: "care-l-users-alt" },
-  { text: "Notice Board", to: "/notice_board", icon: "care-l-meeting-board" },
-];
-
 const StatelessSidebar = ({
   shrinkable = false,
   shrinked = false,
   setShrinked,
   onItemClick,
 }: StatelessSidebarProps) => {
+  const authUser = useAuthUser();
+
+  const NavItems = [
+    { text: "Facilities", to: "/facility", icon: "care-l-hospital" },
+    { text: "Patients", to: "/patients", icon: "care-l-user-injured" },
+    { text: "Assets", to: "/assets", icon: "care-l-shopping-cart-alt" },
+    { text: "Sample Test", to: "/sample", icon: "care-l-medkit" },
+    { text: "Shifting", to: "/shifting", icon: "care-l-ambulance" },
+    { text: "Resource", to: "/resource", icon: "care-l-heart-medical" },
+    ...(!["Nurse", "NurseReadOnly", "Staff", "StaffReadOnly"].includes(
+      authUser.user_type
+    )
+      ? [
+          {
+            text: "External Results",
+            to: "/external_results",
+            icon: "care-l-clipboard-notes",
+          },
+        ]
+      : []),
+    { text: "Users", to: "/users", icon: "care-l-users-alt" },
+    { text: "Notice Board", to: "/notice_board", icon: "care-l-meeting-board" },
+  ];
+
   const { main_logo } = useConfig();
   const activeLink = useActiveLink();
   const Item = shrinked ? ShrinkedSidebarItem : SidebarItem;
diff --git a/src/Components/Common/SkillSelect.tsx b/src/Components/Common/SkillSelect.tsx
index 941c29790d1..e0d9aafdb13 100644
--- a/src/Components/Common/SkillSelect.tsx
+++ b/src/Components/Common/SkillSelect.tsx
@@ -1,8 +1,8 @@
 import { useCallback } from "react";
-import { useDispatch } from "react-redux";
-import { getAllSkills } from "../../Redux/actions";
 import AutoCompleteAsync from "../Form/AutoCompleteAsync";
 import { SkillModel, SkillObjectModel } from "../Users/models";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
 
 interface SkillSelectProps {
   id?: string;
@@ -11,12 +11,10 @@ interface SkillSelectProps {
   className?: string;
   searchAll?: boolean;
   multiple?: boolean;
-  showAll?: boolean;
   showNOptions?: number;
   disabled?: boolean;
   selected: SkillObjectModel | SkillObjectModel[] | null;
   setSelected: (selected: SkillObjectModel) => void;
-  username?: string;
   userSkills?: SkillModel[];
 }
 
@@ -28,37 +26,28 @@ export const SkillSelect = (props: SkillSelectProps) => {
     selected,
     setSelected,
     searchAll,
-    showAll = true,
     showNOptions = 10,
     disabled = false,
     className = "",
     errors = "",
-    //username,
     userSkills,
   } = props;
 
-  const dispatchAction: any = useDispatch();
-
   const skillSearch = useCallback(
     async (text: string) => {
-      const params = {
+      const query = {
         limit: 50,
         offset: 0,
         search_text: text,
         all: searchAll,
       };
 
-      const res = await dispatchAction(getAllSkills(params));
-      const skillsID: string[] = [];
-      userSkills?.map((skill: SkillModel) =>
-        skillsID.push(skill.skill_object.id)
-      );
-      const skills = res?.data?.results.filter(
-        (skill: any) => !skillsID.includes(skill.id)
+      const { data } = await request(routes.getAllSkills, { query });
+      return data?.results.filter(
+        (skill) => !userSkills?.some((userSkill) => userSkill.id === skill.id)
       );
-      return skills;
     },
-    [dispatchAction, searchAll, userSkills, showAll]
+    [searchAll, userSkills]
   );
 
   return (
diff --git a/src/Components/Common/StateAutocompleteFormField.tsx b/src/Components/Common/StateAutocompleteFormField.tsx
index 384f46c3a7c..77d52768198 100644
--- a/src/Components/Common/StateAutocompleteFormField.tsx
+++ b/src/Components/Common/StateAutocompleteFormField.tsx
@@ -1,45 +1,23 @@
-import { useCallback, useState } from "react";
 import AutocompleteFormField from "../Form/FormFields/Autocomplete";
 import { FormFieldBaseProps } from "../Form/FormFields/Utils";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import { useDispatch } from "react-redux";
-import { getStates } from "../../Redux/actions";
+import { StateModel } from "../Facility/models";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
 
-export type IState = {
-  id: number;
-  name: string;
-};
-
-type Props = FormFieldBaseProps<IState["id"]> & {
+type Props = FormFieldBaseProps<StateModel["id"]> & {
   placeholder?: string;
 };
 
 export default function StateAutocompleteFormField(props: Props) {
-  const dispatch = useDispatch<any>();
-  const [states, setStates] = useState<IState[]>();
-
-  const fetchStates = useCallback(
-    async (status: any) => {
-      setStates(undefined);
-      const res = await dispatch(getStates());
-      if (!status.aborted && res && res.data) {
-        setStates(res.data.results);
-      }
-    },
-    [dispatch]
-  );
-
-  useAbortableEffect((status: statusType) => {
-    fetchStates(status);
-  }, []);
+  const { data, loading } = useQuery(routes.statesList);
 
   return (
     <AutocompleteFormField
       {...props}
-      options={states ?? []}
+      options={data?.results ?? []}
       optionLabel={(option) => option.name}
       optionValue={(option) => option.id}
-      isLoading={states === undefined}
+      isLoading={loading}
     />
   );
 }
diff --git a/src/Components/Common/Uptime.tsx b/src/Components/Common/Uptime.tsx
index 6f6966b9053..e3c7dd7a439 100644
--- a/src/Components/Common/Uptime.tsx
+++ b/src/Components/Common/Uptime.tsx
@@ -1,12 +1,10 @@
 import { Popover } from "@headlessui/react";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { listAssetAvailability } from "../../Redux/actions";
-import { useDispatch } from "react-redux";
-import * as Notification from "../../Utils/Notifications.js";
+import { useEffect, useRef, useState } from "react";
 import { AssetStatus, AssetUptimeRecord } from "../Assets/AssetTypes";
-import { reverse } from "lodash-es";
 import { classNames } from "../../Utils/utils";
 import dayjs from "../../Utils/dayjs";
+import useQuery from "../../Utils/request/useQuery.js";
+import routes from "../../Redux/api.js";
 
 const STATUS_COLORS = {
   Operational: "bg-green-500",
@@ -63,7 +61,7 @@ function UptimeInfo({
               <>
                 <span className="my-2 block font-bold">Status Updates</span>
                 <div className="grid grid-cols-1 gap-1 md:grid-cols-4">
-                  {reverse(incidents)?.map((incident, index) => {
+                  {incidents.reverse().map((incident, index) => {
                     const prevIncident = incidents[index - 1];
                     let endTimestamp;
                     let ongoing = false;
@@ -171,16 +169,16 @@ export default function Uptime(props: { assetId: string }) {
   const [summary, setSummary] = useState<{
     [key: number]: AssetUptimeRecord[];
   }>([]);
-  const [availabilityData, setAvailabilityData] = useState<AssetUptimeRecord[]>(
-    []
-  );
-  const [loading, setLoading] = useState(true);
+  const { data, loading } = useQuery(routes.listAssetAvailability, {
+    query: { external_id: props.assetId },
+    onResponse: ({ data }) => setUptimeRecord(data?.results.reverse() ?? []),
+  });
+  const availabilityData = data?.results ?? [];
   const graphElem = useRef<HTMLDivElement>(null);
   const [numDays, setNumDays] = useState(
     Math.floor((window.innerWidth - 1024) / 20)
   );
   const [hoveredDay, setHoveredDay] = useState(-1);
-  const dispatch = useDispatch<any>();
 
   const handleResize = () => {
     const containerWidth = graphElem.current?.clientWidth ?? window.innerWidth;
@@ -268,25 +266,6 @@ export default function Uptime(props: { assetId: string }) {
     return Math.round((upStatus / (days * 3)) * 100);
   }
 
-  const fetchData = useCallback(async () => {
-    setLoading(true);
-    setLoading(false);
-
-    const availabilityData = await dispatch(
-      listAssetAvailability({
-        external_id: props.assetId,
-      })
-    );
-    if (availabilityData?.data) {
-      setAvailabilityData(availabilityData.data.results);
-      setUptimeRecord(reverse(availabilityData.data.results));
-    } else {
-      Notification.Error({
-        msg: "Error fetching availability history",
-      });
-    }
-  }, [dispatch, props.assetId]);
-
   useEffect(() => {
     setTimeout(() => {
       handleResize();
@@ -297,8 +276,7 @@ export default function Uptime(props: { assetId: string }) {
 
   useEffect(() => {
     handleResize();
-    fetchData();
-  }, [props.assetId, fetchData]);
+  }, []);
 
   const getStatusColor = (day: number) => {
     if (summary[day]) {
diff --git a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
index 67ac412c2e0..cb0bbac1f66 100644
--- a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
+++ b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
@@ -1,12 +1,10 @@
 import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import {
-  listInvestigationGroups,
-  listInvestigations,
-} from "../../../Redux/actions";
 import { PrescriptionDropdown } from "./PrescriptionDropdown";
 import { PrescriptionMultiDropdown } from "./PrescriptionMultiselect";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
+import request from "../../../Utils/request/request";
+import routes from "../../../Redux/api";
+
 export type InvestigationType = {
   type?: string[];
   repetitive?: boolean;
@@ -35,7 +33,6 @@ export default function InvestigationBuilder(
 ) {
   const { investigations, setInvestigations } = props;
   const [investigationsList, setInvestigationsList] = useState<string[]>([]);
-  const dispatch: any = useDispatch();
   const [activeIdx, setActiveIdx] = useState<number | null>(null);
   const additionalInvestigations = [
     ["Vitals", ["Temp", "Blood Pressure", "Respiratory Rate", "Pulse Rate"]],
@@ -85,26 +82,20 @@ export default function InvestigationBuilder(
   };
 
   const fetchInvestigations = async () => {
-    const res = await dispatch(listInvestigations({}));
-    if (res && res.data) {
-      return res.data.results.map(
-        (investigation: any) =>
-          investigation.name +
-          " -- " +
-          investigation.groups
-            .map((group: any) => " ( " + group.name + " ) ")
-            .join(", ")
-      );
-    }
-    return [];
+    const { data } = await request(routes.listInvestigations);
+    return (
+      data?.results.map(
+        (investigation) =>
+          `${investigation.name} -- ${investigation.groups
+            .map((group) => ` ( ${group.name} ) `)
+            .join(", ")}`
+      ) ?? []
+    );
   };
 
   const fetchInvestigationGroups = async () => {
-    const res = await dispatch(listInvestigationGroups({}));
-    if (res && res.data) {
-      return res.data.results.map((group: any) => group.name + " (GROUP)");
-    }
-    return [];
+    const { data } = await request(routes.listInvestigationGroups);
+    return data?.results.map((group) => `${group.name} (GROUP)`) ?? [];
   };
 
   return (
diff --git a/src/Components/ExternalResult/ResultList.tsx b/src/Components/ExternalResult/ResultList.tsx
index 8fddc7cadc9..9a04fcf38b6 100644
--- a/src/Components/ExternalResult/ResultList.tsx
+++ b/src/Components/ExternalResult/ResultList.tsx
@@ -16,9 +16,12 @@ import Page from "../Common/components/Page";
 import routes from "../../Redux/api";
 import useQuery from "../../Utils/request/useQuery";
 import { parsePhoneNumber } from "../../Utils/utils";
+import useAuthUser from "../../Common/hooks/useAuthUser";
+import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 const Loading = lazy(() => import("../Common/Loading"));
 
 export default function ResultList() {
+  const authUser = useAuthUser();
   const {
     qParams,
     updateQuery,
@@ -165,6 +168,10 @@ export default function ResultList() {
           <td className="whitespace-nowrap px-6 py-4 text-left text-sm leading-5 text-gray-500">
             <ButtonV2
               variant="primary"
+              disabled={
+                authUser.user_type === "Nurse" || authUser.user_type === "Staff"
+              }
+              authorizeFor={NonReadOnlyUsers}
               border
               ghost
               onClick={() => {
@@ -226,13 +233,18 @@ export default function ResultList() {
           <ExportMenu
             label="Import/Export"
             exportItems={[
-              {
-                label: "Import Results",
-                action: () => navigate("/external_results/upload"),
-                options: {
-                  icon: <CareIcon className="care-l-import" />,
-                },
-              },
+              ...(authUser.user_type !== "Nurse" &&
+              authUser.user_type !== "Staff"
+                ? [
+                    {
+                      label: "Import Results",
+                      action: () => navigate("/external_results/upload"),
+                      options: {
+                        icon: <CareIcon className="care-l-import" />,
+                      },
+                    },
+                  ]
+                : []),
               {
                 label: "Export Results",
                 action: () =>
diff --git a/src/Components/ExternalResult/models.ts b/src/Components/ExternalResult/models.ts
index 8ccaba04d05..7b136c76cef 100644
--- a/src/Components/ExternalResult/models.ts
+++ b/src/Components/ExternalResult/models.ts
@@ -53,6 +53,9 @@ export interface ILocalBodies {
 export interface IDeleteExternalResult {
   detail: string;
 }
+export interface IDeleteBedCapacity {
+  detail: string;
+}
 
 export interface IPartialUpdateExternalResult {
   address: string;
diff --git a/src/Components/Facility/AddBedForm.tsx b/src/Components/Facility/AddBedForm.tsx
index 931a95da6a2..379a9a532b8 100644
--- a/src/Components/Facility/AddBedForm.tsx
+++ b/src/Components/Facility/AddBedForm.tsx
@@ -1,44 +1,41 @@
 import Card from "../../CAREUI/display/Card";
 
-import { useState, useEffect, lazy, SyntheticEvent } from "react";
-import { useDispatch } from "react-redux";
-import {
-  createFacilityBed,
-  getAnyFacility,
-  getFacilityAssetLocation,
-  getFacilityBed,
-  updateFacilityBed,
-} from "../../Redux/actions";
+import { useState, lazy, SyntheticEvent } from "react";
 import * as Notification from "../../Utils/Notifications.js";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import { LOCATION_BED_TYPES } from "../../Common/constants";
-import { navigate } from "raviger";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import TextFormField from "../Form/FormFields/TextFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import Page from "../Common/components/Page";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import useAppHistory from "../../Common/hooks/useAppHistory";
+import request from "../../Utils/request/request";
+import { useTranslation } from "react-i18next";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
-interface BedFormProps {
+interface Props {
   facilityId: string;
   locationId: string;
   bedId?: string;
 }
 
-export const AddBedForm = (props: BedFormProps) => {
-  const { facilityId, locationId, bedId } = props;
-  const dispatchAction: any = useDispatch();
-  const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [name, setName] = useState<string>("");
-  const [description, setDescription] = useState<string>("");
-  const [bedType, setBedType] = useState<string>("");
-  const [facilityName, setFacilityName] = useState("");
-  const [locationName, setLocationName] = useState("");
-  const [bedName, setBedName] = useState("");
+export const AddBedForm = ({ facilityId, locationId, bedId }: Props) => {
+  const { t } = useTranslation();
+  const { goBack } = useAppHistory();
+  const [state, setState] = useState({
+    name: "",
+    description: "",
+    bed_type: "",
+    facility: facilityId,
+    location: locationId,
+  });
+
   const [multipleBeds, setMultipleBeds] = useState(false);
-  const [numberOfBeds, setNumberOfBeds] = useState(1); //default = 1
+  const [numberOfBeds, setNumberOfBeds] = useState(1);
   const [errors, setErrors] = useState({
     name: "",
     description: "",
@@ -46,43 +43,32 @@ export const AddBedForm = (props: BedFormProps) => {
     numberOfBeds: "",
   });
 
-  const headerText = !bedId ? "Add Bed" : "Update Bed";
-  const buttonText = !bedId ? "Add Bed(s)" : "Update Bed";
-
-  useEffect(() => {
-    async function fetchFacilityLocationAndBed() {
-      setIsLoading(true);
-      if (facilityId) {
-        const res = await dispatchAction(getAnyFacility(facilityId));
-        setFacilityName(res?.data?.name || "");
-      }
-      if (facilityId && locationId) {
-        const res = await dispatchAction(
-          getFacilityAssetLocation(facilityId, locationId)
-        );
-        setLocationName(res?.data?.name || "");
-      }
-      if (facilityId && locationId && bedId) {
-        const res = await dispatchAction(
-          getFacilityBed(facilityId, locationId, bedId)
-        );
-        setName(res?.data?.name || "");
-        setBedName(res?.data?.name || "");
-        setDescription(res?.data?.description || "");
-        setBedType(res?.data?.bed_type || "");
-        setNumberOfBeds(res?.data?.number_of_beds || "");
-      }
-      setIsLoading(false);
-    }
+  const { data: location } = useQuery(routes.getFacilityAssetLocation, {
+    pathParams: {
+      facility_external_id: facilityId,
+      external_id: locationId,
+    },
+  });
 
-    fetchFacilityLocationAndBed();
-  }, [dispatchAction, facilityId, locationId]);
+  const { data, loading } = useQuery(routes.getFacilityBed, {
+    pathParams: { external_id: bedId ?? "" },
+    prefetch: !!bedId,
+    onResponse: ({ data }) => {
+      setState({
+        name: data?.name ?? "",
+        description: data?.description ?? "",
+        bed_type: data?.bed_type ?? "",
+        facility: facilityId,
+        location: locationId,
+      });
+    },
+  });
 
   const validateInputs = (data: {
     name: string;
     description: string;
     bed_type: string;
-    number_of_beds: number;
+    number_of_beds?: number;
   }) => {
     let isValid = true;
     if (!data.name) {
@@ -96,7 +82,7 @@ export const AddBedForm = (props: BedFormProps) => {
     if (multipleBeds === false) {
       setNumberOfBeds(1);
     }
-    if (data.number_of_beds < 1) {
+    if (data.number_of_beds !== undefined && data.number_of_beds < 1) {
       isValid = false;
       setErrors((prev) => ({
         ...prev,
@@ -115,63 +101,56 @@ export const AddBedForm = (props: BedFormProps) => {
     return isValid;
   };
 
-  const handleCancel = () =>
-    navigate(`/facility/${facilityId}/location/${locationId}/beds`, {
-      replace: true,
-    });
-
   const handleSubmit = async (e: SyntheticEvent) => {
     e.preventDefault();
 
-    const data = {
-      name,
-      description,
-      bed_type: bedType,
-      number_of_beds: bedId ? 1 : numberOfBeds,
-    };
+    const data = bedId
+      ? { ...state }
+      : { ...state, number_of_beds: numberOfBeds };
 
     if (!validateInputs(data)) return;
 
-    setIsLoading(true);
-
-    const res = await dispatchAction(
-      bedId
-        ? updateFacilityBed(data, facilityId, bedId, locationId)
-        : createFacilityBed(data, facilityId, locationId)
-    );
-    setIsLoading(false);
-    if (res && (res.status === 201 || res.status === 200)) {
-      const notificationMessage = bedId
-        ? "Bed updated successfully"
-        : "Bed(s) created successfully";
+    const onSuccess = (msg: string) => {
+      Notification.Success({ msg });
+      goBack();
+    };
 
-      navigate(`/facility/${facilityId}/location/${locationId}/beds`, {
-        replace: true,
+    if (bedId) {
+      // Update
+      const { res } = await request(routes.updateFacilityBed, {
+        pathParams: { external_id: bedId },
+        body: { ...data, facility: facilityId, location: locationId },
       });
-      Notification.Success({
-        msg: notificationMessage,
+      res?.ok && onSuccess("Bed updated successfully");
+    } else {
+      // Create
+      const { res } = await request(routes.createFacilityBed, {
+        body: { ...data, facility: facilityId, location: locationId },
       });
+      res?.ok && onSuccess("Bed(s) created successfully");
     }
   };
 
-  if (isLoading) {
+  if (loading) {
     return <Loading />;
   }
 
+  const action = t(!bedId ? "add_beds" : "update_bed");
+
   return (
     <div className="mx-auto max-w-3xl px-2 pb-2">
       <Page
-        title={headerText}
+        title={action}
         backUrl={`/facility/${facilityId}/location/${locationId}/beds`}
         crumbsReplacements={{
-          [facilityId]: { name: facilityName },
+          [facilityId]: { name: location?.facility.name },
           [locationId]: {
-            name: locationName,
+            name: location?.name,
             uri: `/facility/${facilityId}/location`,
           },
           ...(bedId && {
             [bedId]: {
-              name: bedName,
+              name: data?.name,
               uri: `/facility/${facilityId}/location/${locationId}/beds`,
             },
           }),
@@ -182,20 +161,20 @@ export const AddBedForm = (props: BedFormProps) => {
             <TextFormField
               name="name"
               type="text"
-              label="Name"
+              label={t("name")}
               id="bed-name"
               required
-              value={name}
-              onChange={(e) => setName(e.value)}
+              value={state.name}
+              onChange={(e) => setState((p) => ({ ...p, [e.name]: e.value }))}
               error={errors.name}
             />
             <TextAreaFormField
               id="bed-description"
               rows={5}
-              label="Description"
+              label={t("description")}
               name="description"
-              value={description}
-              onChange={(e) => setDescription(e.value)}
+              value={state.description}
+              onChange={(e) => setState((p) => ({ ...p, [e.name]: e.value }))}
               error={errors.description}
             />
 
@@ -203,13 +182,13 @@ export const AddBedForm = (props: BedFormProps) => {
               id="bed-type"
               className="w-full"
               name="bed_type"
-              label="Bed Type"
+              label={t("bed_type")}
               required
               options={LOCATION_BED_TYPES}
               optionLabel={(option) => option.name}
               optionValue={(option) => option.id}
-              value={bedType}
-              onChange={(e) => setBedType(e.value)}
+              value={state.bed_type}
+              onChange={(e) => setState((p) => ({ ...p, [e.name]: e.value }))}
               error={errors.bedType}
             />
 
@@ -217,10 +196,12 @@ export const AddBedForm = (props: BedFormProps) => {
               <>
                 <CheckBoxFormField
                   id="multiplebed-checkbox"
-                  label="Do you want to make multiple beds?"
-                  onChange={() => {
-                    if (multipleBeds) setNumberOfBeds(1);
-                    setMultipleBeds(!multipleBeds);
+                  label={t("make_multiple_beds_label")}
+                  onChange={({ value }) => {
+                    setMultipleBeds(value);
+                    if (value) {
+                      setNumberOfBeds(1);
+                    }
                   }}
                   name={"multipleBeds"}
                 />
@@ -228,7 +209,7 @@ export const AddBedForm = (props: BedFormProps) => {
                   id="numberofbed"
                   name="number_of_beds"
                   disabled={!multipleBeds}
-                  label="Number of beds"
+                  label={t("number_of_beds")}
                   type="number"
                   value={numberOfBeds.toString()}
                   min={1}
@@ -236,17 +217,17 @@ export const AddBedForm = (props: BedFormProps) => {
                   onChange={(e) => setNumberOfBeds(Number(e.value))}
                   error={
                     numberOfBeds > 100
-                      ? "Number of beds cannot be greater than 100"
+                      ? t("number_of_beds_out_of_range_error")
                       : undefined
                   }
                 />
               </>
             )}
             <div className="mt-4 flex flex-col gap-3 sm:flex-row sm:justify-end">
-              <Cancel onClick={handleCancel} />
+              <Cancel onClick={() => goBack()} />
               <Submit
                 onClick={handleSubmit}
-                label={buttonText}
+                label={action}
                 disabled={numberOfBeds > 100}
               />
             </div>
diff --git a/src/Components/Facility/AssetCreate.tsx b/src/Components/Facility/AssetCreate.tsx
index a1e06a8c7ab..35f71a746fd 100644
--- a/src/Components/Facility/AssetCreate.tsx
+++ b/src/Components/Facility/AssetCreate.tsx
@@ -563,7 +563,7 @@ const AssetCreate = (props: AssetProps) => {
                         selected={location}
                         showAll={false}
                         multiple={false}
-                        facilityId={facilityId as unknown as number}
+                        facilityId={facilityId}
                         errors={state.errors.location}
                       />
                     </div>
diff --git a/src/Components/Facility/BedCapacity.tsx b/src/Components/Facility/BedCapacity.tsx
index dba563e5876..9416f5981f2 100644
--- a/src/Components/Facility/BedCapacity.tsx
+++ b/src/Components/Facility/BedCapacity.tsx
@@ -1,11 +1,4 @@
-import { useCallback, useEffect, useReducer, useState } from "react";
-import { useDispatch } from "react-redux";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import {
-  createCapacity,
-  listCapacity,
-  getCapacityBed,
-} from "../../Redux/actions";
+import { useEffect, useReducer, useState } from "react";
 import * as Notification from "../../Utils/Notifications.js";
 import { CapacityModal, OptionsType } from "./models";
 import TextFormField from "../Form/FormFields/TextFormField";
@@ -14,6 +7,8 @@ import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
 import useConfig from "../../Common/hooks/useConfig";
 import { getBedTypes } from "../../Common/constants";
+import routes from "../../Redux/api";
+import request from "../../Utils/request/request";
 
 interface BedCapacityProps extends CapacityModal {
   facilityId: string;
@@ -55,7 +50,6 @@ const bedCountReducer = (state = initialState, action: any) => {
 
 export const BedCapacity = (props: BedCapacityProps) => {
   const config = useConfig();
-  const dispatchAction: any = useDispatch();
   const { facilityId, handleClose, handleUpdate, className, id } = props;
   const [state, dispatch] = useReducer(bedCountReducer, initialState);
   const [isLastOptionType, setIsLastOptionType] = useState(false);
@@ -67,63 +61,53 @@ export const BedCapacity = (props: BedCapacityProps) => {
     ? `Save ${!isLastOptionType ? "& Add More" : "Bed Capacity"}`
     : "Update Bed Capacity";
 
-  const fetchData = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      if (!id) {
-        // Add Form functionality
-        const capacityRes = await dispatchAction(
-          listCapacity({}, { facilityId })
-        );
-        if (!status.aborted) {
-          if (capacityRes && capacityRes.data) {
-            const existingData = capacityRes.data.results;
-            // if all options are diabled
-            if (existingData.length === getBedTypes(config).length) {
-              return;
-            }
-            // disable existing bed types
-            const updatedBedTypes = getBedTypes(config).map(
-              (type: OptionsType) => {
-                const isExisting = existingData.find(
-                  (i: CapacityModal) => i.room_type === type.id
-                );
-                return {
-                  ...type,
-                  disabled: !!isExisting,
-                };
-              }
-            );
-            setBedTypes(updatedBedTypes);
-          }
-        }
-      } else {
-        // Edit Form functionality
-        const res = await dispatchAction(
-          getCapacityBed({ facilityId: facilityId, bed_id: id })
-        );
-        if (res && res.data) {
-          dispatch({
-            type: "set_form",
-            form: {
-              bedType: res.data.room_type,
-              totalCapacity: res.data.total_capacity,
-              currentOccupancy: res.data.current_capacity,
-            },
-          });
+  async function fetchCapacityBed() {
+    setIsLoading(true);
+    if (!id) {
+      // Add Form functionality
+      const capacityQuery = await request(routes.getCapacity, {
+        pathParams: { facilityId: props.facilityId },
+      });
+      if (capacityQuery?.data) {
+        const existingData = capacityQuery.data?.results;
+        // if all options are diabled
+        if (existingData.length === getBedTypes(config).length) {
+          return;
         }
+        // disable existing bed types
+        const updatedBedTypes = getBedTypes(config).map((type: OptionsType) => {
+          const isExisting = existingData.find(
+            (i: CapacityModal) => i.room_type === type.id
+          );
+          return {
+            ...type,
+            disabled: !!isExisting,
+          };
+        });
+        setBedTypes(updatedBedTypes);
       }
-      setIsLoading(false);
-    },
-    [dispatchAction, facilityId, id]
-  );
+    } else {
+      // Edit Form functionality
+      const capacityQuery = await request(routes.getCapacityBed, {
+        pathParams: { facilityId: props.facilityId, bed_id: id.toString() },
+      });
+      if (capacityQuery.data) {
+        dispatch({
+          type: "set_form",
+          form: {
+            bedType: capacityQuery.data.room_type,
+            totalCapacity: capacityQuery.data.total_capacity,
+            currentOccupancy: capacityQuery.data.current_capacity,
+          },
+        });
+      }
+    }
+    setIsLoading(false);
+  }
 
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchData(status);
-    },
-    [dispatch, fetchData, id]
-  );
+  useEffect(() => {
+    fetchCapacityBed();
+  }, []);
 
   useEffect(() => {
     const lastBedType =
@@ -179,21 +163,24 @@ export const BedCapacity = (props: BedCapacityProps) => {
     const valid = validateData();
     if (valid) {
       setIsLoading(true);
-      const data = {
+      const bodyData = {
         room_type: Number(state.form.bedType),
         total_capacity: Number(state.form.totalCapacity),
         current_capacity: Number(state.form.currentOccupancy),
       };
-      const res = await dispatchAction(
-        createCapacity(id, data, { facilityId })
+      const { data } = await request(
+        id ? routes.updateCapacity : routes.createCapacity,
+        {
+          pathParams: { facilityId, ...(id ? { bed_id: id.toString() } : {}) },
+          body: bodyData,
+        }
       );
       setIsLoading(false);
-      if (res && res.data) {
-        // disable last added bed type
+      if (data) {
         const updatedBedTypes = bedTypes.map((type: OptionsType) => {
           return {
             ...type,
-            disabled: res.data.room_type !== type.id ? type.disabled : true,
+            disabled: data.room_type !== type.id ? type.disabled : true,
           };
         });
         setBedTypes(updatedBedTypes);
diff --git a/src/Components/Facility/BedManagement.tsx b/src/Components/Facility/BedManagement.tsx
index 68e9fade43d..d8799f1fbc5 100644
--- a/src/Components/Facility/BedManagement.tsx
+++ b/src/Components/Facility/BedManagement.tsx
@@ -182,24 +182,22 @@ export const BedManagement = (props: BedManagementProps) => {
     ));
   } else if (data?.results.length === 0) {
     BedList = (
-      <p className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
+      <p className="flex w-full justify-center bg-white p-5 text-center text-2xl font-bold text-gray-500">
         No beds available in this location
       </p>
     );
   }
 
-  if (data?.results.length) {
-    bed = (
-      <>
-        <div className="mt-5 flex grow flex-wrap bg-white p-4">{BedList}</div>
-        {data.count && (
-          <div className="mt-4 flex w-full justify-center">
-            <Pagination totalCount={data.count} />
-          </div>
-        )}
-      </>
-    );
-  }
+  bed = (
+    <>
+      <div className="mt-5 flex grow flex-wrap bg-white p-4">{BedList}</div>
+      {Boolean(data?.count && data.count > 0) && (
+        <div className="mt-4 flex w-full justify-center">
+          <Pagination totalCount={data?.count ?? 0} />
+        </div>
+      )}
+    </>
+  );
 
   if (loading) {
     return <Loading />;
diff --git a/src/Components/Facility/BedTypeCard.tsx b/src/Components/Facility/BedTypeCard.tsx
index 59e0661169d..67e22f31f42 100644
--- a/src/Components/Facility/BedTypeCard.tsx
+++ b/src/Components/Facility/BedTypeCard.tsx
@@ -1,8 +1,5 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import * as Notification from "../../Utils/Notifications";
-import { animated, config, useSpring } from "@react-spring/web";
-import { useDispatch } from "react-redux";
-import { deleteCapacity } from "../../Redux/actions";
 import { BedCapacity } from "./BedCapacity";
 import DialogModal from "../Common/Dialog";
 import ButtonV2 from "../Common/components/ButtonV2";
@@ -10,7 +7,8 @@ import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
 import ConfirmDialog from "../Common/ConfirmDialog";
-import { useTranslation } from "react-i18next";
+import routes from "../../Redux/api";
+import request from "../../Utils/request/request";
 
 interface BedTypeCardProps {
   facilityId?: string;
@@ -24,9 +22,6 @@ interface BedTypeCardProps {
   handleUpdate: () => void;
 }
 
-const CIRCLE_PATH =
-  "M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831";
-
 export const BedTypeCard: React.FC<BedTypeCardProps> = ({
   facilityId,
   bedCapacityId,
@@ -38,20 +33,19 @@ export const BedTypeCard: React.FC<BedTypeCardProps> = ({
   removeBedType,
   handleUpdate,
 }) => {
-  const { t } = useTranslation();
-  const dispatchAction: any = useDispatch();
+  const [isRefreshing, setIsRefreshing] = useState(false);
   const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
   const [open, setOpen] = useState(false);
   const [selectedId, setSelectedId] = useState<number>(-1);
   const handleDeleteSubmit = async () => {
     if (room_type) {
-      const res = await dispatchAction(
-        deleteCapacity({
-          facilityId: facilityId,
-          bed_id: room_type,
-        })
-      );
-      if (res && res.status == 204) {
+      const { res } = await request(routes.deleteCapacityBed, {
+        pathParams: {
+          facilityId: facilityId ?? "",
+          bed_id: room_type.toString(),
+        },
+      });
+      if (res?.status == 204) {
         Notification.Success({
           msg: "Bed type deleted successfully",
         });
@@ -63,138 +57,88 @@ export const BedTypeCard: React.FC<BedTypeCardProps> = ({
     }
   };
 
-  const _p = total ? Math.round((used / total) * 100) : 0;
+  useEffect(() => {
+    if (isRefreshing) {
+      setTimeout(() => {
+        setIsRefreshing(false);
+      }, 500);
+    }
+  }, [isRefreshing]);
 
-  const { occupied, totalCount, progress, innerProgress } = useSpring({
-    from: { occupied: 0, totalCount: 0, progress: "0, 100", innerProgress: 0 },
-    to: {
-      occupied: used,
-      totalCount: total,
-      progress: `${Number.isNaN(_p) ? 0 : _p}, 100`,
-      innerProgress: Number.isNaN(_p) ? 0 : _p,
-    },
-    delay: 0,
-    config: config.slow,
-  });
+  const usedPercent = total ? Math.round((used / total) * 100) : 0;
 
   return (
     <div
       className={`${
         facilityId
           ? "border border-slate-200 bg-white"
-          : "border border-primary-500 bg-primary-100"
-      } flex h-full flex-col justify-between rounded-xl opacity-100 shadow-sm`}
-      style={{ padding: "clamp(0.75rem,5vw,1.5rem)" }}
+          : "border border-primary-300 bg-green-50"
+      } flex h-full flex-col justify-between rounded-xl p-4 opacity-100 shadow-sm`}
     >
-      <div className={"opacity-100"}>
-        <p
-          className={`${
-            facilityId ? "font-medium" : "font-bold"
-          } mb-2 text-center text-xl text-slate-900 md:mb-4`}
-        >
+      <header className="flex items-start justify-between">
+        <div className="text-md font-medium not-italic leading-[normal] text-[#453C52]">
           {label}
-        </p>
+        </div>
+        <span className="flex items-center justify-center rounded py-0 text-sm text-gray-500">
+          {usedPercent}%
+        </span>
+      </header>
+      <div className="mt-4 text-xl font-extrabold text-black">
+        {used} / {total}
+      </div>
+      <div className="mt-3 flex flex-col items-stretch justify-center rounded-md">
+        <div className="flex h-3 w-full rounded-md bg-gray-300">
+          <div
+            className="flex h-3 shrink-0 flex-col rounded-md bg-blue-600"
+            style={{ width: `${usedPercent}%` }}
+          ></div>
+        </div>
 
-        <div className="relative">
-          <div className={"opacity-100"}>
-            <div className="flex h-2/3 items-center justify-center">
-              <div className="relative m-2 flex w-4/5 content-center justify-center">
-                <svg viewBox="0 0 38 36" className="w-full">
-                  <path
-                    className={`${
-                      facilityId ? "text-slate-200" : "text-white"
-                    } stroke-current stroke-[3px]`}
-                    fill="none"
-                    d={CIRCLE_PATH}
-                  />
-                  <animated.path
-                    className="stroke-current stroke-[2px] text-primary-500"
-                    fill="none"
-                    strokeDasharray={progress}
-                    d={CIRCLE_PATH}
-                  />
-                </svg>
-                <div className="absolute inline-flex w-3/5 flex-col items-center justify-center self-center text-center text-sm xl:text-lg">
-                  <div className="space-x-1">
-                    <animated.span className="text-center text-3xl font-semibold text-slate-700">
-                      {innerProgress.to(
-                        (x: number) => `${Math.round(x) || 0}%`
-                      )}
-                    </animated.span>
-                  </div>
-                  {
-                    <div className="mt-2 text-center">
-                      <span
-                        className={"text-xl font-medium text-green-600"}
-                      ></span>
-                    </div>
-                  }
-                </div>
-              </div>
+        <div className="mt-3 text-sm tracking-normal text-zinc-700">
+          {" "}
+          Currently Occupied / Total Capacity{" "}
+        </div>
+        {facilityId ? (
+          <div className="mt-3 flex w-full flex-col items-start justify-between gap-5 sm:flex-row">
+            <div className="mt-4 text-xs italic text-gray-500">
+              {lastUpdated && (
+                <RecordMeta
+                  className="py-0 text-xs font-normal text-gray-600"
+                  prefix={"Last updated;"}
+                  time={lastUpdated}
+                />
+              )}
             </div>
-            <div className="mt-4 flex h-1/3 flex-col items-center justify-center gap-4 text-center lg:flex-row">
-              <div className="overflow-x-auto">
-                <p className="text-lg font-medium text-slate-500 xl:text-xl">
-                  Used:
-                  <animated.span className="ml-2 text-lg font-semibold text-slate-700">
-                    {occupied.to((x: number) => Math.round(x))}
-                  </animated.span>
-                </p>
-              </div>
-              <div className="overflow-x-auto">
-                <p className="text-lg font-medium text-slate-500 xl:text-xl">
-                  Total:
-                  <animated.span className="ml-2 text-lg font-semibold text-slate-700">
-                    {totalCount.to((x: number) => Math.round(x))}
-                  </animated.span>
-                </p>
-              </div>
+            <div className="flex items-stretch justify-between gap-4 self-stretch">
+              <ButtonV2
+                onClick={() => {
+                  setSelectedId(room_type || 0);
+                  setOpen(true);
+                }}
+                authorizeFor={NonReadOnlyUsers}
+                className="tooltip bg-opacity/20 flex aspect-square h-7 w-7 flex-col items-center justify-center rounded bg-gray-300 px-4 py-0"
+                variant="secondary"
+                ghost
+              >
+                <CareIcon icon="l-edit-alt" className="h-5 w-5 text-black" />
+                <span className="tooltip-text tooltip-bottom">Edit</span>
+              </ButtonV2>
+
+              <ButtonV2
+                onClick={() => setOpenDeleteDialog(true)}
+                authorizeFor={NonReadOnlyUsers}
+                className=" tooltip bg-opacity/10 flex aspect-square h-7 w-7 flex-col items-center justify-center rounded bg-red-100 px-4 py-0 hover:bg-red-200"
+                variant="secondary"
+                ghost
+              >
+                <CareIcon icon="l-trash-alt" className="h-5 w-5 text-red-600" />
+                <span className="tooltip-text tooltip-bottom">Delete</span>
+              </ButtonV2>
             </div>
-            {facilityId && (
-              <div className="flex items-center justify-between gap-2 pt-6">
-                {lastUpdated && (
-                  <RecordMeta
-                    className="text-xs font-normal text-gray-600"
-                    prefix={t("updated")}
-                    time={lastUpdated}
-                  />
-                )}
-                <div className="relative flex justify-end gap-2">
-                  <ButtonV2
-                    onClick={() => {
-                      setSelectedId(room_type || 0);
-                      setOpen(true);
-                    }}
-                    authorizeFor={NonReadOnlyUsers}
-                    className="tooltip p-2"
-                    variant="secondary"
-                    ghost
-                  >
-                    <CareIcon className="care-l-edit-alt" />
-                    <span className="tooltip-text tooltip-bottom">Edit</span>
-                  </ButtonV2>
-                  <ButtonV2
-                    onClick={() => setOpenDeleteDialog(true)}
-                    authorizeFor={NonReadOnlyUsers}
-                    className="tooltip p-2"
-                    variant="danger"
-                    ghost
-                  >
-                    <CareIcon className="care-l-trash-alt" />
-                    <span className="tooltip-text tooltip-bottom">Delete</span>
-                  </ButtonV2>
-                </div>
-              </div>
-            )}
           </div>
-          <p
-            className={
-              "pointer-events-none absolute left-1/2 top-1/4 my-8 w-full -translate-x-1/2 text-center text-xl font-bold text-slate-500 opacity-0"
-            }
-          >
-            No Data Available
-          </p>
-        </div>
+        ) : (
+          <div className="h-8"></div>
+        )}
       </div>
       <ConfirmDialog
         show={openDeleteDialog}
diff --git a/src/Components/Facility/CentralNursingStation.tsx b/src/Components/Facility/CentralNursingStation.tsx
index 9e8febe88fd..186dbbd48e9 100644
--- a/src/Components/Facility/CentralNursingStation.tsx
+++ b/src/Components/Facility/CentralNursingStation.tsx
@@ -1,13 +1,7 @@
-import { useDispatch } from "react-redux";
 import useFullscreen from "../../Common/hooks/useFullscreen";
-import { Fragment, useEffect, useState } from "react";
-import {
-  getPermittedFacility,
-  listPatientAssetBeds,
-} from "../../Redux/actions";
+import { Fragment } from "react";
 import HL7PatientVitalsMonitor from "../VitalsMonitor/HL7PatientVitalsMonitor";
 import useFilters from "../../Common/hooks/useFilters";
-import { FacilityModel } from "./models";
 import Loading from "../Common/Loading";
 import Page from "../Common/components/Page";
 import ButtonV2 from "../Common/components/ButtonV2";
@@ -15,7 +9,6 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import { classNames } from "../../Utils/utils";
 import { LocationSelect } from "../Common/LocationSelect";
 import Pagination from "../Common/Pagination";
-import { PatientAssetBed } from "../Assets/AssetTypes";
 import { Popover, Transition } from "@headlessui/react";
 import { FieldLabel } from "../Form/FormFields/FormField";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
@@ -23,6 +16,9 @@ import { useTranslation } from "react-i18next";
 import { SortOption } from "../Common/SortDropdown";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import useVitalsAspectRatioConfig from "../VitalsMonitor/useVitalsAspectRatioConfig";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import { getVitalsMonitorSocketUrl } from "../VitalsMonitor/utils";
 
 const PER_PAGE_LIMIT = 6;
 
@@ -39,72 +35,29 @@ interface Props {
 
 export default function CentralNursingStation({ facilityId }: Props) {
   const { t } = useTranslation();
-  const dispatch = useDispatch<any>();
   const [isFullscreen, setFullscreen] = useFullscreen();
-
-  const [facilityObject, setFacilityObject] = useState<FacilityModel>();
-  const [data, setData] =
-    useState<Parameters<typeof HL7PatientVitalsMonitor>[0][]>();
-  const [totalCount, setTotalCount] = useState(0);
   const { qParams, updateQuery, removeFilter, updatePage } = useFilters({
     limit: PER_PAGE_LIMIT,
   });
+  const query = useQuery(routes.listPatientAssetBeds, {
+    pathParams: { facility_external_id: facilityId },
+    query: {
+      ...qParams,
+      page: qParams.page || 1,
+      limit: PER_PAGE_LIMIT,
+      offset: (qParams.page ? qParams.page - 1 : 0) * PER_PAGE_LIMIT,
+      asset_class: "HL7MONITOR",
+      ordering: qParams.ordering || "bed__name",
+      bed_is_occupied:
+        (qParams.hide_monitors_without_patient ?? "true") === "true",
+    },
+  });
 
-  useEffect(() => {
-    async function fetchFacilityOrObject() {
-      if (facilityObject) return facilityObject;
-      const res = await dispatch(getPermittedFacility(facilityId));
-      if (res.status !== 200) return;
-      setFacilityObject(res.data);
-      return res.data as FacilityModel;
-    }
-
-    async function fetchData() {
-      setData(undefined);
-
-      const filters = {
-        ...qParams,
-        page: qParams.page || 1,
-        limit: PER_PAGE_LIMIT,
-        offset: (qParams.page ? qParams.page - 1 : 0) * PER_PAGE_LIMIT,
-        asset_class: "HL7MONITOR",
-        ordering: qParams.ordering || "bed__name",
-        bed_is_occupied: qParams.bed_is_occupied ?? true,
-      };
-
-      const [facilityObj, res] = await Promise.all([
-        fetchFacilityOrObject(),
-        dispatch(listPatientAssetBeds(facilityId, filters)),
-      ]);
-
-      if (!facilityObj || res.status !== 200) {
-        return;
-      }
-
-      const entries = res.data.results as PatientAssetBed[];
-
-      setTotalCount(res.data.count);
-      setData(
-        entries.map(({ patient, asset, bed }) => {
-          const middleware = asset.resolved_middleware?.hostname;
-          const local_ip_address = asset.meta?.local_ip_address;
-
-          return {
-            patientAssetBed: { patient, asset, bed },
-            socketUrl: `wss://${middleware}/observations/${local_ip_address}`,
-          };
-        })
-      );
-    }
-    fetchData();
-  }, [
-    dispatch,
-    facilityId,
-    qParams.page,
-    qParams.location,
-    qParams.ordering,
-    qParams.bed_is_occupied,
-  ]);
+  const totalCount = query.data?.count ?? 0;
+  const data = query.data?.results.map((obj) => ({
+    patientAssetBed: obj,
+    socketUrl: getVitalsMonitorSocketUrl(obj.asset),
+  }));
 
   const { config, hash } = useVitalsAspectRatioConfig({
     default: 6 / 11,
@@ -197,19 +150,12 @@ export default function CentralNursingStation({ facilityId }: Props) {
                       errorClassName="hidden"
                     />
                     <CheckBoxFormField
-                      name="bed_is_occupied"
+                      name="hide_monitors_without_patient"
                       label="Hide Monitors without Patient"
-                      value={
-                        qParams.bed_is_occupied === "true" ||
-                        qParams.bed_is_occupied === undefined
-                      }
-                      onChange={({ name, value }) => {
-                        if (value) {
-                          updateQuery({ [name]: value });
-                        } else {
-                          removeFilter(name);
-                        }
-                      }}
+                      value={JSON.parse(
+                        qParams.hide_monitors_without_patient ?? true
+                      )}
+                      onChange={(e) => updateQuery({ [e.name]: e.value })}
                       labelClassName="text-sm"
                       errorClassName="hidden"
                     />
@@ -245,7 +191,7 @@ export default function CentralNursingStation({ facilityId }: Props) {
         </div>
       }
     >
-      {data === undefined ? (
+      {data === undefined || query.loading ? (
         <Loading />
       ) : data.length === 0 ? (
         <div className="flex h-[80vh] w-full items-center justify-center text-center text-black">
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
index beac7f595a8..4158d7f6609 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -2,8 +2,8 @@ import { lazy, useEffect, useState } from "react";
 import { ConsultationTabProps } from "./index";
 import { AssetBedModel, AssetClass, AssetData } from "../../Assets/AssetTypes";
 import { useDispatch } from "react-redux";
-import { getPermittedFacility, listAssetBeds } from "../../../Redux/actions";
-import { BedModel, FacilityModel } from "../models";
+import { listAssetBeds } from "../../../Redux/actions";
+import { BedModel } from "../models";
 import HL7PatientVitalsMonitor from "../../VitalsMonitor/HL7PatientVitalsMonitor";
 import VentilatorPatientVitalsMonitor from "../../VitalsMonitor/VentilatorPatientVitalsMonitor";
 import useVitalsAspectRatioConfig from "../../VitalsMonitor/useVitalsAspectRatioConfig";
@@ -13,6 +13,7 @@ import Chip from "../../../CAREUI/display/Chip";
 import { formatAge, formatDate, formatDateTime } from "../../../Utils/utils";
 import ReadMore from "../../Common/components/Readmore";
 import DailyRoundsList from "../Consultations/DailyRoundsList";
+import { getVitalsMonitorSocketUrl } from "../../VitalsMonitor/utils";
 
 const PageTitle = lazy(() => import("../../Common/PageTitle"));
 
@@ -40,32 +41,22 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
       return;
 
     const fetchData = async () => {
-      const [facilityRes, assetBedRes] = await Promise.all([
-        dispatch(getPermittedFacility(props.consultationData.facility as any)),
-        dispatch(
-          listAssetBeds({
-            facility: props.consultationData.facility as any,
-            bed: props.consultationData.current_bed?.bed_object.id,
-          })
-        ),
-      ]);
-
-      const { middleware_address } = facilityRes.data as FacilityModel;
+      const assetBedRes = await dispatch(
+        listAssetBeds({
+          facility: props.consultationData.facility as any,
+          bed: props.consultationData.current_bed?.bed_object.id,
+        })
+      );
       const assetBeds = assetBedRes?.data?.results as AssetBedModel[];
 
       const monitorBedData = assetBeds?.find(
         (i) => i.asset_object?.asset_class === AssetClass.HL7MONITOR
       );
+
       setMonitorBedData(monitorBedData);
-      const assetDataForMonitor = monitorBedData?.asset_object;
-      const hl7Meta = assetDataForMonitor?.meta;
-      const hl7Middleware =
-        hl7Meta?.middleware_hostname ||
-        assetDataForMonitor?.location_object?.middleware_address ||
-        middleware_address;
-      if (hl7Middleware && hl7Meta?.local_ip_address) {
+      if (monitorBedData?.asset_object) {
         setHL7SocketUrl(
-          `wss://${hl7Middleware}/observations/${hl7Meta.local_ip_address}`
+          getVitalsMonitorSocketUrl(monitorBedData?.asset_object)
         );
       }
 
@@ -73,6 +64,7 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
         props.consultationData?.current_bed?.assets_objects?.find(
           (i) => i.asset_class === AssetClass.VENTILATOR
         );
+
       let ventilatorBedData;
       if (consultationBedVentilator) {
         ventilatorBedData = {
@@ -84,25 +76,13 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
           (i) => i.asset_object.asset_class === AssetClass.VENTILATOR
         );
       }
+
       setVentilatorBedData(ventilatorBedData);
-      const ventilatorMeta = ventilatorBedData?.asset_object?.meta;
-      const ventilatorMiddleware =
-        ventilatorMeta?.middleware_hostname ||
-        consultationBedVentilator?.location_object.middleware_address ||
-        middleware_address;
-      if (ventilatorMiddleware && ventilatorMeta?.local_ip_address) {
+      if (ventilatorBedData?.asset_object) {
         setVentilatorSocketUrl(
-          `wss://${ventilatorMiddleware}/observations/${ventilatorMeta?.local_ip_address}`
+          getVitalsMonitorSocketUrl(ventilatorBedData?.asset_object)
         );
       }
-
-      if (
-        !(hl7Middleware && hl7Meta?.local_ip_address) &&
-        !(ventilatorMiddleware && ventilatorMeta?.local_ip_address)
-      ) {
-        setHL7SocketUrl(undefined);
-        setVentilatorSocketUrl(undefined);
-      }
     };
 
     fetchData();
@@ -196,7 +176,8 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
             {props.consultationData.discharge_date && (
               <div
                 className={`gap-4 overflow-hidden rounded-lg bg-white shadow ${
-                  props.consultationData.discharge_reason === "REC" &&
+                  props.consultationData.new_discharge_reason ===
+                    DISCHARGE_REASONS.find((i) => i.text == "Recovered")?.id &&
                   "lg:col-span-2"
                 }`}
               >
@@ -210,11 +191,13 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                       <span className="font-semibold">
                         {DISCHARGE_REASONS.find(
                           (d) =>
-                            d.id === props.consultationData.discharge_reason
+                            d.id === props.consultationData.new_discharge_reason
                         )?.text ?? "--"}
                       </span>
                     </div>
-                    {props.consultationData.discharge_reason === "REF" && (
+                    {props.consultationData.new_discharge_reason ===
+                      DISCHARGE_REASONS.find((i) => i.text == "Referred")
+                        ?.id && (
                       <div>
                         Referred Facility {" - "}
                         <span className="font-semibold">
@@ -224,7 +207,9 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         </span>
                       </div>
                     )}
-                    {props.consultationData.discharge_reason === "REC" && (
+                    {props.consultationData.new_discharge_reason ===
+                      DISCHARGE_REASONS.find((i) => i.text == "Recovered")
+                        ?.id && (
                       <div className="grid gap-4">
                         <div>
                           Discharge Date {" - "}
@@ -259,7 +244,9 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         </div>
                       </div>
                     )}
-                    {props.consultationData.discharge_reason === "EXP" && (
+                    {props.consultationData.new_discharge_reason ===
+                      DISCHARGE_REASONS.find((i) => i.text == "Expired")
+                        ?.id && (
                       <div className="grid gap-4">
                         <div>
                           Date of Death {" - "}
@@ -286,8 +273,8 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         </div>
                       </div>
                     )}
-                    {["REF", "LAMA"].includes(
-                      props.consultationData.discharge_reason ?? ""
+                    {[2, 4].includes(
+                      props.consultationData.new_discharge_reason ?? 0
                     ) && (
                       <div className="grid gap-4">
                         <div>
@@ -672,7 +659,7 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
             </div>
           </div>
         </div>
-        <div className="w-full pl-4 xl:w-1/3">
+        <div className="w-full pl-0 md:pl-4 xl:w-1/3">
           <DailyRoundsList consultation={props.consultationData} />
         </div>
       </div>
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index abc7305a00b..c6cc9e02275 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -46,6 +46,8 @@ const symptomChoices = [...SYMPTOM_CHOICES];
 
 export interface ConsultationTabProps {
   consultationId: string;
+  facilityId: string;
+  patientId: string;
   consultationData: ConsultationModel;
   patientData: PatientModel;
 }
@@ -189,6 +191,8 @@ export const ConsultationDetails = (props: any) => {
   const consultationTabProps: ConsultationTabProps = {
     consultationId,
     consultationData,
+    patientId: consultationData.patient,
+    facilityId: consultationData.facility,
     patientData,
   };
 
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 77962cc7703..a493d354be2 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -3,6 +3,7 @@ import * as Notification from "../../Utils/Notifications.js";
 import { BedModel, FacilityModel } from "./models";
 import {
   CONSULTATION_SUGGESTION,
+  DISCHARGE_REASONS,
   ConsultationSuggestionValue,
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
@@ -121,7 +122,7 @@ type FormDetails = {
   weight: string;
   height: string;
   bed: BedModel | null;
-  discharge_reason: string;
+  new_discharge_reason: number | null;
   cause_of_death: string;
   death_datetime: string;
   death_confirmed_doctor: string;
@@ -171,7 +172,7 @@ const initForm: FormDetails = {
   weight: "",
   height: "",
   bed: null,
-  discharge_reason: "",
+  new_discharge_reason: null,
   cause_of_death: "",
   death_datetime: "",
   death_confirmed_doctor: "",
@@ -229,11 +230,16 @@ type ConsultationFormSection =
   | "Treatment Plan"
   | "Bed Status";
 
-export const ConsultationForm = (props: any) => {
+type Props = {
+  facilityId: string;
+  patientId: string;
+  id?: string;
+};
+
+export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
   const { goBack } = useAppHistory();
   const { kasp_enabled, kasp_string } = useConfig();
   const dispatchAction: any = useDispatch();
-  const { facilityId, patientId, id } = props;
   const [state, dispatch] = useAutoSaveReducer<FormDetails>(
     consultationFormReducer,
     initialState
@@ -344,7 +350,7 @@ export const ConsultationForm = (props: any) => {
   const fetchData = useCallback(
     async (status: statusType) => {
       if (!patientId) setIsLoading(true);
-      const res = await dispatchAction(getConsultation(id));
+      const res = await dispatchAction(getConsultation(id!));
       handleFormFieldChange({
         name: "InvestigationAdvice",
         value: !Array.isArray(res.data.investigation)
@@ -397,7 +403,7 @@ export const ConsultationForm = (props: any) => {
             weight: res.data.weight ? res.data.weight : "",
             height: res.data.height ? res.data.height : "",
             bed: res.data?.current_bed?.bed_object || null,
-            discharge_reason: res.data?.discharge_reason || "",
+            new_discharge_reason: res.data?.new_discharge_reason || null,
             cause_of_death: res.data?.discharge_notes || "",
             death_datetime: res.data?.death_datetime || "",
             death_confirmed_doctor: res.data?.death_confirmed_doctor || "",
@@ -648,7 +654,9 @@ export const ConsultationForm = (props: any) => {
     const dischargeResponse = await dispatchAction(
       dischargePatient(
         {
-          discharge_reason: "EXP",
+          new_discharge_reason: DISCHARGE_REASONS.find(
+            (i) => i.text === "Expired"
+          )?.id,
           discharge_notes: cause_of_death,
           death_datetime: death_datetime,
           death_confirmed_doctor: death_confirmed_doctor,
@@ -743,7 +751,7 @@ export const ConsultationForm = (props: any) => {
       };
 
       const res = await dispatchAction(
-        id ? updateConsultation(id, data) : createConsultation(data)
+        id ? updateConsultation(id!, data) : createConsultation(data)
       );
       setIsLoading(false);
       if (res?.data && res.status !== 400) {
diff --git a/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx b/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx
index 4cb90c900b1..34518afcb9b 100644
--- a/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx
+++ b/src/Components/Facility/Consultations/DailyRounds/DefaultLogUpdateCard.tsx
@@ -32,12 +32,13 @@ const DefaultLogUpdateCard = ({ round, ...props }: Props) => {
         attributeKey="other_details"
         attributeValue={round.other_details}
       />
-      <div className="mt-2 flex items-center gap-2">
+      <div className="mt-2 flex w-full flex-col items-center gap-2 md:w-auto md:flex-row">
         <ButtonV2
           variant="secondary"
           border
           ghost
           size="small"
+          className="w-full"
           onClick={props.onViewDetails}
         >
           <CareIcon className="care-l-eye text-lg" />
@@ -48,6 +49,7 @@ const DefaultLogUpdateCard = ({ round, ...props }: Props) => {
           border
           ghost
           size="small"
+          className="w-full"
           onClick={props.onUpdateLog}
         >
           <CareIcon className="care-l-pen text-lg" />
diff --git a/src/Components/Facility/Consultations/Mews.tsx b/src/Components/Facility/Consultations/Mews.tsx
index 6b8e7de806e..14e7d7f9e63 100644
--- a/src/Components/Facility/Consultations/Mews.tsx
+++ b/src/Components/Facility/Consultations/Mews.tsx
@@ -37,7 +37,6 @@ const getSystolicBPScore = (value?: number) => {
 };
 
 const getTempRange = (value?: number) => {
-  console.log(value);
   if (typeof value !== "number") return;
 
   if (value < 95) return 2;
diff --git a/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx b/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
index 4ff81acf868..ecd3a7d2648 100644
--- a/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
+++ b/src/Components/Facility/Consultations/PrimaryParametersPlot.tsx
@@ -17,6 +17,17 @@ interface PrimaryParametersPlotProps {
   consultationId: string;
 }
 
+const sanitizeBPAttribute = (value: number | undefined) => {
+  // Temp. hack until the cleaning of daily rounds as a db migration is done.
+  // TODO: remove once migration is merged.
+
+  if (value == null || value < 0) {
+    return;
+  }
+
+  return value;
+};
+
 export const PrimaryParametersPlot = ({
   consultationId,
 }: PrimaryParametersPlotProps) => {
@@ -77,19 +88,19 @@ export const PrimaryParametersPlot = ({
     {
       name: "diastolic",
       data: Object.values(results)
-        .map((p: any) => p.bp && p.bp.diastolic)
+        .map((p: any) => p.bp && sanitizeBPAttribute(p.bp.diastolic))
         .reverse(),
     },
     {
       name: "systolic",
       data: Object.values(results)
-        .map((p: any) => p.bp && p.bp.systolic)
+        .map((p: any) => p.bp && sanitizeBPAttribute(p.bp.systolic))
         .reverse(),
     },
     {
       name: "mean",
       data: Object.values(results)
-        .map((p: any) => p.bp && p.bp.mean)
+        .map((p: any) => p.bp && sanitizeBPAttribute(p.bp.mean))
         .reverse(),
     },
   ];
diff --git a/src/Components/Facility/DischargeModal.tsx b/src/Components/Facility/DischargeModal.tsx
index a15af4d3883..892be2e916b 100644
--- a/src/Components/Facility/DischargeModal.tsx
+++ b/src/Components/Facility/DischargeModal.tsx
@@ -26,7 +26,7 @@ import { FacilityModel } from "./models";
 import dayjs from "../../Utils/dayjs";
 
 interface PreDischargeFormInterface {
-  discharge_reason: string;
+  new_discharge_reason: number | null;
   discharge_notes: string;
   discharge_date?: string;
   death_datetime?: string;
@@ -40,7 +40,7 @@ interface IProps {
   onClose: () => void;
   consultationData: ConsultationModel;
   afterSubmit?: () => void;
-  discharge_reason?: string;
+  new_discharge_reason?: number | null;
   discharge_notes?: string;
   discharge_date?: string;
   death_datetime?: string;
@@ -51,7 +51,7 @@ const DischargeModal = ({
   onClose,
   consultationData,
   afterSubmit,
-  discharge_reason = "",
+  new_discharge_reason = null,
   discharge_notes = "",
   discharge_date = dayjs().format("YYYY-MM-DDTHH:mm"),
   death_datetime = dayjs().format("YYYY-MM-DDTHH:mm"),
@@ -60,7 +60,7 @@ const DischargeModal = ({
   const dispatch: any = useDispatch();
   const [preDischargeForm, setPreDischargeForm] =
     useState<PreDischargeFormInterface>({
-      discharge_reason,
+      new_discharge_reason,
       discharge_notes,
       discharge_date,
       death_datetime,
@@ -110,17 +110,18 @@ const DischargeModal = ({
 
   const handlePatientDischarge = async (value: boolean) => {
     setIsSendingDischargeApi(true);
-    if (!preDischargeForm.discharge_reason) {
+    if (!preDischargeForm.new_discharge_reason) {
       setErrors({
         ...errors,
-        discharge_reason: "Please select a reason for discharge",
+        new_discharge_reason: "Please select a reason for discharge",
       });
       setIsSendingDischargeApi(false);
       return;
     }
 
     if (
-      preDischargeForm.discharge_reason == "EXP" &&
+      preDischargeForm.new_discharge_reason ==
+        DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id &&
       !preDischargeForm.discharge_notes.trim()
     ) {
       setErrors({
@@ -196,20 +197,21 @@ const DischargeModal = ({
           label="Reason"
           name="discharge_reason"
           id="discharge_reason"
-          value={preDischargeForm.discharge_reason}
-          disabled={!!discharge_reason}
+          value={preDischargeForm.new_discharge_reason}
+          disabled={!!new_discharge_reason}
           options={DISCHARGE_REASONS}
           optionValue={({ id }) => id}
           optionLabel={({ text }) => text}
           onChange={(e) =>
             setPreDischargeForm((prev) => ({
               ...prev,
-              discharge_reason: e.value,
+              new_discharge_reason: e.value,
             }))
           }
-          error={errors?.discharge_reason}
+          error={errors?.new_discharge_reason}
         />
-        {preDischargeForm.discharge_reason === "REF" && (
+        {preDischargeForm.new_discharge_reason ===
+          DISCHARGE_REASONS.find((i) => i.text == "Referred")?.id && (
           <>
             <FieldLabel>Referred to</FieldLabel>
             <FacilitySelect
@@ -227,12 +229,15 @@ const DischargeModal = ({
           </>
         )}
         <TextAreaFormField
-          required={preDischargeForm.discharge_reason == "EXP"}
+          required={
+            preDischargeForm.new_discharge_reason ==
+            DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
+          }
           label={
             {
-              EXP: "Cause of death",
-              REC: "Discharged Advice",
-            }[preDischargeForm.discharge_reason] ?? "Notes"
+              "3": "Cause of death",
+              "1": "Discharged Advice",
+            }[preDischargeForm.new_discharge_reason ?? 0] ?? "Notes"
           }
           name="discharge_notes"
           value={preDischargeForm.discharge_notes}
@@ -246,19 +251,22 @@ const DischargeModal = ({
         />
         <TextFormField
           name={
-            preDischargeForm.discharge_reason === "EXP"
+            preDischargeForm.new_discharge_reason ===
+            DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
               ? "death_datetime"
               : "discharge_date"
           }
           label={
-            preDischargeForm.discharge_reason === "EXP"
+            preDischargeForm.new_discharge_reason ===
+            DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
               ? "Date of Death"
               : "Date and Time of Discharge"
           }
           type="datetime-local"
           value={
             preDischargeForm[
-              preDischargeForm.discharge_reason === "EXP"
+              preDischargeForm.new_discharge_reason ===
+              DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
                 ? "death_datetime"
                 : "discharge_date"
             ]
@@ -277,13 +285,15 @@ const DischargeModal = ({
           )}
           max={dayjs().format("YYYY-MM-DDTHH:mm")}
           error={
-            preDischargeForm.discharge_reason === "EXP"
+            preDischargeForm.new_discharge_reason ===
+            DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
               ? errors?.death_datetime
               : errors?.discharge_date
           }
         />
 
-        {preDischargeForm.discharge_reason === "REC" && (
+        {preDischargeForm.new_discharge_reason ===
+          DISCHARGE_REASONS.find((i) => i.text == "Recovered")?.id && (
           <>
             <div className="mb-4">
               <FieldLabel>Discharge Prescription Medications</FieldLabel>
@@ -295,7 +305,8 @@ const DischargeModal = ({
             </div>
           </>
         )}
-        {preDischargeForm.discharge_reason === "EXP" && (
+        {preDischargeForm.new_discharge_reason ===
+          DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id && (
           <TextFormField
             name="death_confirmed_by"
             label="Confirmed By"
diff --git a/src/Components/Facility/DoctorVideoSlideover.tsx b/src/Components/Facility/DoctorVideoSlideover.tsx
index 5302f7f9d53..c2cd94e0ded 100644
--- a/src/Components/Facility/DoctorVideoSlideover.tsx
+++ b/src/Components/Facility/DoctorVideoSlideover.tsx
@@ -6,6 +6,8 @@ import { UserAssignedModel } from "../Users/models";
 import { SkillObjectModel } from "../Users/models";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import { relativeTime } from "../../Utils/utils";
+import useAuthUser from "../../Common/hooks/useAuthUser";
+import { triggerGoal } from "../../Integrations/Plausible";
 
 export default function DoctorVideoSlideover(props: {
   show: boolean;
@@ -22,10 +24,12 @@ export default function DoctorVideoSlideover(props: {
         const res = await dispatchAction(
           getFacilityUsers(facilityId, { limit: 50 })
         );
-        if (res && res.data) {
+        if (res?.data) {
           setDoctors(
             res.data.results
-              .filter((user: any) => user.alt_phone_number)
+              .filter(
+                (user: any) => user.alt_phone_number || user.video_connect_link
+              )
               .sort((a: any, b: any) => {
                 return Number(a.last_login) - Number(b.last_login);
               })
@@ -58,8 +62,8 @@ export default function DoctorVideoSlideover(props: {
           home: true,
         },
         {
-          title: "Staff",
-          user_type: "Staff",
+          title: "Nurse",
+          user_type: "Nurse",
           home: true,
         },
         {
@@ -106,6 +110,7 @@ function UserListItem(props: { user: UserAssignedModel }) {
   const user = props.user;
   const icon =
     user.user_type === "Doctor" ? "fa-user-doctor " : " fa-user-nurse";
+  const authUser = useAuthUser();
 
   return (
     <li>
@@ -152,6 +157,27 @@ function UserListItem(props: { user: UserAssignedModel }) {
                 {user.first_name} {user.last_name}
               </span>
               <div className="flex gap-2">
+                {user.video_connect_link && (
+                  <a
+                    href={user.video_connect_link}
+                    onClick={() => {
+                      triggerGoal("Doctor Connect Click", {
+                        medium: "Video Call",
+                        userId: authUser?.id,
+                        targetUserType: user.user_type,
+                      });
+                    }}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    <div className="tooltip">
+                      <span className="tooltip-text tooltip-left">
+                        Connect on a Video Call
+                      </span>
+                      <CareIcon icon="l-video" className="h-5 w-5" />
+                    </div>
+                  </a>
+                )}
                 <a
                   href={
                     user.alt_phone_number
@@ -162,6 +188,13 @@ function UserListItem(props: { user: UserAssignedModel }) {
                         )}`
                       : "#"
                   }
+                  onClick={() => {
+                    triggerGoal("Doctor Connect Click", {
+                      medium: "WhatsApp",
+                      userId: authUser?.id,
+                      targetUserType: user.user_type,
+                    });
+                  }}
                   target="_blank"
                   rel="noopener noreferrer"
                 >
@@ -176,6 +209,13 @@ function UserListItem(props: { user: UserAssignedModel }) {
                   href={
                     user.alt_phone_number ? `tel:${user.alt_phone_number}` : "#"
                   }
+                  onClick={() => {
+                    triggerGoal("Doctor Connect Click", {
+                      medium: "Phone Call",
+                      userId: authUser?.id,
+                      targetUserType: user.user_type,
+                    });
+                  }}
                 >
                   <div className="tooltip">
                     <span className="tooltip-text tooltip-left">
diff --git a/src/Components/Facility/FacilityBedCapacity.tsx b/src/Components/Facility/FacilityBedCapacity.tsx
index 0c05fb022cb..d33caf3f7cb 100644
--- a/src/Components/Facility/FacilityBedCapacity.tsx
+++ b/src/Components/Facility/FacilityBedCapacity.tsx
@@ -84,7 +84,7 @@ export const FacilityBedCapacity = (props: any) => {
   return (
     <section id="facility-bed-capacity-details">
       <div className="mt-5 rounded bg-white p-3 shadow-sm md:p-6">
-        <div className="justify-between md:flex  md:border-b md:pb-2">
+        <div className="justify-between md:flex md:pb-2">
           <div className="mb-2 text-xl font-semibold">Bed Capacity</div>
           <ButtonV2
             className="w-full md:w-auto"
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index 2341d231675..52a7cd24027 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -1,6 +1,6 @@
 import * as Notification from "../../Utils/Notifications.js";
 
-import AuthorizeFor, { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import { FacilityModel } from "./models";
 import { FACILITY_FEATURE_TYPES, USER_TYPES } from "../../Common/constants";
 import DropdownMenu, { DropdownItem } from "../Common/components/Menu";
@@ -99,6 +99,10 @@ export const FacilityHome = (props: any) => {
     USER_TYPES.findIndex((type) => type == authUser.user_type) >=
       StaffUserTypeIndex;
 
+  const hasPermissionToDeleteFacility =
+    authUser.user_type === "DistrictAdmin" ||
+    authUser.user_type === "StateAdmin";
+
   const editCoverImageTooltip = hasPermissionToEditCoverImage && (
     <div className="absolute right-0 top-0 z-10 flex h-full w-full flex-col items-center justify-center bg-black text-sm text-gray-300 opacity-0 transition-[opacity] hover:opacity-60 md:h-[88px]">
       <i className="fa-solid fa-pen" />
@@ -372,16 +376,17 @@ export const FacilityHome = (props: any) => {
                 >
                   View Users
                 </DropdownItem>
-                <DropdownItem
-                  id="delete-facility"
-                  variant="danger"
-                  onClick={() => setOpenDeleteDialog(true)}
-                  className="flex items-center gap-3"
-                  icon={<CareIcon className="care-l-trash-alt text-lg" />}
-                  authorizeFor={AuthorizeFor(["DistrictAdmin", "StateAdmin"])}
-                >
-                  Delete Facility
-                </DropdownItem>
+                {hasPermissionToDeleteFacility && (
+                  <DropdownItem
+                    id="delete-facility"
+                    variant="danger"
+                    onClick={() => setOpenDeleteDialog(true)}
+                    className="flex items-center gap-3"
+                    icon={<CareIcon className="care-l-trash-alt text-lg" />}
+                  >
+                    Delete Facility
+                  </DropdownItem>
+                )}
               </DropdownMenu>
             </div>
             <div className="flex flex-col justify-end">
diff --git a/src/Components/Facility/FacilityUsers.tsx b/src/Components/Facility/FacilityUsers.tsx
index ca2e1d0e363..f18b9578192 100644
--- a/src/Components/Facility/FacilityUsers.tsx
+++ b/src/Components/Facility/FacilityUsers.tsx
@@ -296,7 +296,10 @@ export default function FacilityUsers(props: any) {
                     </span>
                   </div>
                 </div>
-                <div className="mt-2 text-2xl font-bold capitalize">
+                <div
+                  id="name"
+                  className="mt-2 flex gap-3 text-2xl font-bold capitalize"
+                >
                   {`${user.first_name} ${user.last_name}`}
 
                   {user.last_login && isUserOnline(user) ? (
@@ -306,13 +309,12 @@ export default function FacilityUsers(props: any) {
                     ></i>
                   ) : null}
                   {showUserDelete(authUser, user) && (
-                    <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"
+                    <div
+                      className="w-8 cursor-pointer rounded-lg bg-red-50 text-xl text-red-600 hover:bg-red-50 hover:text-red-700"
                       onClick={() => handleDelete(user)}
                     >
-                      Delete
-                    </button>
+                      <CareIcon icon="l-trash" className="ml-[5px]" />
+                    </div>
                   )}
                 </div>
 
diff --git a/src/Components/Facility/InventoryList.tsx b/src/Components/Facility/InventoryList.tsx
index 26f1af87191..837b0b2ce2a 100644
--- a/src/Components/Facility/InventoryList.tsx
+++ b/src/Components/Facility/InventoryList.tsx
@@ -71,6 +71,7 @@ export default function InventoryList(props: any) {
   if (inventory?.length) {
     inventoryList = inventory.map((inventoryItem: any) => (
       <tr
+        id={`${inventoryItem.item_object?.name.replaceAll(" ", "-")}`}
         key={inventoryItem.id}
         className={classNames(
           "cursor-pointer hover:bg-gray-200",
@@ -166,6 +167,7 @@ export default function InventoryList(props: any) {
               Manage Inventory
             </ButtonV2>
             <ButtonV2
+              id="add-minimum-quantity"
               className="w-full"
               href={`/facility/${facilityId}/inventory/min_quantity/list`}
             >
diff --git a/src/Components/Facility/InventoryLog.tsx b/src/Components/Facility/InventoryLog.tsx
index 5518b5e320f..8369a7d1562 100644
--- a/src/Components/Facility/InventoryLog.tsx
+++ b/src/Components/Facility/InventoryLog.tsx
@@ -117,8 +117,8 @@ export default function InventoryLog(props: any) {
 
   let inventoryList: any = [];
   if (inventory?.length) {
-    inventoryList = inventory.map((inventoryItem: any) => (
-      <tr key={inventoryItem.id} className="bg-white">
+    inventoryList = inventory.map((inventoryItem: any, index) => (
+      <tr id={`row-${index}`} key={inventoryItem.id} className="bg-white">
         <td className="border-b border-gray-200 p-5 text-sm hover:bg-gray-100">
           <div className="flex items-center">
             <div className="ml-3">
@@ -270,6 +270,7 @@ export default function InventoryLog(props: any) {
                     as accident.
                   </div>
                   <ButtonV2
+                    id="delete-last-entry"
                     variant="danger"
                     onClick={(_) =>
                       removeLastInventoryLog(inventory[0].item_object.id)
diff --git a/src/Components/Facility/Investigations/InvestigationTable.tsx b/src/Components/Facility/Investigations/InvestigationTable.tsx
index 54e7e50bdc7..d322698779d 100644
--- a/src/Components/Facility/Investigations/InvestigationTable.tsx
+++ b/src/Components/Facility/Investigations/InvestigationTable.tsx
@@ -17,7 +17,7 @@ const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => {
       <td className="whitespace-nowrap px-6 py-4 text-sm font-medium text-gray-900">
         {data?.investigation_object?.name || "---"}
       </td>
-      <td className="whitespace-nowrap px-6 py-4 text-right text-sm text-gray-700">
+      <td className="whitespace-nowrap px-6 py-4 text-sm text-gray-700">
         {showForm ? (
           data?.investigation_object?.investigation_type === "Choice" ? (
             <SelectFormField
diff --git a/src/Components/Facility/Investigations/Reports/index.tsx b/src/Components/Facility/Investigations/Reports/index.tsx
index 9b3c29d40f8..b868e8e8af0 100644
--- a/src/Components/Facility/Investigations/Reports/index.tsx
+++ b/src/Components/Facility/Investigations/Reports/index.tsx
@@ -1,6 +1,6 @@
 import * as Notification from "../../../../Utils/Notifications";
 import _ from "lodash-es";
-import { Group, InvestigationType } from "..";
+import { InvestigationGroup, InvestigationType } from "..";
 import {
   getPatient,
   getPatientInvestigation,
@@ -22,7 +22,7 @@ import { useRef } from "react";
 
 const RESULT_PER_PAGE = 14;
 interface InitialState {
-  investigationGroups: Group[];
+  investigationGroups: InvestigationGroup[];
   selectedGroup: string[];
   investigations: InvestigationType[];
   selectedInvestigations: any[];
diff --git a/src/Components/Facility/Investigations/index.tsx b/src/Components/Facility/Investigations/index.tsx
index 91836b6bbec..95147ec4c89 100644
--- a/src/Components/Facility/Investigations/index.tsx
+++ b/src/Components/Facility/Investigations/index.tsx
@@ -22,7 +22,7 @@ const initialState = {
   form: {},
 };
 
-export interface Group {
+export interface InvestigationGroup {
   external_id: string;
   name: string;
 }
@@ -38,9 +38,9 @@ export interface InvestigationType {
   unit?: string;
   choices?: string;
   ideal_value?: string;
-  groups: Group[];
+  groups: InvestigationGroup[];
 }
-type SearchItem = Group | InvestigationType;
+type SearchItem = InvestigationGroup | InvestigationType;
 function isInvestigation(e: SearchItem): e is InvestigationType {
   return (e as InvestigationType).groups !== undefined;
 }
@@ -67,7 +67,7 @@ const listOfInvestigations = (
   );
 };
 
-const findGroup = (group_id: string, groups: Group[]) => {
+const findGroup = (group_id: string, groups: InvestigationGroup[]) => {
   return groups.find((g) => g.external_id === group_id);
 };
 
@@ -106,7 +106,9 @@ const Investigation = (props: {
   const [selectedGroup, setSelectedGroup] = useState<string[]>([]);
   const [state, setState] = useReducer(testFormReducer, initialState);
   const [investigations, setInvestigations] = useState<InvestigationType[]>([]);
-  const [investigationGroups, setInvestigationGroups] = useState<Group[]>([]);
+  const [investigationGroups, setInvestigationGroups] = useState<
+    InvestigationGroup[]
+  >([]);
   const [selectedInvestigations, setSelectedInvestigations] = useState<
     InvestigationType[]
   >([]);
diff --git a/src/Components/Facility/LegacyFacilityCNS.tsx b/src/Components/Facility/LegacyFacilityCNS.tsx
deleted file mode 100644
index 5b0005c9daf..00000000000
--- a/src/Components/Facility/LegacyFacilityCNS.tsx
+++ /dev/null
@@ -1,313 +0,0 @@
-import { navigate } from "raviger";
-import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import {
-  getAllPatient,
-  getPermittedFacility,
-  listAssetBeds,
-} from "../../Redux/actions";
-import { classNames } from "../../Utils/utils";
-import { AssetData, AssetLocationObject } from "../Assets/AssetTypes";
-import ButtonV2, { Cancel, Submit } from "../Common/components/ButtonV2";
-import Page from "../Common/components/Page";
-import Loading from "../Common/Loading";
-import Pagination from "../Common/Pagination";
-import { PatientModel } from "../Patient/models";
-import { FacilityModel } from "./models";
-import AutocompleteFormField from "../Form/FormFields/Autocomplete";
-import { uniqBy } from "lodash-es";
-import DialogModal from "../Common/Dialog";
-import { LegacyMonitorCard } from "./LegacyMonitorCard";
-
-interface Monitor {
-  patient: PatientModel;
-  asset: AssetData;
-  socketUrl: string;
-}
-
-const PER_PAGE_LIMIT = 6;
-const CNS_REFRESH_INTERVAL = 0.5 * 60e3;
-
-export default function LegacyFacilityCNS({
-  facilityId,
-}: {
-  facilityId: string;
-}) {
-  const dispatch = useDispatch<any>();
-  const [isFullscreen, setIsFullscreen] = useState(false);
-  const [monitors, setMonitors] = useState<Monitor[]>();
-  const [facility, setFacility] = useState<FacilityModel>();
-  const [currentPage, setCurrentPage] = useState(1);
-  const [defaultShowAllLocation, setDefaultShowAllLocation] = useState(true);
-  const searchParams = new URLSearchParams(window.location.search);
-
-  // this wil set ?page=1 param in url if it is not present
-  useEffect(() => {
-    if (!searchParams.get("page")) {
-      navigate(`/facility/${facilityId}/cns?page=1`);
-    }
-  }, []);
-  const [location, setLocation] = useState<AssetLocationObject>();
-  const [showSelectLocation, setShowSelectLocation] = useState(false);
-
-  useEffect(() => {
-    const onFullscreenChange = () =>
-      setIsFullscreen(!!document.fullscreenElement);
-    document.addEventListener("fullscreenchange", onFullscreenChange);
-    return () =>
-      document.removeEventListener("fullscreenchange", onFullscreenChange);
-  }, []);
-
-  useEffect(() => {
-    async function fetchFacility() {
-      const res = await dispatch(getPermittedFacility(facilityId || ""));
-      if (res.status === 200) setFacility(res.data);
-    }
-    fetchFacility();
-  }, [facilityId, dispatch]);
-
-  useEffect(() => {
-    if (!facility) return;
-    const middlewareHostname = facility.middleware_address;
-
-    async function fetchPatients() {
-      const res = await dispatch(
-        getAllPatient(
-          { facility: facilityId, is_active: "True" },
-          "cns-patient-list"
-        )
-      );
-      if (res.status === 200) {
-        const patients = res.data.results as PatientModel[];
-        return patients.filter(
-          (patient) => !!patient.last_consultation?.current_bed?.bed_object.id
-        );
-      }
-    }
-
-    async function fetchPatientMonitorAsset(patient: PatientModel) {
-      const res = await dispatch(
-        listAssetBeds(
-          {
-            bed: patient.last_consultation?.current_bed?.bed_object?.id,
-          },
-          `asset-bed-${patient.id}`
-        )
-      );
-
-      if (res.status !== 200) return;
-
-      const asset = res.data.results.find(
-        (assetBed: any) =>
-          assetBed.asset_object.meta?.asset_type === "HL7MONITOR"
-      )?.asset_object as AssetData | undefined;
-
-      if (!asset) return;
-
-      const socketUrl = `wss://${middlewareHostname}/observations/${asset.meta?.local_ip_address}`;
-
-      return { patient, asset, socketUrl } as Monitor;
-    }
-
-    async function fetchMonitors() {
-      const patients = await fetchPatients();
-      if (!patients) return;
-
-      const monitors = await Promise.all(
-        patients.map((patient) => fetchPatientMonitorAsset(patient))
-      );
-      return monitors.filter((monitor) => !!monitor) as Monitor[];
-    }
-
-    fetchMonitors().then((monitors) => {
-      setCurrentPage(Number(searchParams.get("page")));
-      setMonitors(monitors);
-    });
-
-    const interval = setInterval(() => {
-      fetchMonitors().then(setMonitors);
-    }, CNS_REFRESH_INTERVAL);
-
-    return () => clearInterval(interval);
-  }, [dispatch, facility, facilityId]);
-
-  if (!monitors) return <Loading />;
-  return (
-    <Page
-      title={`Central Nursing Station: ${
-        defaultShowAllLocation
-          ? "All Locations"
-          : `${facility?.name} - ${location?.name}`
-      }`}
-      backUrl={`/facility/${facilityId}`}
-      noImplicitPadding
-      breadcrumbs={false}
-      options={
-        <div className="flex items-center gap-4">
-          {monitors?.length > 0 ? (
-            <>
-              <ButtonV2
-                variant="secondary"
-                border
-                onClick={() => setShowSelectLocation(true)}
-              >
-                <CareIcon className="care-l-location-point text-lg" />
-                Change Location
-              </ButtonV2>
-              <ButtonV2
-                variant="secondary"
-                border
-                onClick={() => {
-                  if (isFullscreen) {
-                    document.exitFullscreen();
-                  } else {
-                    document.documentElement.requestFullscreen();
-                  }
-                }}
-                className="tooltip !h-11"
-              >
-                <CareIcon
-                  className={classNames(
-                    isFullscreen
-                      ? "care-l-compress-arrows"
-                      : "care-l-expand-arrows-alt",
-                    "text-lg"
-                  )}
-                />
-                <span className="tooltip-text tooltip-bottom -translate-x-1/2">
-                  {isFullscreen ? "Exit Fullscreen" : "Fullscreen"}
-                </span>
-              </ButtonV2>
-            </>
-          ) : (
-            <>
-              <ButtonV2
-                variant="secondary"
-                border
-                onClick={() => history.go(-2)}
-              >
-                Go Back
-              </ButtonV2>
-            </>
-          )}
-
-          <Pagination
-            className=""
-            cPage={currentPage}
-            onChange={(page) => {
-              setCurrentPage(page);
-              navigate(`/facility/${facilityId}/cns?page=${page}`);
-            }}
-            data={{
-              totalCount: defaultShowAllLocation
-                ? monitors.length
-                : monitors.filter(
-                    (m) => m.asset.location_object.id === location?.id
-                  ).length,
-            }}
-            defaultPerPage={PER_PAGE_LIMIT}
-          />
-        </div>
-      }
-    >
-      <DialogModal
-        title="Select Location"
-        show={showSelectLocation}
-        onClose={() => setShowSelectLocation(false)}
-        className="w-full max-w-md"
-      >
-        {!monitors && <Loading />}
-        <div className="flex flex-col gap-2">
-          <AutocompleteFormField
-            className="mt-2"
-            name="location"
-            placeholder="Pick a location"
-            value={location}
-            onChange={({ value }) => setLocation(value)}
-            options={
-              monitors
-                ? uniqBy(
-                    monitors.map((m) => m.asset.location_object),
-                    "id"
-                  )
-                : []
-            }
-            isLoading={!monitors}
-            optionLabel={(location) => location.name}
-            optionDescription={(location) =>
-              location.description +
-              " (" +
-              monitors.filter((m) => m.asset.location_object.id === location.id)
-                .length +
-              " patients)"
-            }
-            optionValue={(location) => location}
-            disabled={!monitors}
-          />
-          <div className="justify-end md:flex">
-            <ButtonV2
-              variant="primary"
-              className="my-2 mr-2 w-full"
-              onClick={() => {
-                setDefaultShowAllLocation(true);
-                setShowSelectLocation(false);
-              }}
-            >
-              Show All Locations
-            </ButtonV2>
-            <Submit
-              onClick={() => {
-                setDefaultShowAllLocation(false);
-                setShowSelectLocation(false);
-              }}
-              className="my-2 mr-2"
-              label="Confirm"
-            />
-            <Cancel
-              onClick={() => setShowSelectLocation(false)}
-              className="my-2 mr-2"
-            />
-          </div>
-        </div>
-      </DialogModal>
-      {monitors.length === 0 && (
-        <div className="flex h-[80vh] w-full items-center justify-center text-center text-black">
-          No patients are currently monitored
-        </div>
-      )}
-      <div className="mt-4 grid grid-cols-1 gap-1 lg:grid-cols-3">
-        {defaultShowAllLocation
-          ? monitors
-              ?.slice(
-                (currentPage - 1) * PER_PAGE_LIMIT,
-                currentPage * PER_PAGE_LIMIT
-              )
-              .map(({ patient, socketUrl, asset }) => (
-                <LegacyMonitorCard
-                  key={patient.id}
-                  location={asset.location_object}
-                  facilityId={facilityId}
-                  patient={patient}
-                  socketUrl={socketUrl}
-                />
-              ))
-          : monitors
-              ?.filter((m) => m.asset.location_object.id === location?.id)
-              ?.slice(
-                (currentPage - 1) * PER_PAGE_LIMIT,
-                currentPage * PER_PAGE_LIMIT
-              )
-              .map(({ patient, socketUrl, asset }) => (
-                <LegacyMonitorCard
-                  key={patient.id}
-                  location={asset.location_object}
-                  facilityId={facilityId}
-                  patient={patient}
-                  socketUrl={socketUrl}
-                />
-              ))}
-      </div>
-    </Page>
-  );
-}
diff --git a/src/Components/Facility/LegacyMonitorCard.tsx b/src/Components/Facility/LegacyMonitorCard.tsx
deleted file mode 100644
index 61bff3d607b..00000000000
--- a/src/Components/Facility/LegacyMonitorCard.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { GENDER_TYPES } from "../../Common/constants";
-import { Link } from "raviger";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import { PatientModel } from "../Patient/models";
-import LegacyPatientVitalsCard from "../Patient/LegacyPatientVitalsCard";
-import { AssetLocationObject } from "../Assets/AssetTypes";
-import { formatAge } from "../../Utils/utils";
-
-interface MonitorCardProps {
-  facilityId: string;
-  patient: PatientModel;
-  socketUrl: string;
-  location: AssetLocationObject;
-}
-
-export const LegacyMonitorCard = ({
-  facilityId,
-  patient,
-  socketUrl,
-  location,
-}: MonitorCardProps) => {
-  return (
-    <div key={patient.id} className="group rounded-lg bg-black p-2">
-      <div className="flex w-full flex-wrap gap-4 p-2 tracking-wider text-white">
-        <Link
-          href={`/facility/${facilityId}/patient/${patient.id}/consultation/${patient.last_consultation?.id}`}
-          className="font-bold uppercase text-white"
-        >
-          {patient.name}
-        </Link>
-        <span>
-          {formatAge(patient.age, patient.date_of_birth)} |{" "}
-          {GENDER_TYPES.find((g) => g.id === patient.gender)?.icon}
-        </span>
-        <span className="flex flex-1 items-center justify-end gap-2 text-end">
-          <CareIcon className="care-l-bed text-lg" />
-          {patient.last_consultation?.current_bed?.bed_object?.name}
-        </span>
-        <span className="flex-2 flex items-center justify-end gap-2 text-end">
-          <CareIcon className="care-l-location-point text-lg" />
-          {location.name}
-        </span>
-      </div>
-      <LegacyPatientVitalsCard socketUrl={socketUrl} shrinked />
-    </div>
-  );
-};
diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx
index b7a758c5055..93a08794c82 100644
--- a/src/Components/Facility/LocationManagement.tsx
+++ b/src/Components/Facility/LocationManagement.tsx
@@ -46,14 +46,14 @@ export default function LocationManagement({ facilityId }: Props) {
               Add New Location
             </ButtonV2>
           </div>
-          <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
-            <span>No locations available</span>
-          </PaginatedList.WhenEmpty>
-
-          <PaginatedList.WhenLoading>
-            <Loading />
-          </PaginatedList.WhenLoading>
           <div className="w-full @container">
+            <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
+              <span>No locations available</span>
+            </PaginatedList.WhenEmpty>
+
+            <PaginatedList.WhenLoading>
+              <Loading />
+            </PaginatedList.WhenLoading>
             <PaginatedList.Items<LocationModel> className="my-8 grid gap-3 @4xl:grid-cols-2 @6xl:grid-cols-3 @[100rem]:grid-cols-4 lg:mx-8">
               {(item) => <Location {...item} />}
             </PaginatedList.Items>
diff --git a/src/Components/Facility/MinQuantityList.tsx b/src/Components/Facility/MinQuantityList.tsx
index 631f432a9dc..941722bd810 100644
--- a/src/Components/Facility/MinQuantityList.tsx
+++ b/src/Components/Facility/MinQuantityList.tsx
@@ -126,6 +126,7 @@ export default function MinQuantityList(props: any) {
             {inventoryItem.item_object?.default_unit?.name}
           </p>
           <ButtonV2
+            id="update-minimum-quantity"
             variant="secondary"
             ghost
             border
@@ -219,6 +220,7 @@ export default function MinQuantityList(props: any) {
       <div className="container mx-auto px-4 sm:px-8">
         <div className="py-8">
           <ButtonV2
+            id="set-minimum-quantity"
             className="ml-2"
             href={`/facility/${facilityId}/inventory/min_quantity/set`}
             authorizeFor={NonReadOnlyUsers}
diff --git a/src/Components/Facility/MinQuantityRequiredModal.tsx b/src/Components/Facility/MinQuantityRequiredModal.tsx
index d076b65f076..46296545500 100644
--- a/src/Components/Facility/MinQuantityRequiredModal.tsx
+++ b/src/Components/Facility/MinQuantityRequiredModal.tsx
@@ -154,7 +154,12 @@ export const MinQuantityRequiredModal = (props: any) => {
             />
           </div>
           <div className="flex justify-end">
-            <ButtonV2 variant="primary" onClick={handleSubmit} className="mr-2">
+            <ButtonV2
+              variant="primary"
+              onClick={handleSubmit}
+              className="mr-2"
+              id="save-update-minimumquanitity"
+            >
               Update
             </ButtonV2>
             <ButtonV2 variant="secondary" onClick={handleClose}>
diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx
index 4279e3c1877..5ecf30cfcdf 100644
--- a/src/Components/Facility/PatientNotesSlideover.tsx
+++ b/src/Components/Facility/PatientNotesSlideover.tsx
@@ -23,7 +23,6 @@ interface PatientNotesProps {
 export default function PatientNotesSlideover(props: PatientNotesProps) {
   const [show, setShow] = useState(true);
   const [patientActive, setPatientActive] = useState(true);
-  const [noteField, setNoteField] = useState("");
   const [reload, setReload] = useState(false);
   const [focused, setFocused] = useState(false);
 
@@ -37,6 +36,11 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
   const { facilityId, patientId, consultationId, setShowPatientNotesPopup } =
     props;
 
+  const localStorageKey = `patientNotesNoteField_${consultationId}`;
+  const [noteField, setNoteField] = useState(
+    localStorage.getItem(localStorageKey) || ""
+  );
+
   const onAddNote = async () => {
     const payload = {
       note: noteField,
@@ -127,6 +131,10 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
     </div>
   );
 
+  useEffect(() => {
+    localStorage.setItem(localStorageKey, noteField);
+  }, [noteField, localStorageKey]);
+
   return (
     <div
       className={classNames(
diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index 8291e0e8ba4..8f1589cdf6f 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -122,22 +122,32 @@ const TreatmentSummary = (props: any) => {
             <div className="text-right font-bold">{formatDate(date)}</div>
 
             <div className="mb-5 mt-2 border border-gray-800">
-              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-3">
+              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
                 <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
                   <b>Name :</b> {patientData.name}
                 </div>
                 <div className="col-span-1 px-3 py-2">
-                  <b>Address :</b> {patientData.address}
+                  <b>Address : </b> {patientData.address}
                 </div>
               </div>
 
-              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 md:grid-cols-3">
-                <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-r-2 md:border-b-0 ">
-                  <b>Age :</b>{" "}
-                  {formatAge(patientData.age, patientData.date_of_birth, true)}
+              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
+                <div className="col-span-1 grid print:grid-cols-2 sm:grid-cols-2 ">
+                  <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
+                    <b>Age :</b>{" "}
+                    {formatAge(
+                      patientData.age,
+                      patientData.date_of_birth,
+                      true
+                    )}
+                  </div>
+                  <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
+                    <b>OP :</b> {consultationData.patient_no}
+                  </div>
                 </div>
-                <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0  md:border-b-0 ">
-                  <b>Date of admission :</b>
+
+                <div className="col-span-1 px-3 py-2">
+                  <b>Date of admission : </b>
                   <span>
                     {consultationData.admitted
                       ? formatDateTime(consultationData.encounter_date)
@@ -146,13 +156,13 @@ const TreatmentSummary = (props: any) => {
                 </div>
               </div>
 
-              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 md:grid-cols-3">
-                <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-r-2 md:border-b-0">
-                  <b>Gender :</b>
+              <div className="grid border-b-2 border-gray-800 print:grid-cols-3 sm:grid-cols-2 print:md:grid-cols-3">
+                <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0 print:border-r-2 sm:border-b-0 sm:border-r-2">
+                  <b>Gender : </b>
                   {GENDER_TYPES.find((i) => i.id === patientData.gender)?.text}
                 </div>
 
-                <div className="col-span-1 border-b-2 border-gray-800 px-3 py-2 print:border-b-0  md:border-b-0 ">
+                <div className="col-span-1 px-3 py-2">
                   <b>Contact person :</b>
                   <span>
                     {" "}
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 16113d0c8b7..74cf6700530 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -5,7 +5,7 @@ import { AssetData, AssetLocationType } from "../Assets/AssetTypes";
 import { UserBareMinimum } from "../Users/models";
 import { RouteToFacility } from "../Common/RouteToFacilitySelect";
 import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types";
-import { ConsultationSuggestionValue } from "../../Common/constants";
+import { ConsultationSuggestionValue, UserRole } from "../../Common/constants";
 
 export interface LocalBodyModel {
   id: number;
@@ -103,18 +103,18 @@ export interface ConsultationModel {
   category?: PatientCategory;
   created_date?: string;
   discharge_date?: string;
-  discharge_reason?: string;
+  new_discharge_reason?: number;
   discharge_prescription?: NormalPrescription;
   discharge_prn_prescription?: PRNPrescription;
   discharge_notes?: string;
   examination_details?: string;
   history_of_present_illness?: string;
-  facility?: number;
+  facility: string;
   facility_name?: string;
   id: string;
   modified_date?: string;
   other_symptoms?: string;
-  patient?: string;
+  patient: string;
   treatment_plan?: string;
   referred_to?: FacilityModel["id"];
   referred_to_object?: FacilityModel;
@@ -203,11 +203,11 @@ export interface InventoryItemsModel {
 }
 
 export interface LocationModel {
-  id?: string;
-  name?: string;
+  id: string;
+  name: string;
   description?: string;
   middleware_address?: string;
-  location_type?: AssetLocationType;
+  location_type: AssetLocationType;
   facility?: {
     name: string;
   };
@@ -218,8 +218,8 @@ export interface LocationModel {
 export interface BedModel {
   id?: string;
   bed_type?: string;
-  description?: string;
   name?: string;
+  description?: string;
   facility?: string;
   location_object?: {
     name: string;
@@ -228,6 +228,8 @@ export interface BedModel {
   location?: string;
   is_occupied?: boolean;
   meta?: object;
+  created_date?: string;
+  modified_date?: string;
 }
 
 export interface CurrentBed {
@@ -494,7 +496,7 @@ export interface PatientNotesModel {
   note: string;
   facility: BaseFacilityModel;
   created_by_object: BaseUserModel;
-  user_type?: string;
+  user_type?: UserRole | "RemoteSpecialist";
   created_date: string;
 }
 
diff --git a/src/Components/Form/FormFields/RadioFormField.tsx b/src/Components/Form/FormFields/RadioFormField.tsx
index 3d1a9b7d8ac..905986d62af 100644
--- a/src/Components/Form/FormFields/RadioFormField.tsx
+++ b/src/Components/Form/FormFields/RadioFormField.tsx
@@ -5,13 +5,14 @@ type Props<T> = FormFieldBaseProps<string> & {
   options: T[];
   optionDisplay: (option: T) => React.ReactNode;
   optionValue: (option: T) => string;
+  containerClassName?: string;
 };
 
 const RadioFormField = <T,>(props: Props<T>) => {
   const field = useFormFieldPropsResolver(props);
   return (
     <FormField field={field}>
-      <div className="flex gap-4 p-4">
+      <div className={props.containerClassName || "flex gap-4 p-4"}>
         {props.options.map((option, idx) => {
           const value = props.optionValue(option);
           const optionId = `${props.name}-${idx}`;
diff --git a/src/Components/Patient/DailyRoundListDetails.tsx b/src/Components/Patient/DailyRoundListDetails.tsx
index 9ac68a20ca7..8f313c0a51d 100644
--- a/src/Components/Patient/DailyRoundListDetails.tsx
+++ b/src/Components/Patient/DailyRoundListDetails.tsx
@@ -1,6 +1,10 @@
 import { lazy, useCallback, useState } from "react";
 import { useDispatch } from "react-redux";
-import { CURRENT_HEALTH_CHANGE, SYMPTOM_CHOICES } from "../../Common/constants";
+import {
+  CONSCIOUSNESS_LEVEL,
+  CURRENT_HEALTH_CHANGE,
+  SYMPTOM_CHOICES,
+} from "../../Common/constants";
 import { statusType, useAbortableEffect } from "../../Common/utils";
 import { getConsultationDailyRoundsDetails } from "../../Redux/actions";
 import { DailyRoundsModel } from "./models";
@@ -183,6 +187,16 @@ export const DailyRoundListDetails = (props: any) => {
             </span>
             {dailyRoundListDetailsData.rhythm_detail ?? "-"}
           </div>
+          <div className="md:col-span-2">
+            <span className="font-semibold leading-relaxed">
+              Level Of Consciousness:{" "}
+            </span>
+            {dailyRoundListDetailsData.consciousness_level
+              ? CONSCIOUSNESS_LEVEL.find(
+                  (i) => i.id === dailyRoundListDetailsData.consciousness_level
+                )?.text
+              : "-"}
+          </div>
           <div>
             <span className="font-semibold leading-relaxed">
               Recommend Discharge:{" "}
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index a9a31f2aa14..56e26dff022 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -1,9 +1,10 @@
 import { navigate } from "raviger";
 
 import dayjs from "dayjs";
-import { lazy, useCallback, useEffect, useState } from "react";
+import { lazy, useCallback, useState } from "react";
 import { useDispatch } from "react-redux";
 import {
+  CONSCIOUSNESS_LEVEL,
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
   RHYTHM_CHOICES,
@@ -22,7 +23,7 @@ import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave";
 import * as Notification from "../../Utils/Notifications";
 import { formatDateTime } from "../../Utils/utils";
 import BloodPressureFormField, {
-  meanArterialPressure,
+  BloodPressureValidator,
 } from "../Common/BloodPressureFormField";
 import { SymptomsSelect } from "../Common/SymptomsSelect";
 import TemperatureFormField from "../Common/TemperatureFormField";
@@ -35,6 +36,7 @@ import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
 import PatientCategorySelect from "./PatientCategorySelect";
+import RadioFormField from "../Form/FormFields/RadioFormField";
 const Loading = lazy(() => import("../Common/Loading"));
 
 const initForm: any = {
@@ -59,6 +61,12 @@ const initForm: any = {
   rhythm: "0",
   rhythm_detail: "",
   ventilator_spo2: null,
+  consciousness_level: "UNKNOWN",
+  bp: {
+    systolic: undefined,
+    diastolic: undefined,
+    mean: undefined,
+  },
   // bed: null,
 };
 
@@ -129,10 +137,40 @@ export const DailyRounds = (props: any) => {
     "ventilator_spo2",
     "rhythm",
     "rhythm_detail",
+    "consciousness_level",
   ];
 
-  useEffect(() => {
-    (async () => {
+  const fetchRoundDetails = useCallback(
+    async (status: statusType) => {
+      setIsLoading(true);
+      let formData: any = initialData;
+      if (id) {
+        const res = await dispatchAction(
+          getConsultationDailyRoundsDetails({ consultationId, id })
+        );
+
+        if (!status.aborted) {
+          if (res?.data) {
+            const data = {
+              ...res.data,
+              patient_category: res.data.patient_category
+                ? PATIENT_CATEGORIES.find(
+                    (i) => i.text === res.data.patient_category
+                  )?.id ?? ""
+                : "",
+              rhythm:
+                (res.data.rhythm &&
+                  RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
+                "0",
+              admitted_to: res.data.admitted_to
+                ? res.data.admitted_to
+                : "Select",
+            };
+            formData = { ...formData, ...data };
+          }
+        }
+      }
+      setIsLoading(false);
       if (patientId) {
         const res = await dispatchAction(getPatient({ id: patientId }));
         if (res.data) {
@@ -150,71 +188,20 @@ export const DailyRounds = (props: any) => {
             ...initialData,
             action: getAction,
           });
-          dispatch({
-            type: "set_form",
-            form: {
-              ...state.form,
-              action: getAction,
-            },
-          });
+          formData = { ...formData, ...{ action: getAction } };
         }
       } else {
         setPatientName("");
         setFacilityName("");
       }
-    })();
-  }, [dispatchAction, patientId]);
-
-  const fetchRoundDetails = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      const res = await dispatchAction(
-        getConsultationDailyRoundsDetails({ consultationId, id })
-      );
-
-      if (!status.aborted) {
-        if (res?.data) {
-          const data = {
-            ...res.data,
-            patient_category: res.data.patient_category
-              ? PATIENT_CATEGORIES.find(
-                  (i) => i.text === res.data.patient_category
-                )?.id ?? ""
-              : "",
-            rhythm:
-              (res.data.rhythm &&
-                RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
-              "0",
-            admitted_to: res.data.admitted_to ? res.data.admitted_to : "Select",
-          };
-          dispatch({ type: "set_form", form: data });
-          setInitialData(data);
-        }
-        setIsLoading(false);
-      }
-    },
-    [consultationId, id, dispatchAction]
-  );
-  useAbortableEffect(
-    (status: statusType) => {
-      if (id) {
-        fetchRoundDetails(status);
-      }
-    },
-    [dispatchAction, fetchRoundDetails]
-  );
-
-  useEffect(() => {
-    (async () => {
       if (consultationId && !id) {
         const res = await dispatchAction(
           getDailyReport({ limit: 1, offset: 0 }, { consultationId })
         );
         setHasPreviousLog(res.data.count > 0);
-        dispatch({
-          type: "set_form",
-          form: {
-            ...state.form,
+        formData = {
+          ...formData,
+          ...{
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
@@ -225,12 +212,20 @@ export const DailyRounds = (props: any) => {
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
               "0",
             temperature: parseFloat(res.data.temperature),
-            // clone_last: res.data.count > 0 ? true : false,
           },
-        });
+        };
       }
-    })();
-  }, [dispatchAction, consultationId, id]);
+      dispatch({ type: "set_form", form: formData });
+      setInitialData(formData);
+    },
+    [consultationId, id, dispatchAction, patientId]
+  );
+  useAbortableEffect(
+    (status: statusType) => {
+      fetchRoundDetails(status);
+    },
+    [dispatchAction, fetchRoundDetails]
+  );
 
   const validateForm = () => {
     const errors = { ...initError };
@@ -252,6 +247,14 @@ export const DailyRounds = (props: any) => {
             invalidForm = true;
           }
           return;
+        case "bp": {
+          const error = BloodPressureValidator(state.form.bp);
+          if (error) {
+            errors.bp = error;
+            invalidForm = true;
+          }
+          return;
+        }
         default:
           return;
       }
@@ -296,22 +299,14 @@ export const DailyRounds = (props: any) => {
         if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
           data = {
             ...data,
-            bp:
-              state.form.bp && state.form.bp.systolic && state.form.bp.diastolic
-                ? {
-                    systolic: Number(state.form.bp.systolic),
-                    diastolic: Number(state.form.bp.diastolic),
-                    mean: parseFloat(
-                      meanArterialPressure(state.form.bp).toFixed(2)
-                    ),
-                  }
-                : undefined,
-            pulse: state.form.pulse,
-            resp: Number(state.form.resp),
-            temperature: state.form.temperature,
-            rhythm: Number(state.form.rhythm) || 0,
+            bp: state.form.bp ?? {},
+            pulse: state.form.pulse ?? null,
+            resp: state.form.resp ?? null,
+            temperature: state.form.temperature ?? null,
+            rhythm: state.form.rhythm || 0,
             rhythm_detail: state.form.rhythm_detail,
-            ventilator_spo2: state.form.ventilator_spo2,
+            ventilator_spo2: state.form.ventilator_spo2 ?? null,
+            consciousness_level: state.form.consciousness_level,
           };
         }
       } else {
@@ -637,9 +632,21 @@ export const DailyRounds = (props: any) => {
 
                 <TextAreaFormField
                   {...field("rhythm_detail")}
-                  className="md:col-span-2"
+                  className="md:col-span-1"
                   label="Rhythm Description"
-                  rows={5}
+                  rows={7}
+                />
+
+                <RadioFormField
+                  label="Level Of Consciousness"
+                  {...field("consciousness_level")}
+                  options={CONSCIOUSNESS_LEVEL.map((level) => ({
+                    label: level.text,
+                    value: level.id,
+                  }))}
+                  optionDisplay={(option) => option.label}
+                  optionValue={(option) => option.value}
+                  containerClassName="grid gap-1 grid-cols-1"
                 />
               </>
             )}
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index e1ea368af72..d1dedc5e2ff 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -276,6 +276,7 @@ export const FileUpload = (props: FileUploadProps) => {
 
   const handleClose = () => {
     setDownloadURL("");
+    setPreviewImage(null);
     setFileState({
       ...file_state,
       open: false,
@@ -1212,6 +1213,7 @@ export const FileUpload = (props: FileUploadProps) => {
                   </ButtonV2>
                   <Submit
                     onClick={() => {
+                      setPreviewImage(null);
                       setModalOpenForCamera(false);
                     }}
                     className="m-2"
@@ -1272,6 +1274,7 @@ export const FileUpload = (props: FileUploadProps) => {
                     <Submit
                       onClick={() => {
                         setModalOpenForCamera(false);
+                        setPreviewImage(null);
                       }}
                     >
                       {t("submit")}
diff --git a/src/Components/Patient/LegacyPatientVitalsCard.tsx b/src/Components/Patient/LegacyPatientVitalsCard.tsx
deleted file mode 100644
index 6577e4920d4..00000000000
--- a/src/Components/Patient/LegacyPatientVitalsCard.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import { ReactNode, useEffect, useRef, useState } from "react";
-import { useDispatch } from "react-redux";
-import { listAssetBeds, getPermittedFacility } from "../../Redux/actions";
-import { classNames } from "../../Utils/utils";
-import { AssetData } from "../Assets/AssetTypes";
-import ToolTip from "../Common/utils/Tooltip";
-import { PatientModel } from "./models";
-import Waveform, { WaveformType } from "./Waveform";
-
-export interface IPatientVitalsCardProps {
-  facilityId?: string;
-  patient?: PatientModel;
-  socketUrl?: string;
-  shrinked?: boolean;
-}
-
-const getVital = (
-  patientObservations: any,
-  vital: string,
-  fallbackValue?: any
-) => {
-  if (patientObservations) {
-    const vitalValues = patientObservations[vital];
-    if (vitalValues) {
-      const returnValue = vitalValues?.value;
-
-      if (returnValue !== undefined && returnValue !== null) {
-        return returnValue;
-      }
-    }
-  }
-  if (fallbackValue) {
-    return fallbackValue;
-  }
-  return "";
-};
-
-export default function LegacyPatientVitalsCard({
-  patient,
-  socketUrl,
-  facilityId,
-  shrinked,
-}: IPatientVitalsCardProps) {
-  const wsClient = useRef<WebSocket>();
-  const [waveforms, setWaveForms] = useState<WaveformType[] | null>(null);
-  const dispatch: any = useDispatch();
-  const [middlewareHostname, setMiddlewareHostname] = useState("");
-  const [wsUrl, setWsUrl] = useState("");
-  const [patientObservations, setPatientObservations] = useState<any>();
-  const [stats, setStats] = useState(false);
-
-  useEffect(() => {
-    const fetchFacility = async () => {
-      const res = await dispatch(getPermittedFacility(facilityId || ""));
-
-      if (res.status === 200 && res.data) {
-        setMiddlewareHostname(res.data.middleware_address);
-      }
-    };
-
-    if (facilityId) fetchFacility();
-  }, [dispatch, facilityId]);
-
-  useEffect(() => {
-    const fetchAssetData = async () => {
-      let bedAssets = await dispatch(
-        listAssetBeds({
-          bed: patient?.last_consultation?.current_bed?.bed_object?.id,
-        })
-      );
-      bedAssets = {
-        ...bedAssets,
-        data: {
-          ...bedAssets.data,
-          results: bedAssets.data.results.filter((assetBed: any) =>
-            assetBed.asset_object.meta?.asset_type === "HL7MONITOR"
-              ? true
-              : false
-          ),
-        },
-      };
-
-      if (bedAssets.data.results.length > 0) {
-        const asset: AssetData = bedAssets.data.results[0].asset_object;
-        if (asset?.meta?.local_ip_address) {
-          setWsUrl(
-            `wss://${middlewareHostname}/observations/${asset?.meta?.local_ip_address}`
-          );
-        }
-      }
-    };
-
-    if (patient?.last_consultation?.current_bed?.bed_object?.id)
-      fetchAssetData();
-  }, [
-    dispatch,
-    middlewareHostname,
-    patient?.last_consultation?.current_bed?.bed_object?.id,
-  ]);
-
-  const connectWs = (url: string) => {
-    wsClient.current = new WebSocket(url);
-    wsClient.current.addEventListener("message", (e) => {
-      const newObservations = JSON.parse(e.data || "{}");
-      if (newObservations.length > 0) {
-        setWaveForms(
-          newObservations.filter((o: any) => o.observation_id === "waveform")
-        );
-        const newObservationsMap = newObservations.reduce(
-          (acc: any, curr: { observation_id: any }) => ({
-            ...acc,
-            [curr.observation_id]: curr,
-          }),
-          {}
-        );
-        setPatientObservations(newObservationsMap);
-      }
-    });
-  };
-
-  useEffect(() => {
-    if (socketUrl || wsUrl) connectWs(socketUrl || wsUrl);
-
-    return () => {
-      wsClient.current?.close();
-    };
-  }, [wsUrl, socketUrl]);
-
-  useEffect(() => {
-    return () => {
-      wsClient.current?.close();
-      setWaveForms(null);
-    };
-  }, [socketUrl, patient]);
-
-  type VitalType = {
-    label: ReactNode;
-    liveKey: string;
-    vitalKey: string;
-    waveformKey?: string;
-    waveformColor?: string;
-    waveformName?: string;
-    waveformDefaultSpace?: boolean;
-    wavetype?: "STREAM" | "REFRESH";
-  };
-
-  const vitals: VitalType[] = [
-    {
-      label: shrinked ? "Pulse" : "Pulse Rate",
-      liveKey: "pulse-rate",
-      vitalKey: "pulse",
-      waveformKey: "II",
-      waveformColor: "limegreen",
-      waveformName: "ECG",
-      wavetype: "REFRESH",
-    },
-    {
-      label: shrinked ? "BP" : "Blood Pressure",
-      liveKey: "bp",
-      vitalKey: "bp",
-    },
-    {
-      label: (
-        <>
-          SpO<sub>2</sub>
-        </>
-      ),
-      liveKey: "SpO2",
-      vitalKey: "ventilator_spo2",
-      waveformKey: "Pleth",
-      waveformColor: "yellow",
-    },
-    {
-      label: <>R. Rate</>,
-      liveKey: "respiratory-rate",
-      vitalKey: "resp",
-      waveformKey: "Respiration",
-      waveformColor: "cyan",
-      //waveformDefaultSpace: true
-    },
-    {
-      label: shrinked ? "Temp. (°F)" : "Temperature (°F)",
-      liveKey: "body-temperature1",
-      vitalKey: "temperature",
-    },
-  ];
-
-  return (
-    <div className=" w-full">
-      <div
-        className={classNames(
-          "flex w-full flex-col items-stretch md:flex-row",
-          shrinked && "bg-black"
-        )}
-      >
-        <div className="relative flex h-auto w-full flex-col items-stretch bg-black py-2 text-gray-400">
-          {waveforms ? (
-            <>
-              {vitals.map((v, i) => {
-                const waveform: any = waveforms.filter(
-                  (w) => w["wave-name"] === v.waveformKey
-                )[0];
-                return v.waveformKey && waveform ? (
-                  <Waveform
-                    key={i}
-                    wave={{
-                      ...waveform,
-                      data: waveforms
-                        .filter((w) => w["wave-name"] === v.waveformKey)
-                        .map((w) => w.data)
-                        .join(" "),
-                    }}
-                    title={v.waveformName || v.waveformKey}
-                    color={v.waveformColor}
-                    metrics={stats}
-                    classes={"h-[150px]"}
-                    defaultSpace={v.waveformDefaultSpace}
-                    wavetype={v.wavetype || "STREAM"}
-                  />
-                ) : (
-                  <div className="flex items-center justify-center text-gray-900"></div>
-                );
-              })}
-              <div className="absolute bottom-1 right-1 flex gap-2">
-                <ToolTip text="Toggle stats for nerds" position="LEFT">
-                  <button onClick={() => setStats(!stats)}>
-                    <i className="fas fa-chart-simple text-gray-400" />
-                  </button>
-                </ToolTip>
-              </div>
-            </>
-          ) : (
-            <div className="flex h-full w-full items-center justify-center">
-              <div className="w-[150px] text-center text-gray-800">
-                <i className="fas fa-plug-circle-exclamation mb-4 text-4xl" />
-                <div>No Live data at the moment!</div>
-              </div>
-            </div>
-          )}
-        </div>
-        <div
-          className={classNames(
-            "flex w-full shrink-0 flex-row flex-wrap justify-between border-l border-l-gray-400 md:flex-col md:flex-nowrap md:justify-start",
-            shrinked ? "p-2 text-gray-400 md:w-[120px]" : "p-3 md:w-[200px]"
-          )}
-        >
-          {vitals.map((vital, i) => {
-            const liveReading = getVital(patientObservations, vital.liveKey);
-            return (
-              <div key={i} className="h-[90px] p-2">
-                <h2 className="text-xl font-bold md:text-3xl">
-                  {liveReading ||
-                    (vital.vitalKey === "bp"
-                      ? `${
-                          patient?.last_consultation?.last_daily_round?.bp
-                            .systolic || "--"
-                        }/${
-                          patient?.last_consultation?.last_daily_round?.bp
-                            .diastolic || "--"
-                        }`
-                      : patient?.last_consultation?.last_daily_round?.[
-                          vital.vitalKey || ""
-                        ]) ||
-                    "--"}
-                </h2>
-                <div
-                  className={classNames(
-                    "text-xs",
-                    shrinked ? "md:text-sm" : "md:text-base"
-                  )}
-                >
-                  <div
-                    className={classNames(
-                      "mr-2 rounded-full",
-                      shrinked ? "h-2 w-2" : "h-3 w-3",
-                      liveReading ? "text-green-500" : "text-gray-500"
-                    )}
-                  />
-                  {vital.label}
-                </div>
-              </div>
-            );
-          })}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index e1d982148f1..0f9a6656f67 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -153,7 +153,8 @@ export const PatientManager = () => {
   };
 
   const tabValue =
-    qParams.last_consultation_discharge_reason || qParams.is_active === "False"
+    qParams.last_consultation__new_discharge_reason ||
+    qParams.is_active === "False"
       ? 1
       : 0;
 
@@ -163,7 +164,7 @@ export const PatientManager = () => {
     name: qParams.name || undefined,
     patient_no: qParams.patient_no || undefined,
     is_active:
-      !qParams.last_consultation_discharge_reason &&
+      !qParams.last_consultation__new_discharge_reason &&
       (qParams.is_active || "True"),
     disease_status: qParams.disease_status || undefined,
     phone_number: qParams.phone_number
@@ -204,8 +205,8 @@ export const PatientManager = () => {
       qParams.last_consultation_discharge_date_after || undefined,
     last_consultation_admitted_bed_type_list:
       qParams.last_consultation_admitted_bed_type_list || undefined,
-    last_consultation_discharge_reason:
-      qParams.last_consultation_discharge_reason || undefined,
+    last_consultation__new_discharge_reason:
+      qParams.last_consultation__new_discharge_reason || undefined,
     last_consultation_current_bed__location:
       qParams.last_consultation_current_bed__location || undefined,
     srf_id: qParams.srf_id || undefined,
@@ -352,7 +353,7 @@ export const PatientManager = () => {
     qParams.age_max,
     qParams.age_min,
     qParams.last_consultation_admitted_bed_type_list,
-    qParams.last_consultation_discharge_reason,
+    qParams.last_consultation__new_discharge_reason,
     qParams.last_consultation_current_bed__location,
     qParams.facility,
     qParams.facility_type,
@@ -536,12 +537,9 @@ export const PatientManager = () => {
         ? PATIENT_CATEGORIES.find((c) => c.text === category)?.twClass
         : "patient-unknown";
 
-      return (
-        <Link
-          key={`usr_${patient.id}`}
-          data-cy="patient"
-          href={patientUrl}
-          className={`ring/0 hover:ring/100 group relative w-full cursor-pointer rounded-lg bg-white p-4 pl-5 text-black shadow transition-all duration-200 ease-in-out hover:pl-5 ${categoryClass}-ring overflow-hidden`}
+      const children = (
+        <div
+          className={`ring/0 hover:ring/100 group relative w-full rounded-lg bg-white p-4 pl-5 text-black shadow transition-all duration-200 ease-in-out hover:pl-5 ${categoryClass}-ring overflow-hidden`}
         >
           <div
             className={`absolute inset-y-0 left-0 flex h-full w-1 items-center rounded-l-lg transition-all duration-200 ease-in-out group-hover:w-5 ${categoryClass}`}
@@ -743,6 +741,19 @@ export const PatientManager = () => {
                 </div>
               )}
           </div>
+        </div>
+      );
+
+      if (
+        authUser.user_type === "Staff" ||
+        authUser.user_type === "StaffReadOnly"
+      ) {
+        return children;
+      }
+
+      return (
+        <Link key={`usr_${patient.id}`} data-cy="patient" href={patientUrl}>
+          {children}
         </Link>
       );
     });
@@ -1022,10 +1033,10 @@ export const PatientManager = () => {
             },
             value(
               "Discharge Reason",
-              "last_consultation_discharge_reason",
+              "last_consultation__new_discharge_reason",
               parseOptionId(
                 DISCHARGE_REASONS,
-                qParams.last_consultation_discharge_reason
+                qParams.last_consultation__new_discharge_reason
               ) || ""
             ),
           ]}
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index 481d2dcc67b..4488aa755e1 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -81,8 +81,8 @@ export default function PatientFilter(props: any) {
         : [],
     last_consultation_current_bed__location:
       filter.last_consultation_current_bed__location || "",
-    last_consultation_discharge_reason:
-      filter.last_consultation_discharge_reason || null,
+    last_consultation__new_discharge_reason:
+      filter.last_consultation__new_discharge_reason || null,
     srf_id: filter.srf_id || null,
     number_of_doses: filter.number_of_doses || null,
     covin_id: filter.covin_id || null,
@@ -241,7 +241,7 @@ export default function PatientFilter(props: any) {
       last_consultation_discharge_date_before,
       last_consultation_discharge_date_after,
       last_consultation_admitted_bed_type_list,
-      last_consultation_discharge_reason,
+      last_consultation__new_discharge_reason,
       last_consultation_current_bed__location,
       number_of_doses,
       covin_id,
@@ -298,8 +298,8 @@ export default function PatientFilter(props: any) {
       age_max: age_max || "",
       last_consultation_admitted_bed_type_list:
         last_consultation_admitted_bed_type_list || [],
-      last_consultation_discharge_reason:
-        last_consultation_discharge_reason || "",
+      last_consultation__new_discharge_reason:
+        last_consultation__new_discharge_reason || "",
       srf_id: srf_id || "",
       number_of_doses: number_of_doses || "",
       covin_id: covin_id || "",
@@ -424,16 +424,16 @@ export default function PatientFilter(props: any) {
           <div className="w-full flex-none" id="discharge-reason-select">
             <FieldLabel className="text-sm">Discharge Reason</FieldLabel>
             <SelectMenuV2
-              id="last_consultation_discharge_reason"
+              id="last_consultation__new_discharge_reason"
               placeholder="Select discharge reason"
               options={DISCHARGE_REASONS}
-              value={filterState.last_consultation_discharge_reason}
+              value={filterState.last_consultation__new_discharge_reason}
               optionValue={(o) => o.id}
               optionLabel={(o) => o.text}
               onChange={(o) =>
                 setFilterState({
                   ...filterState,
-                  last_consultation_discharge_reason: o,
+                  last_consultation__new_discharge_reason: o,
                 })
               }
             />
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index dc400ddc79b..22cc35a170e 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -1,7 +1,11 @@
 import { navigate } from "raviger";
 import { lazy, useCallback, useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
-import { GENDER_TYPES, SAMPLE_TEST_STATUS } from "../../Common/constants";
+import {
+  DISCHARGE_REASONS,
+  GENDER_TYPES,
+  SAMPLE_TEST_STATUS,
+} from "../../Common/constants";
 import { statusType, useAbortableEffect } from "../../Common/utils";
 import {
   getConsultationList,
@@ -19,7 +23,12 @@ import { ConsultationModel } from "../Facility/models";
 import { PatientModel, SampleTestModel } from "./models";
 import { SampleTestCard } from "./SampleTestCard";
 import Chip from "../../CAREUI/display/Chip";
-import { classNames, formatAge, formatDateTime } from "../../Utils/utils";
+import {
+  classNames,
+  formatAge,
+  formatDate,
+  formatDateTime,
+} from "../../Utils/utils";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import RelativeDateUserMention from "../Common/RelativeDateUserMention";
@@ -311,20 +320,18 @@ export const PatientHome = (props: any) => {
     patientData.medical_history.length
   ) {
     const medHis = patientData.medical_history;
-    patientMedHis = medHis.map((item: any, idx: number) => (
-      <div className="sm:col-span-1" key={`med_his_${idx}`}>
-        {item?.disease !== "NO" && (
-          <>
-            <div className="overflow-x-scroll text-sm font-semibold leading-5 text-zinc-400">
-              {item.disease}
-            </div>
-            <div className="mt-1 overflow-x-scroll whitespace-normal break-words text-sm font-medium leading-5">
-              {item.details}
-            </div>
-          </>
-        )}
-      </div>
-    ));
+    patientMedHis = medHis
+      .filter((item) => item.disease !== "NO")
+      .map((item, idx) => (
+        <div className="sm:col-span-1" key={`med_his_${idx}`}>
+          <div className="break-words text-sm font-semibold leading-5 text-zinc-400">
+            {item.disease}
+          </div>
+          <div className="mt-1 whitespace-normal break-words text-sm font-medium leading-5">
+            {item.details}
+          </div>
+        </div>
+      ));
   }
 
   let consultationList, sampleList;
@@ -572,7 +579,7 @@ export const PatientHome = (props: any) => {
                     Date of Birth
                   </div>
                   <div className="mt-1 text-sm font-medium leading-5">
-                    {patientData?.date_of_birth}
+                    {formatDate(patientData?.date_of_birth)}
                   </div>
                 </div>
                 <div className="sm:col-span-1">
@@ -758,7 +765,8 @@ export const PatientHome = (props: any) => {
                 </div>
               </div>
               <div className="py-2">
-                {patientData.last_consultation?.discharge_reason === "EXP" && (
+                {patientData.last_consultation?.new_discharge_reason ===
+                  DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id && (
                   <div>
                     <ButtonV2
                       className="mt-6 w-full"
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index c5087f13dda..a23117a3803 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -320,7 +320,7 @@ export default function PatientInfoCard(props: {
                 );
               })}
             </div>
-            {!!consultation?.discharge_date && (
+            {consultation?.discharge_date ? (
               <div className="mt-3 flex gap-4 bg-cyan-300 px-3 py-1 text-sm font-medium">
                 <div>
                   <span>
@@ -331,7 +331,8 @@ export default function PatientInfoCard(props: {
                       )?.text
                     }{" "}
                     on {formatDateTime(consultation.encounter_date)},
-                    {consultation?.discharge_reason === "EXP" ? (
+                    {consultation?.new_discharge_reason ===
+                    DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id ? (
                       <span>
                         {" "}
                         Expired on {formatDate(consultation?.death_datetime)}
@@ -346,6 +347,23 @@ export default function PatientInfoCard(props: {
                   </span>
                 </div>
               </div>
+            ) : (
+              <div className="mt-3 flex gap-4 bg-cyan-300 px-3 py-1 text-sm font-medium">
+                <span className="flex">
+                  {consultation?.encounter_date && (
+                    <div>
+                      Admission on{" "}
+                      {formatDateTime(consultation?.encounter_date)}
+                    </div>
+                  )}
+                  {consultation?.icu_admission_date && (
+                    <div>
+                      , ICU Admission on{" "}
+                      {formatDateTime(consultation?.icu_admission_date)}
+                    </div>
+                  )}
+                </span>
+              </div>
             )}
           </div>
         </div>
@@ -362,17 +380,18 @@ export default function PatientInfoCard(props: {
                 Discharge Reason
               </div>
               <div className="mt-1 text-xl font-semibold leading-5 text-gray-900">
-                {!consultation?.discharge_reason ? (
+                {!consultation?.new_discharge_reason ? (
                   <span className="text-gray-800">
                     {consultation.suggestion === "OP"
                       ? "OP file closed"
                       : "UNKNOWN"}
                   </span>
-                ) : consultation?.discharge_reason === "EXP" ? (
+                ) : consultation?.new_discharge_reason ===
+                  DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id ? (
                   <span className="text-red-600">EXPIRED</span>
                 ) : (
                   DISCHARGE_REASONS.find(
-                    (reason) => reason.id === consultation?.discharge_reason
+                    (reason) => reason.id === consultation?.new_discharge_reason
                   )?.text
                 )}
               </div>
@@ -490,6 +509,7 @@ export default function PatientInfoCard(props: {
                           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={
+                            action[1] !== "Treatment Summary" &&
                             consultation?.admitted &&
                             !consultation?.current_bed &&
                             i === 1
@@ -498,6 +518,7 @@ export default function PatientInfoCard(props: {
                           }
                           onClick={() => {
                             if (
+                              action[1] !== "Treatment Summary" &&
                               consultation?.admitted &&
                               !consultation?.current_bed &&
                               i === 1
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 77088ef57e7..ce63d5019de 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -70,6 +70,7 @@ import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
 import { validatePincode } from "../../Common/validation";
 import { FormContextValue } from "../Form/FormContext.js";
+import useAuthUser from "../../Common/hooks/useAuthUser.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
@@ -180,6 +181,7 @@ const patientFormReducer = (state = initialState, action: any) => {
 };
 
 export const PatientRegister = (props: PatientRegisterProps) => {
+  const authUser = useAuthUser();
   const { goBack } = useAppHistory();
   const { gov_data_api_key, enable_hcx, enable_abdm } = useConfig();
   const dispatchAction: any = useDispatch();
@@ -544,6 +546,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
         setFacilityName("");
       }
     }
+
     fetchFacilityName();
   }, [dispatchAction, facilityId]);
 
@@ -953,6 +956,14 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     } else {
       values.splice(values.indexOf(id), 1);
     }
+
+    if (id !== 1 && values.includes(1)) {
+      values.splice(values.indexOf(1), 1);
+    } else if (id === 1) {
+      values.length = 0;
+      values.push(1);
+    }
+
     field("medical_history").onChange({
       name: "medical_history",
       value: values,
@@ -1164,6 +1175,10 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                       <div className="mb-2 overflow-visible rounded border border-gray-200 p-4">
                         <ButtonV2
                           className="flex items-center gap-2"
+                          disabled={
+                            authUser.user_type === "Nurse" ||
+                            authUser.user_type === "Staff"
+                          }
                           onClick={(_) => {
                             setShowImport({
                               show: true,
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index e1ce5d53050..fc87bedcb14 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -282,9 +282,9 @@ export interface DailyRoundsModel {
   rhythm?: string;
   rhythm_detail?: string;
   bp?: {
-    diastolic: number;
-    mean: number;
-    systolic: number;
+    diastolic?: number;
+    mean?: number;
+    systolic?: number;
   };
   pulse?: number;
   resp?: number;
@@ -297,7 +297,7 @@ export interface DailyRoundsModel {
   medication_given?: Array<any>;
   additional_symptoms_text?: string;
   current_health?: string;
-  id: string;
+  id?: string;
   other_symptoms?: string;
   admitted_to?: string;
   patient_category?: PatientCategory;
@@ -314,7 +314,7 @@ export interface DailyRoundsModel {
     | "AGITATED_OR_CONFUSED"
     | "ONSET_OF_AGITATION_AND_CONFUSION"
     | "UNKNOWN";
-  rounds_type: (typeof DailyRoundTypes)[number];
+  rounds_type?: (typeof DailyRoundTypes)[number];
   last_updated_by_telemedicine?: boolean;
   created_by_telemedicine?: boolean;
   created_by?: {
diff --git a/src/Components/Shifting/ShiftDetailsUpdate.tsx b/src/Components/Shifting/ShiftDetailsUpdate.tsx
index 36d2d120585..a726150c9e1 100644
--- a/src/Components/Shifting/ShiftDetailsUpdate.tsx
+++ b/src/Components/Shifting/ShiftDetailsUpdate.tsx
@@ -2,6 +2,7 @@ import * as Notification from "../../Utils/Notifications.js";
 
 import {
   BREATHLESSNESS_LEVEL,
+  DISCHARGE_REASONS,
   FACILITY_TYPES,
   PATIENT_CATEGORIES,
   SHIFTING_CHOICES_PEACETIME,
@@ -282,7 +283,9 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => {
         show={showDischargeModal}
         onClose={() => setShowDischargeModal(false)}
         consultationData={consultationData}
-        discharge_reason="EXP"
+        new_discharge_reason={
+          DISCHARGE_REASONS.find((i) => i.text == "Expired")?.id
+        }
         afterSubmit={() => {
           handleSubmit(true);
         }}
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 750603ccf6f..300f9846a89 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -218,7 +218,10 @@ export default function ManageUsers() {
                     )}
                   </div>
                 </div>
-                <div id="name" className="mt-2 text-2xl font-bold capitalize">
+                <div
+                  id="name"
+                  className="mt-2 flex gap-3 text-2xl font-bold capitalize"
+                >
                   {`${user.first_name} ${user.last_name}`}
 
                   {user.last_login && cur_online ? (
@@ -228,15 +231,12 @@ export default function ManageUsers() {
                     ></i>
                   ) : null}
                   {showUserDelete(authUser, user) && (
-                    <ButtonV2
-                      variant="danger"
-                      ghost
-                      border
-                      className="float-right"
+                    <div
+                      className="w-8 cursor-pointer rounded-lg bg-red-50 text-xl text-red-600 hover:bg-red-50 hover:text-red-700"
                       onClick={() => handleDelete(user)}
                     >
-                      Delete
-                    </ButtonV2>
+                      <CareIcon icon="l-trash" className="ml-[5px]" />
+                    </div>
                   )}
                 </div>
 
diff --git a/src/Components/Users/SkillsSlideOver.tsx b/src/Components/Users/SkillsSlideOver.tsx
index 1819333451d..63353479f0d 100644
--- a/src/Components/Users/SkillsSlideOver.tsx
+++ b/src/Components/Users/SkillsSlideOver.tsx
@@ -115,12 +115,10 @@ export default ({ show, setShow, username }: IProps) => {
                   multiple={false}
                   name="skill"
                   disabled={!authorizeForAddSkill}
-                  showAll={true}
                   showNOptions={Infinity}
                   selected={selectedSkill}
                   setSelected={setSelectedSkill}
                   errors=""
-                  username={username}
                   userSkills={skills?.results || []}
                 />
                 <ButtonV2
diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index 26ba9e44b4b..2c5319e67f3 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -99,6 +99,13 @@ const initForm: UserForm = {
   doctor_medical_council_registration: undefined,
 };
 
+const STAFF_OR_NURSE_USER = [
+  "Staff",
+  "StaffReadOnly",
+  "Nurse",
+  "NurseReadOnly",
+];
+
 const initError = Object.assign(
   {},
   ...Object.keys(initForm).map((k) => ({ [k]: "" }))
@@ -234,15 +241,19 @@ export const UserAdd = (props: UserProps) => {
     : // Exception to allow Staff to Create Doctors
       defaultAllowedUserTypes;
 
+  // TODO: refactor lines 227 through 248 to be more readable. This is messy.
+  if (authUser.user_type === "Nurse" || authUser.user_type === "Staff") {
+    userTypes.push(USER_TYPE_OPTIONS[6]); // Temperorily allows creation of users with elevated permissions due to introduction of new roles.
+  }
+
   const headerText = !userId ? "Add User" : "Update User";
   const buttonText = !userId ? "Save User" : "Update Details";
-  const showLocalbody = !(
-    state.form.user_type === "Pharmacist" ||
-    state.form.user_type === "Volunteer" ||
-    state.form.user_type === "Doctor" ||
-    state.form.user_type === "Staff" ||
-    state.form.user_type === "StaffReadOnly"
-  );
+  const showLocalbody = ![
+    "Pharmacist",
+    "Volunteer",
+    "Doctor",
+    ...STAFF_OR_NURSE_USER,
+  ].includes(state.form.user_type);
 
   const { loading: isDistrictLoading } = useQuery(routes.getDistrictByState, {
     prefetch: !!(selectedStateId > 0),
@@ -332,10 +343,8 @@ export const UserAdd = (props: UserProps) => {
         case "facilities":
           if (
             state.form[field].length === 0 &&
-            (authUser.user_type === "Staff" ||
-              authUser.user_type === "StaffReadOnly") &&
-            (state.form["user_type"] === "Staff" ||
-              state.form["user_type"] === "StaffReadOnly")
+            STAFF_OR_NURSE_USER.includes(authUser.user_type) &&
+            STAFF_OR_NURSE_USER.includes(state.form.user_type)
           ) {
             errors[field] =
               "Please select atleast one of the facilities you are linked to";
diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
index 2dc75d33613..170de558e41 100644
--- a/src/Components/Users/UserProfile.tsx
+++ b/src/Components/Users/UserProfile.tsx
@@ -5,7 +5,7 @@ import * as Notification from "../../Utils/Notifications.js";
 import LanguageSelector from "../../Components/Common/LanguageSelector";
 import TextFormField from "../Form/FormFields/TextFormField";
 import ButtonV2, { Submit } from "../Common/components/ButtonV2";
-import { classNames, parsePhoneNumber } from "../../Utils/utils";
+import { classNames, isValidUrl, parsePhoneNumber } from "../../Utils/utils";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
@@ -27,13 +27,14 @@ type EditForm = {
   age: string;
   gender: GenderType;
   email: string;
+  video_connect_link: string | undefined;
   phoneNumber: string;
   altPhoneNumber: string;
   user_type: string | undefined;
   doctor_qualification: string | undefined;
   doctor_experience_commenced_on: number | string | undefined;
   doctor_medical_council_registration: string | undefined;
-  weekly_working_hours: string | undefined;
+  weekly_working_hours: string | null;
 };
 type ErrorForm = {
   firstName: string;
@@ -41,6 +42,7 @@ type ErrorForm = {
   age: string;
   gender: string;
   email: string;
+  video_connect_link: string | undefined;
   phoneNumber: string;
   altPhoneNumber: string;
   user_type: string | undefined;
@@ -62,6 +64,7 @@ const initForm: EditForm = {
   lastName: "",
   age: "",
   gender: "Male",
+  video_connect_link: "",
   email: "",
   phoneNumber: "",
   altPhoneNumber: "",
@@ -145,6 +148,7 @@ export default function UserProfile() {
         age: result.data.age?.toString() || "",
         gender: result.data.gender || "Male",
         email: result.data.email,
+        video_connect_link: result.data.video_connect_link,
         phoneNumber: result.data.phone_number?.toString() || "",
         altPhoneNumber: result.data.alt_phone_number?.toString() || "",
         user_type: result.data.user_type,
@@ -249,19 +253,25 @@ export default function UserProfile() {
           }
           return;
         case "weekly_working_hours":
-          if (!states.form[field]) {
-            errors[field] = "This field is required";
-            invalidForm = true;
-          } else if (
-            Number(states.form[field]) < 0 ||
-            Number(states.form[field]) > 168 ||
-            !/^\d+$/.test(states.form[field] ?? "")
+          if (
+            states.form[field] &&
+            (Number(states.form[field]) < 0 ||
+              Number(states.form[field]) > 168 ||
+              !/^\d+$/.test(states.form[field] ?? ""))
           ) {
             errors[field] =
               "Average weekly working hours must be a number between 0 and 168";
             invalidForm = true;
           }
           return;
+        case "video_connect_link":
+          if (states.form[field]) {
+            if (isValidUrl(states.form[field]) === false) {
+              errors[field] = "Please enter a valid url";
+              invalidForm = true;
+            }
+          }
+          return;
       }
     });
     dispatch({ type: "set_error", errors });
@@ -294,6 +304,7 @@ export default function UserProfile() {
         first_name: states.form.firstName,
         last_name: states.form.lastName,
         email: states.form.email,
+        video_connect_link: states.form.video_connect_link,
         phone_number: parsePhoneNumber(states.form.phoneNumber) ?? "",
         alt_phone_number: parsePhoneNumber(states.form.altPhoneNumber) ?? "",
         gender: states.form.gender,
@@ -318,7 +329,11 @@ export default function UserProfile() {
           states.form.user_type === "Doctor"
             ? states.form.doctor_medical_council_registration
             : undefined,
-        weekly_working_hours: states.form.weekly_working_hours,
+        weekly_working_hours:
+          states.form.weekly_working_hours &&
+          states.form.weekly_working_hours !== ""
+            ? states.form.weekly_working_hours
+            : null,
       };
       const { res } = await request(routes.partialUpdateUser, {
         pathParams: { username: authUser.username },
@@ -575,7 +590,29 @@ export default function UserProfile() {
                       Average weekly working hours
                     </dt>
                     <dd className="mt-1 text-sm leading-5 text-gray-900">
-                      {userData?.weekly_working_hours || "-"}
+                      {userData?.weekly_working_hours ?? "-"}
+                    </dd>
+                  </div>
+                  <div
+                    className="my-2 sm:col-span-2"
+                    id="videoconnectlink-profile-details"
+                  >
+                    <dt className="text-sm font-medium leading-5 text-black">
+                      Video Connect Link
+                    </dt>
+                    <dd className="mt-1 break-words text-sm leading-5 text-gray-900">
+                      {userData?.video_connect_link ? (
+                        <a
+                          className="text-blue-500"
+                          href={userData?.video_connect_link}
+                          target="_blank"
+                          rel="noreferrer"
+                        >
+                          {userData?.video_connect_link}
+                        </a>
+                      ) : (
+                        "-"
+                      )}
                     </dd>
                   </div>
                 </dl>
@@ -672,13 +709,18 @@ export default function UserProfile() {
                         )}
                         <TextFormField
                           {...fieldProps("weekly_working_hours")}
-                          required
                           label="Average weekly working hours"
                           className="col-span-6 sm:col-span-3"
                           type="number"
                           min={0}
                           max={168}
                         />
+                        <TextFormField
+                          {...fieldProps("video_connect_link")}
+                          label="Video Conference Link"
+                          className="col-span-6 sm:col-span-6"
+                          type="url"
+                        />
                       </div>
                     </div>
                     <div className="bg-gray-50 px-4 py-3 text-right sm:px-6">
diff --git a/src/Components/Users/models.tsx b/src/Components/Users/models.tsx
index 6fa0bfb3e42..c31901b74ad 100644
--- a/src/Components/Users/models.tsx
+++ b/src/Components/Users/models.tsx
@@ -28,6 +28,7 @@ export type UserModel = UserBareMinimum & {
   local_body?: number;
   district?: number;
   state?: number;
+  video_connect_link: string;
   phone_number?: string;
   alt_phone_number?: string;
   gender?: GenderType;
@@ -42,7 +43,7 @@ export type UserModel = UserBareMinimum & {
   doctor_qualification?: string;
   doctor_experience_commenced_on?: string;
   doctor_medical_council_registration?: string;
-  weekly_working_hours?: string;
+  weekly_working_hours?: string | null;
 };
 
 export interface SkillObjectModel {
@@ -62,6 +63,7 @@ export interface UserAssignedModel extends UserBareMinimum {
   state?: number;
   phone_number?: string;
   alt_phone_number?: string;
+  video_connect_link: string;
   gender?: number;
   age?: number;
   is_superuser?: boolean;
diff --git a/src/Components/VitalsMonitor/utils.ts b/src/Components/VitalsMonitor/utils.ts
index 2e38f83b65b..21ba769dc83 100644
--- a/src/Components/VitalsMonitor/utils.ts
+++ b/src/Components/VitalsMonitor/utils.ts
@@ -1,3 +1,4 @@
+import { AssetClass, AssetData } from "../Assets/AssetTypes";
 import { ChannelOptions, VitalsWaveformBase } from "./types";
 
 /**
@@ -73,3 +74,19 @@ export const getVitalsCanvasSizeAndDuration = (
     duration: DEFAULT_DURATION * (ratio / DEFAULT_RATIO),
   };
 };
+
+export const getVitalsMonitorSocketUrl = (asset: AssetData) => {
+  if (
+    asset.asset_class !== AssetClass.HL7MONITOR &&
+    asset.asset_class !== AssetClass.VENTILATOR
+  ) {
+    throw "getVitalsMonitorSocketUrl can be invoked only for HL7MONITOR or VENTILATOR assets";
+  }
+
+  const middleware = asset.resolved_middleware?.hostname;
+  const ipAddress = asset.meta?.local_ip_address;
+
+  if (middleware && ipAddress) {
+    return `wss://${middleware}/observations/${ipAddress}`;
+  }
+};
diff --git a/src/Locale/en/Bed.json b/src/Locale/en/Bed.json
index 7b839c2a384..b410293959b 100644
--- a/src/Locale/en/Bed.json
+++ b/src/Locale/en/Bed.json
@@ -3,5 +3,11 @@
   "BED_WITH_OXYGEN_SUPPORT": "Bed with Oxygen Support",
   "REGULAR": "Regular",
   "ICU": "ICU",
-  "ISOLATION": "Isolation"
-}
+  "ISOLATION": "Isolation",
+  "add_beds": "Add Bed(s)",
+  "update_bed": "Update Bed",
+  "bed_type": "Bed Type",
+  "make_multiple_beds_label": "Do you want to make multiple beds?",
+  "number_of_beds": "Number of beds",
+  "number_of_beds_out_of_range_error": "Number of beds cannot be greater than 100"
+}
\ No newline at end of file
diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json
index 31528afa390..99adb77451c 100644
--- a/src/Locale/en/Common.json
+++ b/src/Locale/en/Common.json
@@ -84,6 +84,7 @@
   "age": "Age",
   "is": "Is",
   "reason": "Reason",
+  "description": "Description",
   "name": "Name",
   "address": "Address",
   "phone": "Phone",
@@ -160,4 +161,4 @@
   "select_date": "Select date",
   "DD/MM/YYYY": "DD/MM/YYYY",
   "clear_all_filters": "Clear All Filters"
-}
+}
\ No newline at end of file
diff --git a/src/Locale/en/Facility.json b/src/Locale/en/Facility.json
index 5e69f8108af..aefc9c3b4a8 100644
--- a/src/Locale/en/Facility.json
+++ b/src/Locale/en/Facility.json
@@ -33,7 +33,6 @@
   "asset_location": "Asset Location",
   "asset_type": "Asset Type",
   "asset_class": "Asset Class",
-  "description": "Description",
   "details_about_the_equipment": "Details about the equipment",
   "working_status": "Working Status",
   "why_the_asset_is_not_working": "Why the asset is not working?",
@@ -53,4 +52,4 @@
   "notes": "Notes",
   "create_asset": "Create Asset",
   "create_add_more": "Create & Add More"
-}
+}
\ No newline at end of file
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index ddb392036c6..5caec195cd5 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -20,18 +20,6 @@ export const getPermittedFacilities = (params: object) => {
   return fireRequest("getPermittedFacilities", [], params);
 };
 
-export const getAllFacilities = (params: object) => {
-  return fireRequest("getAllFacilities", [], params);
-};
-
-export const getAllSkills = (params: object) => {
-  return fireRequest("getAllSkills", [], params);
-};
-
-export const getPermittedFacility = (id: number | string, key?: string) => {
-  return fireRequest("getPermittedFacility", [], {}, { id: id }, key);
-};
-
 export const getAnyFacility = (id: number | string, key?: string) => {
   return fireRequest("getAnyFacility", [], {}, { id: id }, key);
 };
@@ -109,11 +97,6 @@ export const deleteAssetBed = (asset_id: string) =>
     }
   );
 
-export const listPatientAssetBeds = (
-  facility_external_id: string,
-  params: object
-) => fireRequest("listPatientAssetBeds", [], params, { facility_external_id });
-
 // Facility Beds
 export const listFacilityBeds = (params: object) =>
   fireRequest("listFacilityBeds", [], params, {});
@@ -227,15 +210,6 @@ export const downloadFacilityTriage = () => {
 };
 
 // Capacity/Triage/Doctor
-export const createCapacity = (
-  id: number | undefined,
-  params: object,
-  pathParam: object
-) => {
-  return id
-    ? fireRequest("updateCapacity", [id], params, pathParam)
-    : fireRequest("createCapacity", [], params, pathParam);
-};
 export const createDoctor = (
   id: number | undefined,
   params: object,
@@ -257,26 +231,12 @@ export const getTriageInfo = (pathParam: object) => {
 export const getTriageDetails = (pathParam: object) => {
   return fireRequest("getTriageDetails", [], {}, pathParam);
 };
-export const listCapacity = (params: object, pathParam: object) => {
-  return fireRequest("getCapacity", [], params, pathParam);
-};
 export const listDoctor = (params: object, pathParam: object) => {
   return fireRequest("listDoctor", [], params, pathParam);
 };
-export const getCapacity = (id: number, pathParam: object) => {
-  return fireRequest("getCapacity", [id], {}, pathParam);
-};
-
-export const getCapacityBed = (pathParam: object) => {
-  return fireRequest("getCapacityBed", [], {}, pathParam);
-};
-
 export const getDoctor = (pathParam: object) => {
   return fireRequest("getDoctor", [], {}, pathParam);
 };
-export const deleteCapacity = (pathParam: object) => {
-  return fireRequest("deleteCapacityBed", [], {}, pathParam);
-};
 
 //Patient
 export const searchPatient = (params: object) => {
@@ -379,10 +339,10 @@ export const createConsultation = (params: object) => {
 export const getConsultationList = (params: object) => {
   return fireRequest("getConsultationList", [], params);
 };
-export const getConsultation = (id: number) => {
+export const getConsultation = (id: string) => {
   return fireRequest("getConsultation", [], {}, { id: id });
 };
-export const updateConsultation = (id: number, params: object) => {
+export const updateConsultation = (id: string, params: object) => {
   return fireRequest("updateConsultation", [], params, { id: id });
 };
 //Inventory
@@ -589,9 +549,6 @@ export const updateAsset = (id: string, params: object) =>
 export const operateAsset = (id: string, params: object) =>
   fireRequest("operateAsset", [], params, { external_id: id });
 
-export const listAssetAvailability = (params: object) =>
-  fireRequest("listAssetAvailability", [], params);
-
 export const listPMJYPackages = (query?: string) =>
   fireRequest("listPMJYPackages", [], { query });
 
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index a417861a664..4b8488cb11b 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -27,6 +27,8 @@ import {
   AssetServiceUpdate,
   AssetTransaction,
   AssetUpdate,
+  AssetUptimeRecord,
+  PatientAssetBed,
 } from "../Components/Assets/AssetTypes";
 import {
   CapacityModal,
@@ -51,6 +53,7 @@ import {
   BedModel,
 } from "../Components/Facility/models";
 import {
+  IDeleteBedCapacity,
   IDeleteExternalResult,
   IExternalResult,
   IExternalResultCsv,
@@ -75,6 +78,10 @@ import {
 import { IComment, IResource } from "../Components/Resource/models";
 import { IShift } from "../Components/Shifting/models";
 import { HCXPolicyModel } from "../Components/HCX/models";
+import {
+  InvestigationGroup,
+  InvestigationType,
+} from "../Components/Facility/Investigations";
 
 /**
  * A fake function that returns an empty object casted to type T
@@ -284,6 +291,7 @@ const routes = {
 
   getAllFacilities: {
     path: "/api/v1/getallfacilities",
+    TRes: Type<PaginatedResponse<FacilityModel>>(),
   },
 
   createFacility: {
@@ -394,6 +402,7 @@ const routes = {
   listPatientAssetBeds: {
     path: "/api/v1/facility/{facility_external_id}/patient_asset_beds/",
     method: "GET",
+    TRes: Type<PaginatedResponse<PatientAssetBed>>(),
   },
 
   // Facility Beds
@@ -405,14 +414,19 @@ const routes = {
   createFacilityBed: {
     path: "/api/v1/bed/",
     method: "POST",
+    TBody: Type<BedModel>(),
+    TRes: Type<BedModel>(),
   },
   getFacilityBed: {
     path: "/api/v1/bed/{external_id}/",
     method: "GET",
+    TRes: Type<BedModel>(),
   },
   updateFacilityBed: {
     path: "/api/v1/bed/{external_id}/",
     method: "PUT",
+    TBody: Type<BedModel>(),
+    TRes: Type<BedModel>(),
   },
   deleteFacilityBed: {
     path: "/api/v1/bed/{external_id}/",
@@ -533,6 +547,7 @@ const routes = {
   createCapacity: {
     path: "/api/v1/facility/{facilityId}/capacity/",
     method: "POST",
+    TRes: Type<CapacityModal>(),
   },
 
   createDoctor: {
@@ -547,11 +562,13 @@ const routes = {
 
   getCapacityBed: {
     path: "/api/v1/facility/{facilityId}/capacity/{bed_id}/",
+    TRes: Type<CapacityModal>(),
   },
 
   deleteCapacityBed: {
     path: "/api/v1/facility/{facilityId}/capacity/{bed_id}/",
     method: "DELETE",
+    TRes: Type<IDeleteBedCapacity>(),
   },
 
   listDoctor: {
@@ -563,8 +580,9 @@ const routes = {
   },
 
   updateCapacity: {
-    path: "/api/v1/facility/{facilityId}/capacity",
+    path: "/api/v1/facility/{facilityId}/capacity/{bed_id}/",
     method: "PUT",
+    TRes: Type<CapacityModal>(),
   },
 
   updateDoctor: {
@@ -930,10 +948,12 @@ const routes = {
   listInvestigations: {
     path: "/api/v1/investigation/",
     method: "GET",
+    TRes: Type<PaginatedResponse<InvestigationType>>(),
   },
   listInvestigationGroups: {
-    path: "/api/v1/investigation/group",
+    path: "/api/v1/investigation/group/",
     method: "GET",
+    TRes: Type<PaginatedResponse<InvestigationGroup>>(),
   },
   createInvestigation: {
     path: "/api/v1/consultation/{consultation_external_id}/investigation/",
@@ -1229,10 +1249,12 @@ const routes = {
   listAssetAvailability: {
     path: "/api/v1/asset_availability/",
     method: "GET",
+    TRes: Type<PaginatedResponse<AssetUptimeRecord>>(),
   },
   getAssetAvailability: {
     path: "/api/v1/asset_availability/{id}",
     method: "GET",
+    TRes: Type<AssetUptimeRecord>(),
   },
 
   // Prescription endpoints
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 5e238627bc8..56d8b31573b 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -25,13 +25,13 @@ import AssetRoutes from "./routes/AssetRoutes";
 import ResourceRoutes from "./routes/ResourceRoutes";
 import ExternalResultRoutes from "./routes/ExternalResultRoutes";
 import { DetailRoute } from "./types";
+import useAuthUser from "../Common/hooks/useAuthUser";
 
 const Routes = {
   "/": () => <Redirect to="/facility" />,
 
   ...AssetRoutes,
   ...ConsultationRoutes,
-  ...ExternalResultRoutes,
   ...FacilityRoutes,
   ...PatientRoutes,
   ...ResourceRoutes,
@@ -49,6 +49,7 @@ const Routes = {
 };
 
 export default function AppRouter() {
+  const authUser = useAuthUser();
   const { main_logo, enable_hcx } = useConfig();
 
   let routes = Routes;
@@ -57,6 +58,14 @@ export default function AppRouter() {
     routes = { ...routes, ...HCXRoutes };
   }
 
+  if (
+    !["Nurse", "NurseReadOnly", "Staff", "StaffReadOnly"].includes(
+      authUser.user_type
+    )
+  ) {
+    routes = { ...routes, ...ExternalResultRoutes };
+  }
+
   useRedirect("/user", "/users");
   const pages = useRoutes(routes) || <Error404 />;
   const path = usePath();
diff --git a/src/Utils/request/types.ts b/src/Utils/request/types.ts
index e22d37f3090..aed066ac81c 100644
--- a/src/Utils/request/types.ts
+++ b/src/Utils/request/types.ts
@@ -30,7 +30,7 @@ export interface RequestResult<TData> {
 export interface RequestOptions<TData = unknown, TBody = unknown> {
   query?: QueryParams;
   body?: TBody;
-  pathParams?: Record<string, string>;
+  pathParams?: Record<string, string | number>;
   onResponse?: (res: RequestResult<TData>) => void;
   silent?: boolean;
   reattempts?: number;
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index df6bd46d131..c518bcffe7d 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -462,3 +462,12 @@ export const compareBy = <T extends object>(key: keyof T) => {
     return a[key] < b[key] ? -1 : a[key] > b[key] ? 1 : 0;
   };
 };
+
+export const isValidUrl = (url?: string) => {
+  try {
+    new URL(url ?? "");
+    return true;
+  } catch {
+    return false;
+  }
+};