diff --git a/cypress/e2e/assets_spec/assets_manage.cy.ts b/cypress/e2e/assets_spec/assets_manage.cy.ts
index f27fd302a0c..34c554b374e 100644
--- a/cypress/e2e/assets_spec/assets_manage.cy.ts
+++ b/cypress/e2e/assets_spec/assets_manage.cy.ts
@@ -1,10 +1,20 @@
 import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import { AssetPage } from "../../pageobject/Asset/AssetCreation";
 import LoginPage from "../../pageobject/Login/LoginPage";
+import { AssetSearchPage } from "../../pageobject/Asset/AssetSearch";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
+import { AssetFilters } from "../../pageobject/Asset/AssetFilters";
 
 describe("Asset", () => {
   const assetPage = new AssetPage();
   const loginPage = new LoginPage();
+  const facilityPage = new FacilityPage();
+  const assetSearchPage = new AssetSearchPage();
+  const assetFilters = new AssetFilters();
+  const fillFacilityName = "Dummy Facility 1";
+  const assetname = "Dummy Camera";
+  const locationName = "Dummy Location 1";
+  const initiallocationName = "Camera Location";
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -16,6 +26,57 @@ describe("Asset", () => {
     cy.awaitUrl("/assets");
   });
 
+  it("Create & Edit a service history and verify reflection", () => {
+    assetSearchPage.typeSearchKeyword(assetname);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetname);
+    assetSearchPage.clickAssetByName(assetname);
+    assetPage.clickupdatedetailbutton();
+    assetPage.scrollintonotes();
+    assetPage.enterAssetNotes("Dummy Notes");
+    assetPage.enterAssetservicedate("01092023");
+    assetPage.clickassetupdatebutton();
+    assetPage.scrollintoservicehistory();
+    assetPage.clickedithistorybutton();
+    assetPage.scrollintonotes();
+    assetPage.enterAssetNotes("Dummy Notes Editted");
+    assetPage.clickassetupdatebutton();
+    assetPage.scrollintoservicehistory();
+    assetPage.viewassetservicehistorybutton();
+    assetPage.openassetservicehistory();
+    assetPage.verifyassetupdateservicehistory();
+    assetPage.viewassetservicehistorybutton();
+  });
+
+  it("Create a asset transaction and verify history", () => {
+    assetSearchPage.typeSearchKeyword(assetname);
+    assetSearchPage.pressEnter();
+    assetSearchPage.verifyBadgeContent(assetname);
+    assetSearchPage.clickAssetByName(assetname);
+    assetPage.clickupdatedetailbutton();
+    assetPage.clickassetlocation(locationName);
+    assetPage.clickUpdateAsset();
+    assetPage.verifyassetlocation(locationName);
+    assetPage.verifytransactionStatus(initiallocationName, locationName);
+  });
+
+  it("Verify Facility Asset Page Redirection", () => {
+    cy.visit("/facility");
+    assetSearchPage.typeSearchKeyword(fillFacilityName);
+    assetSearchPage.pressEnter();
+    facilityPage.verifyFacilityBadgeContent(fillFacilityName);
+    facilityPage.visitAlreadyCreatedFacility();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickCreateAssetFacilityOption();
+    facilityPage.verifyfacilitycreateassetredirection();
+    facilityPage.verifyassetfacilitybackredirection();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickviewAssetFacilityOption();
+    facilityPage.verifyfacilityviewassetredirection();
+    assetFilters.assertFacilityText(fillFacilityName);
+    facilityPage.verifyassetfacilitybackredirection();
+  });
+
   it("Delete an Asset", () => {
     assetPage.openCreatedAsset();
     assetPage.interceptDeleteAssetApi();
@@ -23,6 +84,23 @@ describe("Asset", () => {
     assetPage.verifyDeleteStatus();
   });
 
+  it("Verify Facility Asset Page Redirection", () => {
+    cy.visit("/facility");
+    assetSearchPage.typeSearchKeyword(fillFacilityName);
+    assetSearchPage.pressEnter();
+    facilityPage.verifyFacilityBadgeContent(fillFacilityName);
+    facilityPage.visitAlreadyCreatedFacility();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickCreateAssetFacilityOption();
+    facilityPage.verifyfacilitycreateassetredirection();
+    facilityPage.verifyassetfacilitybackredirection();
+    facilityPage.clickManageFacilityDropdown();
+    facilityPage.clickviewAssetFacilityOption();
+    facilityPage.verifyfacilityviewassetredirection();
+    assetFilters.assertFacilityText(fillFacilityName);
+    facilityPage.verifyassetfacilitybackredirection();
+  });
+
   afterEach(() => {
     cy.saveLocalStorage();
   });
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index b55732fa440..fcfd97039f7 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -33,6 +33,7 @@ describe("Patient Creation with consultation", () => {
   it("Create a new patient with no consultation", () => {
     patientPage.createPatient();
     patientPage.selectFacility("dummy facility");
+    patientPage.patientformvisibility();
     patientPage.enterPatientDetails(
       phone_number,
       emergency_phone_number,
@@ -69,6 +70,7 @@ describe("Patient Creation with consultation", () => {
     patientPage.interceptFacilities();
     patientPage.visitUpdatePatientUrl();
     patientPage.verifyStatusCode();
+    patientPage.patientformvisibility();
     updatePatientPage.enterPatientDetails(
       "Test E2E User Edited",
       "O+",
@@ -113,6 +115,7 @@ describe("Patient Creation with consultation", () => {
     patientConsultationPage.selectSymptoms("ASYMPTOMATIC");
 
     patientConsultationPage.enterConsultationDetails(
+      "Stable",
       "Examination details and Clinical conditions",
       "70",
       "170",
diff --git a/cypress/pageobject/Asset/AssetCreation.ts b/cypress/pageobject/Asset/AssetCreation.ts
index b939c31405f..45356a1a4e7 100644
--- a/cypress/pageobject/Asset/AssetCreation.ts
+++ b/cypress/pageobject/Asset/AssetCreation.ts
@@ -276,4 +276,78 @@ export class AssetPage {
     cy.get("#submit").contains("Import").click();
     cy.wait("@importAsset").its("response.statusCode").should("eq", 201);
   }
+
+  clickupdatedetailbutton() {
+    cy.get("[data-testid=asset-update-button]").click();
+  }
+
+  scrollintonotes() {
+    cy.get("#notes").scrollIntoView();
+  }
+
+  enterAssetNotes(text) {
+    cy.get("#notes").click().clear();
+    cy.get("#notes").click().type(text);
+  }
+
+  enterAssetservicedate(text) {
+    cy.get("input[name='last_serviced_on']").click();
+    cy.get("#date-input").click().type(text);
+  }
+
+  clickassetupdatebutton() {
+    cy.get("#submit").click();
+  }
+
+  viewassetservicehistorybutton() {
+    cy.get("#view-service-history").should("be.visible");
+  }
+
+  openassetservicehistory() {
+    cy.get("#view-service-history").click();
+    cy.get("#view-asset-edit-history").first().click();
+  }
+
+  verifyassetupdateservicehistory() {
+    cy.get("#edit-history-asset-servicedon").should("have.text", "01/09/2023");
+    cy.get("#edit-history-asset-note").should(
+      "have.text",
+      "Dummy Notes Editted"
+    );
+    cy.get("#view-history-back-button").contains("Back").click();
+    cy.get("#view-history-back-button").contains("Close").click();
+  }
+
+  scrollintoservicehistory() {
+    cy.get("#service-history").scrollIntoView();
+  }
+
+  clickedithistorybutton() {
+    cy.get("#edit-service-history").click();
+  }
+
+  verifytransactionStatus(initiallocationName: string, locationName: string) {
+    cy.get("#transaction-history").scrollIntoView();
+    cy.get("#transaction-history table tbody tr:first-child td:eq(0)").should(
+      "contain",
+      initiallocationName
+    );
+    cy.get("#transaction-history table tbody tr:first-child td:eq(1)").should(
+      "contain",
+      locationName
+    );
+  }
+
+  verifyassetlocation(locationName: string) {
+    cy.get("#asset-current-location").should("contain", locationName);
+  }
+
+  clickassetlocation(locationName: string) {
+    cy.get("#clear-button").click();
+    cy.get("[data-testid=asset-location-input] button").click();
+    cy.get("[data-testid=asset-location-input] button")
+      .click()
+      .type(locationName);
+    cy.get("[role='option']").contains(locationName).click();
+  }
 }
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index ef4e65781e0..42ec6d8fd7c 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -120,6 +120,14 @@ class FacilityPage {
     cy.get("#configure-facility").contains("Configure Facility").click();
   }
 
+  clickCreateAssetFacilityOption() {
+    cy.get("#create-assets").contains("Create Asset").click();
+  }
+
+  clickviewAssetFacilityOption() {
+    cy.get("#view-assets").contains("View Assets").click();
+  }
+
   clickInventoryManagementOption() {
     cy.get("#inventory-management", { timeout: 10000 }).should("be.visible");
     cy.get("#inventory-management").click();
@@ -175,6 +183,29 @@ class FacilityPage {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
 
+  verifyFacilityBadgeContent(expectedText: string) {
+    cy.get("[data-testid='Facility/District Name']").should(
+      "contain",
+      expectedText
+    );
+  }
+
+  verifyfacilitycreateassetredirection() {
+    cy.url().should("include", "/assets/new");
+  }
+
+  verifyassetfacilitybackredirection() {
+    cy.intercept("GET", "**/api/v1/facility/**").as("getManagePage");
+    cy.go("back");
+    cy.wait("@getManagePage").its("response.statusCode").should("eq", 200);
+    cy.get("#manage-facility-dropdown").scrollIntoView();
+    cy.get("#manage-facility-dropdown").should("exist");
+  }
+
+  verifyfacilityviewassetredirection() {
+    cy.url().should("include", "/assets?facility=");
+  }
+
   clickManageInventory() {
     cy.contains("Manage Inventory").click();
   }
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index c0ba0c260d8..6937559d548 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -16,12 +16,14 @@ export class PatientConsultationPage {
   }
 
   fillIllnessHistory(history: string) {
+    cy.wait(5000);
     cy.get("#history_of_present_illness").scrollIntoView();
     cy.get("#history_of_present_illness").should("be.visible");
     cy.get("#history_of_present_illness").click().type(history);
   }
 
   enterConsultationDetails(
+    category: string,
     examinationDetails: string,
     weight: string,
     height: string,
@@ -30,6 +32,11 @@ export class PatientConsultationPage {
     verificationBy: string
   ) {
     cy.get("#symptoms").click();
+    cy.get("#category")
+      .click()
+      .then(() => {
+        cy.get("[role='option']").contains(category).click();
+      });
     cy.get("#examination_details").click().type(examinationDetails);
     cy.get("#weight").click().type(height);
     cy.get("#height").click().type(weight);
@@ -38,10 +45,12 @@ export class PatientConsultationPage {
     cy.get(
       "#icd11_diagnoses_object input[placeholder='Select'][role='combobox']"
     )
+      .scrollIntoView()
       .click()
       .type("1A");
     cy.get("#icd11_diagnoses_object [role='option']")
       .contains("1A03 Intestinal infections due to Escherichia coli")
+      .scrollIntoView()
       .click();
     cy.get("label[for='icd11_diagnoses_object']").click();
     cy.wait("@getIcdResults").its("response.statusCode").should("eq", 200);
diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
index 9b8df4a287e..4fcd43dc490 100644
--- a/cypress/pageobject/Patient/PatientCreation.ts
+++ b/cypress/pageobject/Patient/PatientCreation.ts
@@ -124,4 +124,8 @@ export class PatientPage {
   verifyStatusCode() {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
+
+  patientformvisibility() {
+    cy.get("[data-testid='current-address']").scrollIntoView();
+  }
 }
diff --git a/package-lock.json b/package-lock.json
index db11b8c5220..4871fbe374b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,6 @@
         "events": "^3.3.0",
         "i18next": "^23.2.7",
         "i18next-browser-languagedetector": "^7.1.0",
-        "libphonenumber-js": "^1.10.37",
         "lodash": "^4.17.21",
         "postcss-loader": "^7.3.3",
         "qrcode.react": "^3.1.0",
@@ -50,7 +49,6 @@
         "react-player": "^2.12.0",
         "react-qr-reader": "^2.2.1",
         "react-redux": "^8.1.1",
-        "react-swipeable-views": "^0.14.0",
         "react-transition-group": "^4.4.5",
         "react-webcam": "^7.1.1",
         "read-excel-file": "^5.6.1",
@@ -86,7 +84,6 @@
         "@types/react-dom": "^18.2.6",
         "@types/react-google-recaptcha": "^2.1.5",
         "@types/react-qr-reader": "^2.1.4",
-        "@types/react-swipeable-views": "^0.13.2",
         "@types/react-transition-group": "^4.4.6",
         "@typescript-eslint/eslint-plugin": "^5.61.0",
         "@typescript-eslint/parser": "^5.61.0",
@@ -5640,15 +5637,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/react-swipeable-views": {
-      "version": "0.13.2",
-      "resolved": "https://registry.npmjs.org/@types/react-swipeable-views/-/react-swipeable-views-0.13.2.tgz",
-      "integrity": "sha512-FiszBm9M0JicAgzO/IwDqpfHQRUEjPZA88UexYsVD6qHJBf5LrbGjR5Mw4+yZbf8ZxJneNqOsZbe4WGjOYG7iQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@types/react-transition-group": {
       "version": "4.4.6",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz",
@@ -11997,11 +11985,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/keycode": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
-      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg=="
-    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -12079,11 +12062,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/libphonenumber-js": {
-      "version": "1.10.37",
-      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.37.tgz",
-      "integrity": "sha512-Z10PCaOCiAxbUxLyR31DNeeNugSVP6iv/m7UrSKS5JHziEMApJtgku4e9Q69pzzSC9LnQiM09sqsGf2ticZnMw=="
-    },
     "node_modules/lilconfig": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -14279,6 +14257,7 @@
     "node_modules/npm/node_modules/brace-expansion": {
       "version": "2.0.1",
       "dev": true,
+      "inBundle": true,
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -15273,15 +15252,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/npm/node_modules/minimatch/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "dev": true,
-      "inBundle": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/npm/node_modules/minipass": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
@@ -18131,19 +18101,6 @@
       "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
       "dev": true
     },
-    "node_modules/react-event-listener": {
-      "version": "0.6.6",
-      "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
-      "integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
-      "dependencies": {
-        "@babel/runtime": "^7.2.0",
-        "prop-types": "^15.6.0",
-        "warning": "^4.0.1"
-      },
-      "peerDependencies": {
-        "react": "^16.3.0"
-      }
-    },
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
@@ -18312,91 +18269,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/react-swipeable-views": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-swipeable-views/-/react-swipeable-views-0.14.0.tgz",
-      "integrity": "sha512-wrTT6bi2nC3JbmyNAsPXffUXLn0DVT9SbbcFr36gKpbaCgEp7rX/OFxsu5hPc/NBsUhHyoSRGvwqJNNrWTwCww==",
-      "dependencies": {
-        "@babel/runtime": "7.0.0",
-        "prop-types": "^15.5.4",
-        "react-swipeable-views-core": "^0.14.0",
-        "react-swipeable-views-utils": "^0.14.0",
-        "warning": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-swipeable-views-core": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz",
-      "integrity": "sha512-0W/e9uPweNEOSPjmYtuKSC/SvKKg1sfo+WtPdnxeLF3t2L82h7jjszuOHz9C23fzkvLfdgkaOmcbAxE9w2GEjA==",
-      "dependencies": {
-        "@babel/runtime": "7.0.0",
-        "warning": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/react-swipeable-views-core/node_modules/@babel/runtime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz",
-      "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==",
-      "dependencies": {
-        "regenerator-runtime": "^0.12.0"
-      }
-    },
-    "node_modules/react-swipeable-views-core/node_modules/regenerator-runtime": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-      "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
-    },
-    "node_modules/react-swipeable-views-utils": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/react-swipeable-views-utils/-/react-swipeable-views-utils-0.14.0.tgz",
-      "integrity": "sha512-W+fXBOsDqgFK1/g7MzRMVcDurp3LqO3ksC8UgInh2P/tKgb5DusuuB1geKHFc6o1wKl+4oyER4Zh3Lxmr8xbXA==",
-      "dependencies": {
-        "@babel/runtime": "7.0.0",
-        "keycode": "^2.1.7",
-        "prop-types": "^15.6.0",
-        "react-event-listener": "^0.6.0",
-        "react-swipeable-views-core": "^0.14.0",
-        "shallow-equal": "^1.2.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/react-swipeable-views-utils/node_modules/@babel/runtime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz",
-      "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==",
-      "dependencies": {
-        "regenerator-runtime": "^0.12.0"
-      }
-    },
-    "node_modules/react-swipeable-views-utils/node_modules/regenerator-runtime": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-      "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
-    },
-    "node_modules/react-swipeable-views/node_modules/@babel/runtime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0.tgz",
-      "integrity": "sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==",
-      "dependencies": {
-        "regenerator-runtime": "^0.12.0"
-      }
-    },
-    "node_modules/react-swipeable-views/node_modules/regenerator-runtime": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-      "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
-    },
     "node_modules/react-transition-group": {
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
@@ -19377,11 +19249,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/shallow-equal": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
-      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -21274,14 +21141,6 @@
         "makeerror": "1.0.12"
       }
     },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/package.json b/package.json
index 2e894f22288..246734dc3d4 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "events": "^3.3.0",
     "i18next": "^23.2.7",
     "i18next-browser-languagedetector": "^7.1.0",
-    "libphonenumber-js": "^1.10.37",
     "lodash": "^4.17.21",
     "postcss-loader": "^7.3.3",
     "qrcode.react": "^3.1.0",
@@ -90,7 +89,6 @@
     "react-player": "^2.12.0",
     "react-qr-reader": "^2.2.1",
     "react-redux": "^8.1.1",
-    "react-swipeable-views": "^0.14.0",
     "react-transition-group": "^4.4.5",
     "react-webcam": "^7.1.1",
     "read-excel-file": "^5.6.1",
@@ -126,7 +124,6 @@
     "@types/react-dom": "^18.2.6",
     "@types/react-google-recaptcha": "^2.1.5",
     "@types/react-qr-reader": "^2.1.4",
-    "@types/react-swipeable-views": "^0.13.2",
     "@types/react-transition-group": "^4.4.6",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.61.0",
diff --git a/src/App.tsx b/src/App.tsx
index e00ca18f652..f89dfd11e74 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,111 +1,28 @@
-import * as Sentry from "@sentry/browser";
-
-import { FC, Suspense, lazy, useEffect, useState } from "react";
-import { getConfig, getCurrentUser } from "./Redux/actions";
-import { statusType, useAbortableEffect } from "./Common/utils";
-import { useDispatch, useSelector } from "react-redux";
-
-import AppRouter from "./Router/AppRouter";
-import { HistoryAPIProvider } from "./CAREUI/misc/HistoryAPIProvider";
-import { AppConfigContext, IConfig } from "./Common/hooks/useConfig";
-import { LocalStorageKeys } from "./Common/constants";
-import Plausible from "./Components/Common/Plausible";
-import SessionRouter from "./Router/SessionRouter";
-import axios from "axios";
-import { AuthUserContext } from "./Common/hooks/useAuthUser";
-
-const Loading = lazy(() => import("./Components/Common/Loading"));
-
-const App: FC = () => {
-  const dispatch: any = useDispatch();
-  const state: any = useSelector((state) => state);
-  const { currentUser, config } = state;
-  const [user, setUser] = useState(null);
-
-  useAbortableEffect(async () => {
-    const res = await dispatch(getConfig());
-    if (res.data && res.status < 400) {
-      const config = res.data as IConfig;
-
-      if (config?.sentry_dsn && import.meta.env.PROD) {
-        Sentry.init({
-          environment: config.sentry_environment,
-          dsn: config.sentry_dsn,
-        });
-      }
-
-      localStorage.setItem("config", JSON.stringify(config));
-    }
-  }, [dispatch]);
-
-  const updateRefreshToken = () => {
-    const refresh = localStorage.getItem(LocalStorageKeys.refreshToken);
-    // const access = localStorage.getItem(LocalStorageKeys.accessToken);
-    // if (!access && refresh) {
-    //   localStorage.removeItem(LocalStorageKeys.refreshToken);
-    //   document.location.reload();
-    //   return;
-    // }
-    if (!refresh) {
-      return;
-    }
-    axios
-      .post("/api/v1/auth/token/refresh/", {
-        refresh,
-      })
-      .then((resp) => {
-        localStorage.setItem(LocalStorageKeys.accessToken, resp.data.access);
-        localStorage.setItem(LocalStorageKeys.refreshToken, resp.data.refresh);
-      });
-  };
-  useEffect(() => {
-    updateRefreshToken();
-    setInterval(updateRefreshToken, 5 * 60 * 1000);
-  }, [user]);
-
-  useAbortableEffect(
-    async (status: statusType) => {
-      const res = await dispatch(getCurrentUser());
-      if (!status.aborted && res && res.statusCode === 200) {
-        setUser(res.data);
-      }
-    },
-    [dispatch]
-  );
-
-  useEffect(() => {
-    const darkThemeMq = window.matchMedia("(prefers-color-scheme: dark)");
-    const favicon: any = document.querySelector("link[rel~='icon']");
-    if (darkThemeMq.matches) {
-      favicon.href = "/favicon-light.ico";
-    } else {
-      favicon.href = "/favicon.ico";
-    }
-  }, []);
-
-  if (
-    !currentUser ||
-    currentUser.isFetching ||
-    !config ||
-    config.isFetching ||
-    !config.data
-  ) {
-    return <Loading />;
-  }
-
+import { Suspense } from "react";
+import Routers from "./Routers";
+import {
+  AppConfigProvider,
+  AuthUserProvider,
+  HistoryAPIProvider,
+} from "./Providers";
+import ThemedFavicon from "./CAREUI/misc/ThemedFavicon";
+import Intergrations from "./Integrations";
+import Loading from "./Components/Common/Loading";
+
+const App = () => {
   return (
     <Suspense fallback={<Loading />}>
+      <ThemedFavicon />
       <HistoryAPIProvider>
-        <AppConfigContext.Provider value={config.data}>
-          {currentUser?.data ? (
-            <AuthUserContext.Provider value={currentUser.data}>
-              <AppRouter />
-            </AuthUserContext.Provider>
-          ) : (
-            <SessionRouter />
-          )}
-          <Plausible />
-        </AppConfigContext.Provider>
+        <AppConfigProvider>
+          <AuthUserProvider unauthorized={<Routers.SessionRouter />}>
+            <Routers.AppRouter />
+          </AuthUserProvider>
+
+          {/* Integrations */}
+          <Intergrations.Sentry disabled={!import.meta.env.PROD} />
+          <Intergrations.Plausible />
+        </AppConfigProvider>
       </HistoryAPIProvider>
     </Suspense>
   );
diff --git a/src/CAREUI/misc/ThemedFavicon.tsx b/src/CAREUI/misc/ThemedFavicon.tsx
new file mode 100644
index 00000000000..55b8d34ec7e
--- /dev/null
+++ b/src/CAREUI/misc/ThemedFavicon.tsx
@@ -0,0 +1,14 @@
+import { useEffect } from "react";
+
+export default function ThemedFavicon() {
+  useEffect(() => {
+    const darkThemeMq = window.matchMedia("(prefers-color-scheme: dark)");
+    const favicon = document.querySelector(
+      "link[rel~='icon']"
+    ) as HTMLLinkElement;
+
+    favicon.href = darkThemeMq.matches ? "/favicon-light.ico" : "/favicon.ico";
+  }, []);
+
+  return null;
+}
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index f5801e97e4b..f64a9fa27ae 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -1,9 +1,9 @@
 import { IConfig } from "./hooks/useConfig";
 import { PatientCategory } from "../Components/Facility/models";
 import { SortOption } from "../Components/Common/SortDropdown";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
 import { dateQueryString } from "../Utils/utils";
 import { IconName } from "../CAREUI/icons/CareIcon";
+import { PhoneNumberValidator } from "../Components/Form/FieldValidators";
 
 export const RESULTS_PER_PAGE_LIMIT = 14;
 export const PAGINATION_LIMIT = 36;
@@ -663,22 +663,22 @@ export const NURSING_CARE_FIELDS: Array<OptionsType> = [
 export const EYE_OPEN_SCALE = [
   { value: 4, text: "Spontaneous" },
   { value: 3, text: "To Speech" },
-  { value: 2, text: "Pain" },
-  { value: 1, text: "None" },
+  { value: 2, text: "To Pain" },
+  { value: 1, text: "No Response" },
 ];
 
 export const VERBAL_RESPONSE_SCALE = [
-  { value: 5, text: "Oriented/Coos/Babbles" },
+  { value: 5, text: "Oriented to Time, Place and Person" },
   { value: 4, text: "Confused/Irritable" },
   { value: 3, text: "Inappropriate words/Cry to Pain" },
   { value: 2, text: "Incomprehensible words/Moans to pain" },
-  { value: 1, text: "None" },
+  { value: 1, text: "No Response" },
 ];
 
 export const MOTOR_RESPONSE_SCALE = [
-  { value: 6, text: "Obeying commands" },
-  { value: 5, text: "Moves to localised pain" },
-  { value: 4, text: "Flexion withdrawal from pain" },
+  { value: 6, text: "Obeying commands/Normal acrivity" },
+  { value: 5, text: "Moves to localized pain" },
+  { value: 4, text: "Flexion/Withdrawal from pain" },
   { value: 3, text: "Abnormal Flexion(decorticate)" },
   { value: 2, text: "Abnormal Extension(decerebrate)" },
   { value: 1, text: "No Response" },
@@ -938,13 +938,12 @@ export const XLSXAssetImportSchema = {
     prop: "support_phone",
     type: String,
     parse: (phone: number | string) => {
-      const parsed = parsePhoneNumberFromString(String(phone), "IN");
-
-      if (!parsed?.isValid()) {
+      phone = "+91" + String(phone);
+      if (!PhoneNumberValidator(["support"])(phone) === undefined) {
         throw new Error("Invalid Support Phone Number");
       }
 
-      return parsed?.format("E.164");
+      return phone ? phone : undefined;
     },
     required: true,
   },
@@ -1001,3 +1000,126 @@ export const XLSXAssetImportSchema = {
     },
   },
 };
+
+export const AREACODES: Record<string, string[]> = {
+  CA: [
+    "403",
+    "587",
+    "250",
+    "604",
+    "778",
+    "204",
+    "431",
+    "506",
+    "709",
+    "867",
+    "902",
+    "226",
+    "249",
+    "289",
+    "343",
+    "365",
+    "416",
+    "437",
+    "519",
+    "613",
+    "647",
+    "705",
+    "807",
+    "902",
+    "418",
+    "438",
+    "450",
+    "514",
+    "579",
+    "581",
+    "819",
+    "306",
+    "639",
+    "867",
+  ],
+  JM: ["658", "876"],
+  PR: ["787", "939"],
+  DO: ["809", "829"],
+  RE: ["262", "263", "692", "693"],
+  YT: ["269", "639"],
+  CC: ["89162"],
+  CX: ["89164"],
+  BQ: ["9"],
+  KZ: ["6", "7"],
+  SJ: ["79"],
+};
+
+export const IN_LANDLINE_AREA_CODES = [
+  "11",
+  "22",
+  "33",
+  "44",
+  "20",
+  "40",
+  "79",
+  "80",
+  "120",
+  "124",
+  "129",
+  "135",
+  "141",
+  "160",
+  "161",
+  "172",
+  "175",
+  "181",
+  "183",
+  "233",
+  "240",
+  "241",
+  "250",
+  "251",
+  "253",
+  "257",
+  "260",
+  "261",
+  "265",
+  "343",
+  "413",
+  "422",
+  "431",
+  "435",
+  "452",
+  "462",
+  "471",
+  "474",
+  "477",
+  "478",
+  "481",
+  "484",
+  "485",
+  "487",
+  "490",
+  "497",
+  "512",
+  "522",
+  "532",
+  "542",
+  "551",
+  "562",
+  "581",
+  "591",
+  "621",
+  "612",
+  "641",
+  "657",
+  "712",
+  "721",
+  "724",
+  "751",
+  "761",
+  "821",
+  "824",
+  "831",
+  "836",
+  "866",
+  "870",
+  "891",
+  "4822",
+];
diff --git a/src/Common/hooks/useAppHistory.ts b/src/Common/hooks/useAppHistory.ts
index f4ee2f11f78..a4605db082b 100644
--- a/src/Common/hooks/useAppHistory.ts
+++ b/src/Common/hooks/useAppHistory.ts
@@ -3,7 +3,7 @@ import { useContext } from "react";
 import {
   HistoryContext,
   ResetHistoryContext,
-} from "../../CAREUI/misc/HistoryAPIProvider";
+} from "../../Providers/HistoryAPIProvider";
 
 export default function useAppHistory() {
   const history = useContext(HistoryContext);
diff --git a/src/Common/hooks/useFilters.tsx b/src/Common/hooks/useFilters.tsx
index 309cdc37787..129a696041b 100644
--- a/src/Common/hooks/useFilters.tsx
+++ b/src/Common/hooks/useFilters.tsx
@@ -196,7 +196,7 @@ export default function useFilters({ limit = 14 }: { limit?: number }) {
     FilterBadge,
     FilterBadges,
     Pagination,
-    // TODO: update this props to be compliant with new FiltersSlideOver when #3996 is merged.
+
     advancedFilter: {
       show: showFilters,
       setShow: setShowFilters,
diff --git a/src/Common/hooks/useRangePagination.ts b/src/Common/hooks/useRangePagination.ts
index 7652ae546c1..e6bbe9f573e 100644
--- a/src/Common/hooks/useRangePagination.ts
+++ b/src/Common/hooks/useRangePagination.ts
@@ -9,17 +9,18 @@ interface Props {
   bounds: DateRange;
   perPage: number;
   slots?: number;
-  defaultEnd?: boolean;
+  snapToLatest?: boolean;
+  reverse?: boolean;
 }
 
 const useRangePagination = ({ bounds, perPage, ...props }: Props) => {
   const [currentRange, setCurrentRange] = useState(
-    getInitialBounds(bounds, perPage, props.defaultEnd)
+    getInitialBounds(bounds, perPage, props.snapToLatest)
   );
 
   useEffect(() => {
-    setCurrentRange(getInitialBounds(bounds, perPage, props.defaultEnd));
-  }, [bounds, perPage, props.defaultEnd]);
+    setCurrentRange(getInitialBounds(bounds, perPage, props.snapToLatest));
+  }, [bounds, perPage, props.snapToLatest]);
 
   const next = () => {
     const { end } = currentRange;
@@ -62,17 +63,24 @@ const useRangePagination = ({ bounds, perPage, ...props }: Props) => {
     }
 
     const slots: DateRange[] = [];
-    const { start } = currentRange;
+    const { start, end } = currentRange;
     const delta = perPage / props.slots;
 
     for (let i = 0; i < props.slots; i++) {
-      slots.push({
-        start: new Date(start.valueOf() + delta * i),
-        end: new Date(start.valueOf() + delta * (i + 1)),
-      });
+      if (props.snapToLatest) {
+        slots.push({
+          start: new Date(end.valueOf() - delta * (i - 1)),
+          end: new Date(end.valueOf() - delta * i),
+        });
+      } else {
+        slots.push({
+          start: new Date(start.valueOf() + delta * i),
+          end: new Date(start.valueOf() + delta * (i + 1)),
+        });
+      }
     }
 
-    return slots;
+    return props.reverse ? slots.reverse() : slots;
   }, [currentRange, props.slots, perPage]);
 
   return {
@@ -90,7 +98,7 @@ export default useRangePagination;
 const getInitialBounds = (
   bounds: DateRange,
   perPage: number,
-  defaultEnd?: boolean
+  snapToLatest?: boolean
 ) => {
   const deltaBounds = bounds.end.valueOf() - bounds.start.valueOf();
 
@@ -98,7 +106,7 @@ const getInitialBounds = (
     return bounds;
   }
 
-  if (defaultEnd) {
+  if (snapToLatest) {
     return {
       start: new Date(bounds.end.valueOf() - perPage),
       end: bounds.end,
diff --git a/src/Common/static/countryPhoneAndFlags.json b/src/Common/static/countryPhoneAndFlags.json
index 9b2ea40427d..87d963444b5 100644
--- a/src/Common/static/countryPhoneAndFlags.json
+++ b/src/Common/static/countryPhoneAndFlags.json
@@ -2,20 +2,20 @@
   "AD": { "flag": "🇦🇩", "name": "Andorra", "code": "376" },
   "AE": { "flag": "🇦🇪", "name": "United Arab Emirates", "code": "971" },
   "AF": { "flag": "🇦🇫", "name": "Afghanistan", "code": "93" },
-  "AG": { "flag": "🇦🇬", "name": "Antigua & Barbuda", "code": "+1-268" },
-  "AI": { "flag": "🇦🇮", "name": "Anguilla", "code": "+1-264" },
+  "AG": { "flag": "🇦🇬", "name": "Antigua & Barbuda", "code": "1-268" },
+  "AI": { "flag": "🇦🇮", "name": "Anguilla", "code": "1-264" },
   "AL": { "flag": "🇦🇱", "name": "Albania", "code": "355" },
   "AM": { "flag": "🇦🇲", "name": "Armenia", "code": "374" },
   "AO": { "flag": "🇦🇴", "name": "Angola", "code": "244" },
   "AR": { "flag": "🇦🇷", "name": "Argentina", "code": "54" },
-  "AS": { "flag": "🇦🇸", "name": "American Samoa", "code": "+1-684" },
+  "AS": { "flag": "🇦🇸", "name": "American Samoa", "code": "1-684" },
   "AT": { "flag": "🇦🇹", "name": "Austria", "code": "43" },
   "AU": { "flag": "🇦🇺", "name": "Australia", "code": "61" },
   "AW": { "flag": "🇦🇼", "name": "Aruba", "code": "297" },
-  "AX": { "flag": "🇦🇽", "name": "Åland Islands", "code": "+358-18" },
+  "AX": { "flag": "🇦🇽", "name": "Åland Islands", "code": "358-18" },
   "AZ": { "flag": "🇦🇿", "name": "Azerbaijan", "code": "994" },
   "BA": { "flag": "🇧🇦", "name": "Bosnia & Herzegovina", "code": "387" },
-  "BB": { "flag": "🇧🇧", "name": "Barbados", "code": "+1-246" },
+  "BB": { "flag": "🇧🇧", "name": "Barbados", "code": "1-246" },
   "BD": { "flag": "🇧🇩", "name": "Bangladesh", "code": "880" },
   "BE": { "flag": "🇧🇪", "name": "Belgium", "code": "32" },
   "BF": { "flag": "🇧🇫", "name": "Burkina Faso", "code": "226" },
@@ -24,12 +24,12 @@
   "BI": { "flag": "🇧🇮", "name": "Burundi", "code": "257" },
   "BJ": { "flag": "🇧🇯", "name": "Benin", "code": "229" },
   "BL": { "flag": "🇧🇱", "name": "St. Barthélemy", "code": "590" },
-  "BM": { "flag": "🇧🇲", "name": "Bermuda", "code": "+1-441" },
+  "BM": { "flag": "🇧🇲", "name": "Bermuda", "code": "1-441" },
   "BN": { "flag": "🇧🇳", "name": "Brunei", "code": "673" },
   "BO": { "flag": "🇧🇴", "name": "Bolivia", "code": "591" },
   "BQ": { "flag": "🇧🇶", "name": "Caribbean Netherlands", "code": "599" },
   "BR": { "flag": "🇧🇷", "name": "Brazil", "code": "55" },
-  "BS": { "flag": "🇧🇸", "name": "Bahamas", "code": "+1-242" },
+  "BS": { "flag": "🇧🇸", "name": "Bahamas", "code": "1-242" },
   "BT": { "flag": "🇧🇹", "name": "Bhutan", "code": "975" },
   "BW": { "flag": "🇧🇼", "name": "Botswana", "code": "267" },
   "BY": { "flag": "🇧🇾", "name": "Belarus", "code": "375" },
@@ -56,11 +56,11 @@
   "DE": { "flag": "🇩🇪", "name": "Germany", "code": "49" },
   "DJ": { "flag": "🇩🇯", "name": "Djibouti", "code": "253" },
   "DK": { "flag": "🇩🇰", "name": "Denmark", "code": "45" },
-  "DM": { "flag": "🇩🇲", "name": "Dominica", "code": "+1-767" },
+  "DM": { "flag": "🇩🇲", "name": "Dominica", "code": "1-767" },
   "DO": {
     "flag": "🇩🇴",
     "name": "Dominican Republic",
-    "code": "+1-809 and 1-829"
+    "code": "1"
   },
   "DZ": { "flag": "🇩🇿", "name": "Algeria", "code": "213" },
   "EC": { "flag": "🇪🇨", "name": "Ecuador", "code": "593" },
@@ -78,10 +78,10 @@
   "FR": { "flag": "🇫🇷", "name": "France", "code": "33" },
   "GA": { "flag": "🇬🇦", "name": "Gabon", "code": "241" },
   "GB": { "flag": "🇬🇧", "name": "United Kingdom", "code": "44" },
-  "GD": { "flag": "🇬🇩", "name": "Grenada", "code": "+1-473" },
+  "GD": { "flag": "🇬🇩", "name": "Grenada", "code": "1-473" },
   "GE": { "flag": "🇬🇪", "name": "Georgia", "code": "995" },
   "GF": { "flag": "🇬🇫", "name": "French Guiana", "code": "594" },
-  "GG": { "flag": "🇬🇬", "name": "Guernsey", "code": "+44-1481" },
+  "GG": { "flag": "🇬🇬", "name": "Guernsey", "code": "44-1481" },
   "GH": { "flag": "🇬🇭", "name": "Ghana", "code": "233" },
   "GI": { "flag": "🇬🇮", "name": "Gibraltar", "code": "350" },
   "GL": { "flag": "🇬🇱", "name": "Greenland", "code": "299" },
@@ -91,7 +91,7 @@
   "GQ": { "flag": "🇬🇶", "name": "Equatorial Guinea", "code": "240" },
   "GR": { "flag": "🇬🇷", "name": "Greece", "code": "30" },
   "GT": { "flag": "🇬🇹", "name": "Guatemala", "code": "502" },
-  "GU": { "flag": "🇬🇺", "name": "Guam", "code": "+1-671" },
+  "GU": { "flag": "🇬🇺", "name": "Guam", "code": "1-671" },
   "GW": { "flag": "🇬🇼", "name": "Guinea-Bissau", "code": "245" },
   "GY": { "flag": "🇬🇾", "name": "Guyana", "code": "592" },
   "HK": { "flag": "🇭🇰", "name": "Hong Kong SAR China", "code": "852" },
@@ -103,7 +103,7 @@
   "ID": { "flag": "🇮🇩", "name": "Indonesia", "code": "62" },
   "IE": { "flag": "🇮🇪", "name": "Ireland", "code": "353" },
   "IL": { "flag": "🇮🇱", "name": "Israel", "code": "972" },
-  "IM": { "flag": "🇮🇲", "name": "Isle of Man", "code": "+44-1624" },
+  "IM": { "flag": "🇮🇲", "name": "Isle of Man", "code": "44-1624" },
   "IN": { "flag": "🇮🇳", "name": "India", "code": "91" },
   "IO": {
     "flag": "🇮🇴",
@@ -114,8 +114,8 @@
   "IR": { "flag": "🇮🇷", "name": "Iran", "code": "98" },
   "IS": { "flag": "🇮🇸", "name": "Iceland", "code": "354" },
   "IT": { "flag": "🇮🇹", "name": "Italy", "code": "39" },
-  "JE": { "flag": "🇯🇪", "name": "Jersey", "code": "+44-1534" },
-  "JM": { "flag": "🇯🇲", "name": "Jamaica", "code": "+1-876" },
+  "JE": { "flag": "🇯🇪", "name": "Jersey", "code": "44-1534" },
+  "JM": { "flag": "🇯🇲", "name": "Jamaica", "code": "1" },
   "JO": { "flag": "🇯🇴", "name": "Jordan", "code": "962" },
   "JP": { "flag": "🇯🇵", "name": "Japan", "code": "81" },
   "KE": { "flag": "🇰🇪", "name": "Kenya", "code": "254" },
@@ -123,15 +123,15 @@
   "KH": { "flag": "🇰🇭", "name": "Cambodia", "code": "855" },
   "KI": { "flag": "🇰🇮", "name": "Kiribati", "code": "686" },
   "KM": { "flag": "🇰🇲", "name": "Comoros", "code": "269" },
-  "KN": { "flag": "🇰🇳", "name": "St. Kitts & Nevis", "code": "+1-869" },
+  "KN": { "flag": "🇰🇳", "name": "St. Kitts & Nevis", "code": "1-869" },
   "KP": { "flag": "🇰🇵", "name": "North Korea", "code": "850" },
   "KR": { "flag": "🇰🇷", "name": "South Korea", "code": "82" },
   "KW": { "flag": "🇰🇼", "name": "Kuwait", "code": "965" },
-  "KY": { "flag": "🇰🇾", "name": "Cayman Islands", "code": "+1-345" },
+  "KY": { "flag": "🇰🇾", "name": "Cayman Islands", "code": "1-345" },
   "KZ": { "flag": "🇰🇿", "name": "Kazakhstan", "code": "7" },
   "LA": { "flag": "🇱🇦", "name": "Laos", "code": "856" },
   "LB": { "flag": "🇱🇧", "name": "Lebanon", "code": "961" },
-  "LC": { "flag": "🇱🇨", "name": "St. Lucia", "code": "+1-758" },
+  "LC": { "flag": "🇱🇨", "name": "St. Lucia", "code": "1-758" },
   "LI": { "flag": "🇱🇮", "name": "Liechtenstein", "code": "423" },
   "LK": { "flag": "🇱🇰", "name": "Sri Lanka", "code": "94" },
   "LR": { "flag": "🇱🇷", "name": "Liberia", "code": "231" },
@@ -152,10 +152,10 @@
   "MM": { "flag": "🇲🇲", "name": "Myanmar (Burma)", "code": "95" },
   "MN": { "flag": "🇲🇳", "name": "Mongolia", "code": "976" },
   "MO": { "flag": "🇲🇴", "name": "Macao SAR China", "code": "853" },
-  "MP": { "flag": "🇲🇵", "name": "Northern Mariana Islands", "code": "+1-670" },
+  "MP": { "flag": "🇲🇵", "name": "Northern Mariana Islands", "code": "1-670" },
   "MQ": { "flag": "🇲🇶", "name": "Martinique", "code": "596" },
   "MR": { "flag": "🇲🇷", "name": "Mauritania", "code": "222" },
-  "MS": { "flag": "🇲🇸", "name": "Montserrat", "code": "+1-664" },
+  "MS": { "flag": "🇲🇸", "name": "Montserrat", "code": "1-664" },
   "MT": { "flag": "🇲🇹", "name": "Malta", "code": "356" },
   "MU": { "flag": "🇲🇺", "name": "Mauritius", "code": "230" },
   "MV": { "flag": "🇲🇻", "name": "Maldives", "code": "960" },
@@ -185,7 +185,7 @@
   "PL": { "flag": "🇵🇱", "name": "Poland", "code": "48" },
   "PM": { "flag": "🇵🇲", "name": "St. Pierre & Miquelon", "code": "508" },
   "PN": { "flag": "🇵🇳", "name": "Pitcairn Islands", "code": "870" },
-  "PR": { "flag": "🇵🇷", "name": "Puerto Rico", "code": "+1-787 and 1-939" },
+  "PR": { "flag": "🇵🇷", "name": "Puerto Rico", "code": "1" },
   "PS": { "flag": "🇵🇸", "name": "Palestinian Territories", "code": "970" },
   "PT": { "flag": "🇵🇹", "name": "Portugal", "code": "351" },
   "PW": { "flag": "🇵🇼", "name": "Palau", "code": "680" },
@@ -214,10 +214,10 @@
   "SS": { "flag": "🇸🇸", "name": "South Sudan", "code": "211" },
   "ST": { "flag": "🇸🇹", "name": "São Tomé & Príncipe", "code": "239" },
   "SV": { "flag": "🇸🇻", "name": "El Salvador", "code": "503" },
-  "SX": { "flag": "🇸🇽", "name": "Sint Maarten", "code": "599" },
+  "SX": { "flag": "🇸🇽", "name": "Sint Maarten", "code": "1-721" },
   "SY": { "flag": "🇸🇾", "name": "Syria", "code": "963" },
   "SZ": { "flag": "🇸🇿", "name": "Eswatini", "code": "268" },
-  "TC": { "flag": "🇹🇨", "name": "Turks & Caicos Islands", "code": "+1-649" },
+  "TC": { "flag": "🇹🇨", "name": "Turks & Caicos Islands", "code": "1-649" },
   "TD": { "flag": "🇹🇩", "name": "Chad", "code": "235" },
   "TG": { "flag": "🇹🇬", "name": "Togo", "code": "228" },
   "TH": { "flag": "🇹🇭", "name": "Thailand", "code": "66" },
@@ -228,7 +228,7 @@
   "TN": { "flag": "🇹🇳", "name": "Tunisia", "code": "216" },
   "TO": { "flag": "🇹🇴", "name": "Tonga", "code": "676" },
   "TR": { "flag": "🇹🇷", "name": "Turkey", "code": "90" },
-  "TT": { "flag": "🇹🇹", "name": "Trinidad & Tobago", "code": "+1-868" },
+  "TT": { "flag": "🇹🇹", "name": "Trinidad & Tobago", "code": "1-868" },
   "TV": { "flag": "🇹🇻", "name": "Tuvalu", "code": "688" },
   "TW": { "flag": "🇹🇼", "name": "Taiwan", "code": "886" },
   "TZ": { "flag": "🇹🇿", "name": "Tanzania", "code": "255" },
@@ -239,10 +239,10 @@
   "UY": { "flag": "🇺🇾", "name": "Uruguay", "code": "598" },
   "UZ": { "flag": "🇺🇿", "name": "Uzbekistan", "code": "998" },
   "VA": { "flag": "🇻🇦", "name": "Vatican City", "code": "379" },
-  "VC": { "flag": "🇻🇨", "name": "St. Vincent & Grenadines", "code": "+1-784" },
+  "VC": { "flag": "🇻🇨", "name": "St. Vincent & Grenadines", "code": "1-784" },
   "VE": { "flag": "🇻🇪", "name": "Venezuela", "code": "58" },
-  "VG": { "flag": "🇻🇬", "name": "British Virgin Islands", "code": "+1-284" },
-  "VI": { "flag": "🇻🇮", "name": "U.S. Virgin Islands", "code": "+1-340" },
+  "VG": { "flag": "🇻🇬", "name": "British Virgin Islands", "code": "1-284" },
+  "VI": { "flag": "🇻🇮", "name": "U.S. Virgin Islands", "code": "1-340" },
   "VN": { "flag": "🇻🇳", "name": "Vietnam", "code": "84" },
   "VU": { "flag": "🇻🇺", "name": "Vanuatu", "code": "678" },
   "WF": { "flag": "🇼🇫", "name": "Wallis & Futuna", "code": "681" },
diff --git a/src/Components/Assets/AssetConfigure.tsx b/src/Components/Assets/AssetConfigure.tsx
index 7099f911463..fd431ae35ea 100644
--- a/src/Components/Assets/AssetConfigure.tsx
+++ b/src/Components/Assets/AssetConfigure.tsx
@@ -1,60 +1,32 @@
-import { useCallback, useState } from "react";
 import Loading from "../Common/Loading";
-import { AssetData } from "./AssetTypes";
-import { statusType, useAbortableEffect } from "../../Common/utils";
-import { useDispatch } from "react-redux";
-import { getAsset } from "../../Redux/actions";
-import * as Notification from "../../Utils/Notifications.js";
 import HL7Monitor from "./AssetType/HL7Monitor";
 import ONVIFCamera from "./AssetType/ONVIFCamera";
 import Page from "../Common/components/Page";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
 
 interface AssetConfigureProps {
   assetId: string;
   facilityId: string;
 }
 
-const AssetConfigure = (props: AssetConfigureProps) => {
-  const { assetId, facilityId } = props;
-  const [asset, setAsset] = useState<AssetData>();
-  const [isLoading, setIsLoading] = useState(true);
-  const [assetType, setAssetType] = useState("");
-  const dispatch = useDispatch<any>();
+const AssetConfigure = ({ assetId, facilityId }: AssetConfigureProps) => {
+  const {
+    data: asset,
+    loading,
+    refetch,
+  } = useQuery(routes.getAsset, { pathParams: { external_id: assetId } });
 
-  const fetchData = useCallback(
-    async (status: statusType) => {
-      setIsLoading(true);
-      const [assetData]: any = await Promise.all([dispatch(getAsset(assetId))]);
-      if (!status.aborted) {
-        setIsLoading(false);
-        if (!assetData.data)
-          Notification.Error({
-            msg: "Something went wrong..!",
-          });
-        else {
-          setAsset(assetData.data);
-          setAssetType(assetData.data.asset_class);
-        }
-      }
-    },
-    [dispatch, assetId]
-  );
-
-  useAbortableEffect(
-    (status: statusType) => {
-      fetchData(status);
-    },
-    [dispatch, fetchData]
-  );
-
-  if (isLoading) return <Loading />;
+  if (loading || !asset) {
+    return <Loading />;
+  }
 
-  if (assetType === "HL7MONITOR") {
+  if (asset.asset_class === "HL7MONITOR") {
     return (
       <Page
-        title={`Configure HL7 Monitor: ${asset?.name}`}
+        title={`Configure HL7 Monitor: ${asset.name}`}
         crumbsReplacements={{
-          [facilityId]: { name: asset?.location_object.facility.name },
+          [facilityId]: { name: asset.location_object.facility.name },
           assets: { uri: `/assets?facility=${facilityId}` },
           [assetId]: { name: asset?.name },
         }}
@@ -65,7 +37,7 @@ const AssetConfigure = (props: AssetConfigureProps) => {
     );
   }
 
-  if (assetType === "VENTILATOR") {
+  if (asset.asset_class === "VENTILATOR") {
     return (
       <Page
         title={`Configure Ventilator: ${asset?.name}`}
@@ -91,7 +63,12 @@ const AssetConfigure = (props: AssetConfigureProps) => {
       }}
       backUrl={`/facility/${facilityId}/assets/${assetId}`}
     >
-      <ONVIFCamera asset={asset} assetId={assetId} facilityId={facilityId} />
+      <ONVIFCamera
+        asset={asset}
+        assetId={assetId}
+        facilityId={facilityId}
+        onUpdated={() => refetch()}
+      />
     </Page>
   );
 };
diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index 143ca2add29..7b3d39314eb 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -26,16 +26,16 @@ import { UserRole, USER_TYPES } from "../../Common/constants";
 import ConfirmDialog from "../Common/ConfirmDialog";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
 import { useTranslation } from "react-i18next";
-const PageTitle = lazy(() => import("../Common/PageTitle"));
 const Loading = lazy(() => import("../Common/Loading"));
 import * as Notification from "../../Utils/Notifications.js";
-import AuthorizeFor, { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import Uptime from "../Common/Uptime";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 import dayjs from "dayjs";
 import RelativeDateUserMention from "../Common/RelativeDateUserMention";
 import { AssetServiceEditModal } from "./AssetServiceEditModal";
 import { warrantyAmcValidityChip } from "./AssetsList";
+import Page from "../Common/components/Page";
 
 interface AssetManageProps {
   assetId: string;
@@ -232,6 +232,7 @@ const AssetManage = (props: AssetManageProps) => {
             </td>
             <td className="gap-4 whitespace-nowrap px-6 py-4 text-left text-sm leading-5">
               <ButtonV2
+                id="edit-service-history"
                 authorizeFor={NonReadOnlyUsers}
                 onClick={() => {
                   setServiceEditData({ ...service, open: true });
@@ -241,6 +242,7 @@ const AssetManage = (props: AssetManageProps) => {
                 <CareIcon icon="l-pen" className="text-lg" />
               </ButtonV2>
               <ButtonV2
+                id="view-service-history"
                 authorizeFor={NonReadOnlyUsers}
                 tooltip={service.edits?.length < 2 ? "No previous edits" : ""}
                 tooltipClassName="tooltip-left"
@@ -297,7 +299,10 @@ const AssetManage = (props: AssetManageProps) => {
           </div>
           <div className="break-words text-gray-700">{item.label}</div>
         </div>
-        <div className="ml-8 grow-0 break-words text-lg font-semibold">
+        <div
+          className="ml-8 grow-0 break-words text-lg font-semibold"
+          id="asset-current-location"
+        >
           {item.content || "--"}
         </div>
       </div>
@@ -330,18 +335,28 @@ const AssetManage = (props: AssetManageProps) => {
   };
 
   return (
-    <div className="px-2 pb-2">
-      <PageTitle
-        title="Asset Details"
-        crumbsReplacements={{
-          [facilityId]: { name: asset?.location_object.facility.name },
-          assets: { uri: `/assets?facility=${facilityId}` },
-          [assetId]: {
-            name: asset?.name,
-          },
-        }}
-        backUrl="/assets"
-      />
+    <Page
+      title="Asset Details"
+      crumbsReplacements={{
+        [facilityId]: { name: asset?.location_object.facility.name },
+        assets: { uri: `/assets?facility=${facilityId}` },
+        [assetId]: {
+          name: asset?.name,
+        },
+      }}
+      backUrl="/assets"
+      options={
+        <ButtonV2
+          onClick={handleDownload}
+          className="tooltip py-2"
+          ghost
+          border
+        >
+          <CareIcon className="care-l-export text-lg" />
+          Export as JSON
+        </ButtonV2>
+      }
+    >
       <ConfirmDialog
         title="Delete Asset"
         description="Are you sure you want to delete this asset?"
@@ -360,21 +375,22 @@ const AssetManage = (props: AssetManageProps) => {
                   <span className="break-words text-2xl font-bold md:text-3xl">
                     {asset?.name}
                   </span>
-                  <ButtonV2
-                    id="export-asset"
-                    onClick={handleDownload}
-                    className="tooltip p-4"
-                    variant="secondary"
-                    ghost
-                    circle
-                  >
-                    <CareIcon className="care-l-export text-lg" />
-                    <span className="tooltip-text tooltip-bottom -translate-x-16">
-                      Export as JSON
-                    </span>
-                  </ButtonV2>
+                  <div className="tooltip tooltip-bottom">
+                    <CareIcon
+                      className={`care-l-${assetClassProp.icon} fill-gray-700 text-3xl`}
+                    />
+                    <span className="tooltip-text">{assetClassProp.name}</span>
+                  </div>
+                </div>
+                <div className="mb-2 w-full text-gray-700 sm:hidden">
+                  {asset?.description}
                 </div>
                 <div className="flex flex-wrap gap-2">
+                  {asset?.asset_type === "INTERNAL" ? (
+                    <Chip text="Internal" startIcon="l-building" />
+                  ) : (
+                    <Chip text="External" startIcon="l-globe" />
+                  )}
                   {asset?.status === "ACTIVE" ? (
                     <Chip text="Active" startIcon="l-check" />
                   ) : (
@@ -398,7 +414,9 @@ const AssetManage = (props: AssetManageProps) => {
                   )}
                 </div>
               </div>
-              <span className="text-gray-700">{asset?.description}</span>
+              <div className="mt-3 hidden text-gray-700 sm:block">
+                {asset?.description}
+              </div>
             </div>
             <div className="flex flex-col gap-6">
               {[
@@ -407,19 +425,6 @@ const AssetManage = (props: AssetManageProps) => {
                   icon: "location-pin-alt",
                   content: asset?.location_object.name,
                 },
-                {
-                  label: "Asset Type",
-                  icon: "apps",
-                  content:
-                    asset?.asset_type === "INTERNAL"
-                      ? "Internal Asset"
-                      : "External Asset",
-                },
-                {
-                  label: "Asset Class",
-                  icon: assetClassProp.icon,
-                  content: assetClassProp.name,
-                },
                 {
                   label: "Asset QR Code ID",
                   icon: "qrcode-scan",
@@ -457,7 +462,6 @@ const AssetManage = (props: AssetManageProps) => {
                   }
                   id="configure-asset"
                   data-testid="asset-configure-button"
-                  authorizeFor={AuthorizeFor(["DistrictAdmin", "StateAdmin"])}
                 >
                   <CareIcon className="care-l-setting h-4" />
                   {t("configure")}
@@ -518,7 +522,10 @@ const AssetManage = (props: AssetManageProps) => {
         asset?.asset_class &&
         asset?.asset_class != AssetClass.NONE && <Uptime assetId={asset?.id} />}
       <div className="mb-4 mt-8 text-xl font-semibold">Service History</div>
-      <div className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg">
+      <div
+        className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg"
+        id="service-history"
+      >
         <table className="min-w-full divide-y divide-gray-200">
           <thead>
             <tr>
@@ -545,7 +552,10 @@ const AssetManage = (props: AssetManageProps) => {
         </table>
       </div>
       <div className="mb-4 mt-8 text-xl font-semibold">Transaction History</div>
-      <div className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg">
+      <div
+        className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg"
+        id="transaction-history"
+      >
         <table className="min-w-full divide-y divide-gray-200">
           <thead>
             <tr>
@@ -590,7 +600,7 @@ const AssetManage = (props: AssetManageProps) => {
           viewOnly={serviceEditData.viewOnly}
         />
       )}
-    </div>
+    </Page>
   );
 };
 
diff --git a/src/Components/Assets/AssetServiceEditModal.tsx b/src/Components/Assets/AssetServiceEditModal.tsx
index 75c9dd9fc60..66d44d11907 100644
--- a/src/Components/Assets/AssetServiceEditModal.tsx
+++ b/src/Components/Assets/AssetServiceEditModal.tsx
@@ -97,7 +97,10 @@ export const AssetServiceEditModal = (props: {
                       {edit.edited_by.username}
                     </p>
                   </div>
-                  <div className="flex items-center justify-center">
+                  <div
+                    className="flex items-center justify-center"
+                    id="view-asset-edit-history"
+                  >
                     <CareIcon icon="l-eye" className="text-lg" />
                   </div>
                 </div>
@@ -124,19 +127,25 @@ export const AssetServiceEditModal = (props: {
                   <p className="text-sm font-medium text-gray-500">
                     Serviced On
                   </p>
-                  <p className="text-gray-900">
+                  <p
+                    className="text-gray-900"
+                    id="edit-history-asset-servicedon"
+                  >
                     {formatDate(editRecord.serviced_on)}
                   </p>
                 </div>
                 <div className="mt-4 grow">
                   <p className="text-sm font-medium text-gray-500">Notes</p>
-                  <p className="text-gray-900">{editRecord.note || "-"}</p>
+                  <p className="text-gray-900" id="edit-history-asset-note">
+                    {editRecord.note || "-"}
+                  </p>
                 </div>
               </div>
             </div>
           )}
           <div className="flex justify-end">
             <ButtonV2
+              id="view-history-back-button"
               variant="secondary"
               onClick={() => {
                 editRecord ? setEditRecord(undefined) : props.handleClose();
diff --git a/src/Components/Assets/AssetType/HL7Monitor.tsx b/src/Components/Assets/AssetType/HL7Monitor.tsx
index b19190ed410..55f4d0c258e 100644
--- a/src/Components/Assets/AssetType/HL7Monitor.tsx
+++ b/src/Components/Assets/AssetType/HL7Monitor.tsx
@@ -15,6 +15,7 @@ import CareIcon from "../../../CAREUI/icons/CareIcon";
 import TextFormField from "../../Form/FormFields/TextFormField";
 import HL7PatientVitalsMonitor from "../../VitalsMonitor/HL7PatientVitalsMonitor";
 import VentilatorPatientVitalsMonitor from "../../VitalsMonitor/VentilatorPatientVitalsMonitor";
+import useAuthUser from "../../../Common/hooks/useAuthUser";
 
 interface HL7MonitorProps {
   assetId: string;
@@ -31,7 +32,7 @@ const HL7Monitor = (props: HL7MonitorProps) => {
   const [isLoading, setIsLoading] = useState(true);
   const [localipAddress, setLocalIPAddress] = useState("");
   const [ipadrdress_error, setIpAddress_error] = useState("");
-
+  const authUser = useAuthUser();
   const dispatch = useDispatch<any>();
 
   useEffect(() => {
@@ -87,40 +88,42 @@ const HL7Monitor = (props: HL7MonitorProps) => {
   return (
     <div className="mx-auto flex w-full xl:mt-8">
       <div className="mx-auto flex flex-col gap-4 xl:flex-row-reverse">
-        <div className="flex w-full shrink-0 flex-col gap-4 xl:max-w-xs">
-          <Card className="flex w-full flex-col">
-            <form onSubmit={handleSubmit}>
-              <h2 className="mb-2 text-lg font-bold">Connection</h2>
-              <div className="flex flex-col">
-                <TextFormField
-                  name="middlewareHostname"
-                  label="Middleware Hostname"
-                  placeholder={facilityMiddlewareHostname}
-                  value={middlewareHostname}
-                  onChange={(e) => setMiddlewareHostname(e.value)}
-                  errorClassName="hidden"
-                />
-                <TextFormField
-                  name="localipAddress"
-                  label="Local IP Address"
-                  value={localipAddress}
-                  onChange={(e) => setLocalIPAddress(e.value)}
-                  required
-                  error={ipadrdress_error}
-                />
-                <Submit className="w-full">
-                  <CareIcon className="care-l-save" />
-                  <span>Save Configuration</span>
-                </Submit>
-              </div>
-            </form>
-          </Card>
-          {["HL7MONITOR"].includes(assetType) && (
-            <Card>
-              <MonitorConfigure asset={asset as AssetData} />
+        {["DistrictAdmin", "StateAdmin"].includes(authUser.user_type) && (
+          <div className="flex w-full shrink-0 flex-col gap-4 xl:max-w-xs">
+            <Card className="flex w-full flex-col">
+              <form onSubmit={handleSubmit}>
+                <h2 className="mb-2 text-lg font-bold">Connection</h2>
+                <div className="flex flex-col">
+                  <TextFormField
+                    name="middlewareHostname"
+                    label="Middleware Hostname"
+                    placeholder={facilityMiddlewareHostname}
+                    value={middlewareHostname}
+                    onChange={(e) => setMiddlewareHostname(e.value)}
+                    errorClassName="hidden"
+                  />
+                  <TextFormField
+                    name="localipAddress"
+                    label="Local IP Address"
+                    value={localipAddress}
+                    onChange={(e) => setLocalIPAddress(e.value)}
+                    required
+                    error={ipadrdress_error}
+                  />
+                  <Submit className="w-full">
+                    <CareIcon className="care-l-save" />
+                    <span>Save Configuration</span>
+                  </Submit>
+                </div>
+              </form>
             </Card>
-          )}
-        </div>
+            {["HL7MONITOR"].includes(assetType) && (
+              <Card>
+                <MonitorConfigure asset={asset as AssetData} />
+              </Card>
+            )}
+          </div>
+        )}
 
         {assetType === "HL7MONITOR" && (
           <HL7PatientVitalsMonitor
diff --git a/src/Components/Assets/AssetType/ONVIFCamera.tsx b/src/Components/Assets/AssetType/ONVIFCamera.tsx
index 0f26c4924ae..4720c876010 100644
--- a/src/Components/Assets/AssetType/ONVIFCamera.tsx
+++ b/src/Components/Assets/AssetType/ONVIFCamera.tsx
@@ -16,15 +16,16 @@ import { checkIfValidIP } from "../../../Common/validation";
 import TextFormField from "../../Form/FormFields/TextFormField";
 import { Submit } from "../../Common/components/ButtonV2";
 import { SyntheticEvent } from "react";
+import useAuthUser from "../../../Common/hooks/useAuthUser";
 
-interface ONVIFCameraProps {
+interface Props {
   assetId: string;
   facilityId: string;
   asset: any;
+  onUpdated?: () => void;
 }
 
-const ONVIFCamera = (props: ONVIFCameraProps) => {
-  const { assetId, facilityId, asset } = props;
+const ONVIFCamera = ({ assetId, facilityId, asset, onUpdated }: Props) => {
   const [isLoading, setIsLoading] = useState(true);
   const [assetType, setAssetType] = useState("");
   const [middlewareHostname, setMiddlewareHostname] = useState("");
@@ -42,9 +43,8 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
   const [refreshPresetsHash, setRefreshPresetsHash] = useState(
     Number(new Date())
   );
-  const [refreshHash, setRefreshHash] = useState(Number(new Date()));
   const dispatch = useDispatch<any>();
-
+  const authUser = useAuthUser();
   useEffect(() => {
     const fetchFacility = async () => {
       const res = await dispatch(getPermittedFacility(facilityId));
@@ -87,14 +87,10 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
         dispatch(partialUpdateAsset(assetId, data))
       );
       if (res?.status === 200) {
-        Notification.Success({
-          msg: "Asset Configured Successfully",
-        });
-        setRefreshHash(Number(new Date()));
+        Notification.Success({ msg: "Asset Configured Successfully" });
+        onUpdated?.();
       } else {
-        Notification.Error({
-          msg: "Something went wrong..!",
-        });
+        Notification.Error({ msg: "Something went wrong..!" });
       }
       setLoadingSetConfiguration(false);
     } else {
@@ -147,61 +143,62 @@ const ONVIFCamera = (props: ONVIFCameraProps) => {
 
   return (
     <div className="space-y-6">
-      <form className="rounded bg-white p-8 shadow" onSubmit={handleSubmit}>
-        <div className="grid grid-cols-1 gap-x-4 lg:grid-cols-2">
-          <TextFormField
-            name="middleware_hostname"
-            label="Hospital Middleware Hostname"
-            autoComplete="off"
-            value={middlewareHostname}
-            onChange={({ value }) => setMiddlewareHostname(value)}
-          />
-          <TextFormField
-            name="camera_address"
-            label="Local IP Address"
-            autoComplete="off"
-            value={cameraAddress}
-            onChange={({ value }) => setCameraAddress(value)}
-            error={ipadrdress_error}
-          />
-          <TextFormField
-            name="username"
-            label="Username"
-            autoComplete="off"
-            value={username}
-            onChange={({ value }) => setUsername(value)}
-          />
-          <TextFormField
-            name="password"
-            label="Password"
-            autoComplete="off"
-            type="password"
-            value={password}
-            onChange={({ value }) => setPassword(value)}
-          />
-          <TextFormField
-            name="stream_uuid"
-            label="Stream UUID"
-            autoComplete="off"
-            value={streamUuid}
-            type="password"
-            className="tracking-widest"
-            labelClassName="tracking-normal"
-            onChange={({ value }) => setStreamUuid(value)}
-          />
-        </div>
-        <div className="flex justify-end">
-          <Submit
-            disabled={loadingSetConfiguration}
-            className="w-full md:w-auto"
-            label="Set Configuration"
-          />
-        </div>
-      </form>
+      {["DistrictAdmin", "StateAdmin"].includes(authUser.user_type) && (
+        <form className="rounded bg-white p-8 shadow" onSubmit={handleSubmit}>
+          <div className="grid grid-cols-1 gap-x-4 lg:grid-cols-2">
+            <TextFormField
+              name="middleware_hostname"
+              label="Hospital Middleware Hostname"
+              autoComplete="off"
+              value={middlewareHostname}
+              onChange={({ value }) => setMiddlewareHostname(value)}
+            />
+            <TextFormField
+              name="camera_address"
+              label="Local IP Address"
+              autoComplete="off"
+              value={cameraAddress}
+              onChange={({ value }) => setCameraAddress(value)}
+              error={ipadrdress_error}
+            />
+            <TextFormField
+              name="username"
+              label="Username"
+              autoComplete="off"
+              value={username}
+              onChange={({ value }) => setUsername(value)}
+            />
+            <TextFormField
+              name="password"
+              label="Password"
+              autoComplete="off"
+              type="password"
+              value={password}
+              onChange={({ value }) => setPassword(value)}
+            />
+            <TextFormField
+              name="stream_uuid"
+              label="Stream UUID"
+              autoComplete="off"
+              value={streamUuid}
+              type="password"
+              className="tracking-widest"
+              labelClassName="tracking-normal"
+              onChange={({ value }) => setStreamUuid(value)}
+            />
+          </div>
+          <div className="flex justify-end">
+            <Submit
+              disabled={loadingSetConfiguration}
+              className="w-full md:w-auto"
+              label="Set Configuration"
+            />
+          </div>
+        </form>
+      )}
 
       {assetType === "ONVIF" ? (
         <CameraConfigure
-          key={refreshHash}
           asset={asset as AssetData}
           bed={bed}
           setBed={setBed}
diff --git a/src/Components/Assets/AssetWarrantyCard.tsx b/src/Components/Assets/AssetWarrantyCard.tsx
index 5d10d4096c8..2e5fa74b9c6 100644
--- a/src/Components/Assets/AssetWarrantyCard.tsx
+++ b/src/Components/Assets/AssetWarrantyCard.tsx
@@ -1,36 +1,68 @@
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import { AssetData } from "./AssetTypes";
 import { classNames, formatDate } from "../../Utils/utils";
+import CopyToClipboard from "react-copy-to-clipboard";
+import { t } from "i18next";
+import { useEffect, useState } from "react";
 
 export default function AssetWarrantyCard(props: { asset: AssetData }) {
   const { asset } = props;
 
   const details = {
     "Serial Number": asset.serial_number,
-    Expiry:
+    "Warranty/AMC Expiry":
       asset.warranty_amc_end_of_validity &&
       formatDate(asset.warranty_amc_end_of_validity),
     Vendor: asset.vendor_name,
   };
 
+  const [isCopied, setIsCopied] = useState(false);
+
+  useEffect(() => {
+    if (isCopied) {
+      const timeout = setTimeout(() => {
+        setIsCopied(false);
+      }, 2000);
+      return () => clearTimeout(timeout);
+    }
+  }, [isCopied]);
+
   return (
     <div className="warranty-card relative z-10 flex h-full w-screen flex-col overflow-hidden p-6 text-white transition-all hover:scale-[1.01] hover:from-primary-600 hover:to-primary-700 md:w-full md:rounded-xl xl:w-96">
       <div className="mb-3 text-right text-lg font-bold italic">
         {asset.manufacturer}
       </div>
-      <div className="flex h-full flex-col justify-between gap-6 md:flex-row xl:flex-col">
-        <div className="flex h-full w-full flex-col gap-4 border-b border-white/40 md:border-b-0 md:border-r xl:w-auto xl:border-b xl:border-r-0">
+      <div className="flex h-full flex-col justify-between gap-2 md:flex-row xl:flex-col">
+        <div className="flex h-full w-full flex-col gap-4 md:border-r xl:w-auto  xl:border-r-0">
           {Object.keys(details).map((key) => (
             <div className="">
               <div className="mb-1 text-xs uppercase italic tracking-widest text-gray-200">
                 {key}
               </div>
-              <div className="font-semibold">
+              <div className="flex items-center gap-2 font-semibold">
                 {details[key as keyof typeof details] || "--"}
+                {key === "Serial Number" && (
+                  <button className="tooltip tooltip-bottom">
+                    <CopyToClipboard
+                      text={details[key as keyof typeof details] || "--"}
+                      onCopy={() => setIsCopied(true)}
+                    >
+                      {isCopied ? (
+                        <span className="text-sm text-white">
+                          {t("copied_to_clipboard")}
+                        </span>
+                      ) : (
+                        <CareIcon className="care-l-copy text-lg" />
+                      )}
+                    </CopyToClipboard>
+                    <span className="tooltip-text">Copy to clipboard</span>
+                  </button>
+                )}
               </div>
             </div>
           ))}
         </div>
+        <div className="mb-2 hidden h-[1px] w-full bg-white/40 xl:block" />
         <div className="shrink-0">
           <div>
             <div className="mb-1 text-xs uppercase italic tracking-widest text-gray-200">
diff --git a/src/Components/CriticalCareRecording/NeurologicalMonitoring/CriticalCare__NeurologicalMonitoringEditor.res b/src/Components/CriticalCareRecording/NeurologicalMonitoring/CriticalCare__NeurologicalMonitoringEditor.res
index f3f789e9dcd..35d137e0414 100644
--- a/src/Components/CriticalCareRecording/NeurologicalMonitoring/CriticalCare__NeurologicalMonitoringEditor.res
+++ b/src/Components/CriticalCareRecording/NeurologicalMonitoring/CriticalCare__NeurologicalMonitoringEditor.res
@@ -485,7 +485,7 @@ let make = (~updateCB, ~neurologicalMonitoring, ~id, ~consultationId) => {
       <div className="my-10">
         <div className="text-3xl font-bold"> {str("Glasgow Coma Scale")} </div>
         <div className="mt-4">
-          <div className="font-bold mt-4"> {str("Eye Open")} </div>
+          <div className="font-bold mt-4"> {str("Eye Opening Response")} </div>
           <div>
             {Js.Array.mapi(
               (x, i) =>
diff --git a/src/Components/CriticalCareRecording/types/CriticalCare__NeurologicalMonitoring.res b/src/Components/CriticalCareRecording/types/CriticalCare__NeurologicalMonitoring.res
index 1e8804c7524..f42ca5c140d 100644
--- a/src/Components/CriticalCareRecording/types/CriticalCare__NeurologicalMonitoring.res
+++ b/src/Components/CriticalCareRecording/types/CriticalCare__NeurologicalMonitoring.res
@@ -45,25 +45,25 @@ let make = (
   ~limbResponseLowerExtremityRight,
   ~limbResponseLowerExtremityLeft,
 ) => {
-  inPronePosition: inPronePosition,
-  consciousnessLevel: consciousnessLevel,
-  consciousnessLevelDetails: consciousnessLevelDetails,
-  leftPupilSize: leftPupilSize,
-  leftPupilSizeDetails: leftPupilSizeDetails,
-  leftPupilLightReaction: leftPupilLightReaction,
-  leftPupilLightReactionDetails: leftPupilLightReactionDetails,
-  rightPupilSize: rightPupilSize,
-  rightPupilSizeDetails: rightPupilSizeDetails,
-  rightPupilLightReaction: rightPupilLightReaction,
-  rightPupilLightReactionDetails: rightPupilLightReactionDetails,
-  glasgowEyeOpen: glasgowEyeOpen,
-  glasgowVerbalResponse: glasgowVerbalResponse,
-  glasgowMotorResponse: glasgowMotorResponse,
-  glasgowTotalCalculated: glasgowTotalCalculated,
-  limbResponseUpperExtremityRight: limbResponseUpperExtremityRight,
-  limbResponseUpperExtremityLeft: limbResponseUpperExtremityLeft,
-  limbResponseLowerExtremityRight: limbResponseLowerExtremityRight,
-  limbResponseLowerExtremityLeft: limbResponseLowerExtremityLeft,
+  inPronePosition,
+  consciousnessLevel,
+  consciousnessLevelDetails,
+  leftPupilSize,
+  leftPupilSizeDetails,
+  leftPupilLightReaction,
+  leftPupilLightReactionDetails,
+  rightPupilSize,
+  rightPupilSizeDetails,
+  rightPupilLightReaction,
+  rightPupilLightReactionDetails,
+  glasgowEyeOpen,
+  glasgowVerbalResponse,
+  glasgowMotorResponse,
+  glasgowTotalCalculated,
+  limbResponseUpperExtremityRight,
+  limbResponseUpperExtremityLeft,
+  limbResponseLowerExtremityRight,
+  limbResponseLowerExtremityLeft,
 }
 
 let makeConsciousnessLevel = consciousnessLevel => {
@@ -173,8 +173,8 @@ let limpResponseToString = limpResponse => {
 
 let eyeOpenToString = eyeOpen => {
   switch eyeOpen {
-  | 1 => "1 - None"
-  | 2 => "2 - Pain"
+  | 1 => "1 - No Response"
+  | 2 => "2 - To Pain"
   | 3 => "3 - To Speech"
   | 4 => "4 - Spontaneous"
   | _ => "Unknown"
@@ -183,23 +183,23 @@ let eyeOpenToString = eyeOpen => {
 
 let motorResposneToString = eyeOpen => {
   switch eyeOpen {
-  | 1 => "1 - None"
-  | 2 => "2 - Incomprehensible words/Moans to pain"
+  | 1 => "1 - No Response"
+  | 2 => "2 - Abnormal Extension"
   | 3 => "3 - Abnormal Flexion"
-  | 4 => "4 - Withdrawing"
-  | 5 => "5 - Localizing/Withdrawl to touch"
-  | 6 => "6 - Obeying/Normal Activity"
+  | 4 => "4 - Flexion/Withdrawal to pain"
+  | 5 => "5 - Moves to localized pain"
+  | 6 => "6 - Obeys commands/Normal Activity"
   | _ => "Unknown"
   }
 }
 
 let verbalResposneToString = eyeOpen => {
   switch eyeOpen {
-  | 1 => "1 - None"
+  | 1 => "1 - No Response"
   | 2 => "2 - Incomprehensible words/Moans to pain"
   | 3 => "3 - Inappropriate words/Cry to pain"
   | 4 => "4 - Confused/Irritable"
-  | 5 => "5 - Oriented/Coos/Babbies"
+  | 5 => "5 - Oriented to Time, Place and Person"
   | _ => "Unknown"
   }
 }
diff --git a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
index 763d92f2d1f..7239e0b912d 100644
--- a/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
+++ b/src/Components/ExternalResult/FacilitiesSelectDialogue.tsx
@@ -34,7 +34,7 @@ const FacilitiesSelectDialog = (props: Props) => {
         <Cancel onClick={handleCancel} />
         <Submit
           onClick={handleOk}
-          disabled={!selectedFacility.id}
+          disabled={!selectedFacility?.id}
           label={t("select")}
           data-testid="submit-button"
         />
diff --git a/src/Components/ExternalResult/ResultList.tsx b/src/Components/ExternalResult/ResultList.tsx
index 18de6f29134..74fbf8430b0 100644
--- a/src/Components/ExternalResult/ResultList.tsx
+++ b/src/Components/ExternalResult/ResultList.tsx
@@ -6,7 +6,7 @@ import { externalResultList } from "../../Redux/actions";
 import ListFilter from "./ListFilter";
 import FacilitiesSelectDialogue from "./FacilitiesSelectDialogue";
 import { FacilityModel } from "../Facility/models";
-import parsePhoneNumberFromString from "libphonenumber-js";
+import { parsePhoneNumber } from "../../Utils/utils";
 import SearchInput from "../Form/SearchInput";
 import useFilters from "../../Common/hooks/useFilters";
 import CareIcon from "../../CAREUI/icons/CareIcon";
@@ -65,7 +65,7 @@ export default function ResultList() {
       page: qParams.page || 1,
       name: qParams.name || "",
       mobile_number: qParams.mobile_number
-        ? parsePhoneNumberFromString(qParams.mobile_number)?.format("E.164")
+        ? parsePhoneNumber(qParams.mobile_number) ?? ""
         : "",
       wards: qParams.wards || undefined,
       local_bodies: qParams.local_bodies || undefined,
diff --git a/src/Components/Facility/AssetCreate.tsx b/src/Components/Facility/AssetCreate.tsx
index 1e6eead5242..156d738857a 100644
--- a/src/Components/Facility/AssetCreate.tsx
+++ b/src/Components/Facility/AssetCreate.tsx
@@ -30,13 +30,12 @@ import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 
 import { navigate } from "raviger";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
 import { parseQueryParams } from "../../Utils/primitives";
 import useAppHistory from "../../Common/hooks/useAppHistory";
 import { useDispatch } from "react-redux";
 import useVisibility from "../../Utils/useVisibility";
 import { validateEmailAddress } from "../../Common/validation";
-import { dateQueryString } from "../../Utils/utils.js";
+import { dateQueryString, parsePhoneNumber } from "../../Utils/utils.js";
 import dayjs from "../../Utils/dayjs";
 import DateInputV2 from "../Common/DateInputV2.js";
 
@@ -341,7 +340,7 @@ const AssetCreate = (props: AssetProps) => {
         support_email: support_email,
         support_phone: support_phone.startsWith("1800")
           ? support_phone
-          : parsePhoneNumberFromString(support_phone)?.format("E.164"),
+          : parsePhoneNumber(support_phone),
         qr_code_id: qrCodeId !== "" ? qrCodeId : null,
         manufacturer: manufacturer,
         warranty_amc_end_of_validity: warranty_amc_end_of_validity
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
index 705b3d9479a..1b89f3980e1 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -10,7 +10,7 @@ import useVitalsAspectRatioConfig from "../../VitalsMonitor/useVitalsAspectRatio
 import { DISCHARGE_REASONS, SYMPTOM_CHOICES } from "../../../Common/constants";
 import PrescriptionsTable from "../../Medicine/PrescriptionsTable";
 import Chip from "../../../CAREUI/display/Chip";
-import { formatDate, formatDateTime } from "../../../Utils/utils";
+import { formatAge, formatDate, formatDateTime } from "../../../Utils/utils";
 import ReadMore from "../../Common/components/Readmore";
 import { DailyRoundsList } from "../Consultations/DailyRoundsList";
 
@@ -621,7 +621,12 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                 <div>
                   Age {" - "}
                   <span className="font-semibold">
-                    {props.patientData.age ?? "-"}
+                    {props.patientData.age !== undefined // 0 is a valid age, so we need to check for undefined
+                      ? formatAge(
+                          props.patientData.age,
+                          props.patientData.date_of_birth
+                        )
+                      : "-"}
                   </span>
                 </div>
                 <div>
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index affdb2756cd..403f1752704 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -5,10 +5,14 @@ import {
   SYMPTOM_CHOICES,
 } from "../../../Common/constants";
 import { ConsultationModel, ICD11DiagnosisModel } from "../models";
-import { getConsultation, getPatient } from "../../../Redux/actions";
+import {
+  getConsultation,
+  getPatient,
+  listShiftRequests,
+} from "../../../Redux/actions";
 import { statusType, useAbortableEffect } from "../../../Common/utils";
 import { lazy, useCallback, useState } from "react";
-
+import ToolTip from "../../Common/utils/Tooltip";
 import ButtonV2 from "../../Common/components/ButtonV2";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
 import DischargeModal from "../DischargeModal";
@@ -23,7 +27,7 @@ import { navigate } from "raviger";
 import { useDispatch } from "react-redux";
 import { useQueryParams } from "raviger";
 import { useTranslation } from "react-i18next";
-import { triggerGoal } from "../../Common/Plausible";
+import { triggerGoal } from "../../../Integrations/Plausible";
 import useAuthUser from "../../../Common/hooks/useAuthUser";
 import { ConsultationUpdatesTab } from "./ConsultationUpdatesTab";
 import { ConsultationABGTab } from "./ConsultationABGTab";
@@ -50,10 +54,26 @@ export interface ConsultationTabProps {
   patientData: PatientModel;
 }
 
+const TABS = {
+  UPDATES: ConsultationUpdatesTab,
+  FEED: ConsultationFeedTab,
+  SUMMARY: ConsultationSummaryTab,
+  MEDICINES: ConsultationMedicinesTab,
+  FILES: ConsultationFilesTab,
+  INVESTIGATIONS: ConsultationInvestigationsTab,
+  ABG: ConsultationABGTab,
+  NURSING: ConsultationNursingTab,
+  NEUROLOGICAL_MONITORING: ConsultationNeurologicalMonitoringTab,
+  VENTILATOR: ConsultationVentilatorTab,
+  NUTRITION: ConsultationNursingTab,
+  PRESSURE_SORE: ConsultationPressureSoreTab,
+  DIALYSIS: ConsultationDialysisTab,
+};
+
 export const ConsultationDetails = (props: any) => {
   const { t } = useTranslation();
   const { facilityId, patientId, consultationId } = props;
-  const tab = props.tab.toUpperCase();
+  const tab = props.tab.toUpperCase() as keyof typeof TABS;
   const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [showDoctors, setShowDoctors] = useState(false);
@@ -63,6 +83,7 @@ export const ConsultationDetails = (props: any) => {
     {} as ConsultationModel
   );
   const [patientData, setPatientData] = useState<PatientModel>({});
+  const [activeShiftingData, setActiveShiftingData] = useState<Array<any>>([]);
   const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
     useState(false);
   const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
@@ -124,6 +145,15 @@ export const ConsultationDetails = (props: any) => {
             };
             setPatientData(data);
           }
+
+          // Get shifting data
+          const shiftingRes = await dispatch(
+            listShiftRequests({ patient: id }, "shift-list-call")
+          );
+          if (shiftingRes?.data?.results) {
+            const data = shiftingRes.data.results;
+            setActiveShiftingData(data);
+          }
         } else {
           navigate("/not-found");
         }
@@ -142,22 +172,6 @@ export const ConsultationDetails = (props: any) => {
     });
   }, []);
 
-  const TABS = {
-    UPDATES: ConsultationUpdatesTab,
-    FEED: ConsultationFeedTab,
-    SUMMARY: ConsultationSummaryTab,
-    MEDICINES: ConsultationMedicinesTab,
-    FILES: ConsultationFilesTab,
-    INVESTIGATIONS: ConsultationInvestigationsTab,
-    ABG: ConsultationABGTab,
-    NURSING: ConsultationNursingTab,
-    NEUROLOGICAL_MONITORING: ConsultationNeurologicalMonitoringTab,
-    VENTILATOR: ConsultationVentilatorTab,
-    NUTRITION: ConsultationNursingTab,
-    PRESSURE_SORE: ConsultationPressureSoreTab,
-    DIALYSIS: ConsultationDialysisTab,
-  };
-
   const consultationTabProps: ConsultationTabProps = {
     consultationId,
     facilityId,
@@ -168,6 +182,19 @@ export const ConsultationDetails = (props: any) => {
 
   const SelectedTab = TABS[tab];
 
+  const hasActiveShiftingRequest = () => {
+    if (activeShiftingData.length > 0) {
+      return [
+        "PENDING",
+        "APPROVED",
+        "DESTINATION APPROVED",
+        "PATIENT TO BE PICKED UP",
+      ].includes(activeShiftingData[activeShiftingData.length - 1].status);
+    }
+
+    return false;
+  };
+
   if (isLoading) {
     return <Loading />;
   }
@@ -191,10 +218,20 @@ export const ConsultationDetails = (props: any) => {
     return diagnoses.length ? (
       <div className="w-full text-sm">
         <p className="font-semibold leading-relaxed">{label}</p>
-
-        {diagnoses.slice(0, !showMore ? nshow : undefined).map((diagnosis) => (
-          <p>{diagnosis.label}</p>
-        ))}
+        {diagnoses.slice(0, !showMore ? nshow : undefined).map((diagnosis) =>
+          diagnosis.id === consultationData.icd11_principal_diagnosis ? (
+            <div className="relative flex items-center gap-2">
+              <p>{diagnosis.label}</p>
+              <div>
+                <ToolTip text="Principal Diagnosis" position="BOTTOM">
+                  <CareIcon className="care-l-stethoscope rounded-lg bg-primary-500  p-1 text-2xl text-white" />
+                </ToolTip>
+              </div>
+            </div>
+          ) : (
+            <p>{diagnosis.label}</p>
+          )
+        )}
         {diagnoses.length > nshow && (
           <>
             {!showMore ? (
@@ -255,17 +292,33 @@ export const ConsultationDetails = (props: any) => {
           <div className="-right-6 top-0 flex w-full flex-col space-y-1 sm:w-min sm:flex-row sm:items-center sm:space-y-0 sm:divide-x-2 lg:absolute xl:right-0">
             {!consultationData.discharge_date && (
               <div className="flex w-full flex-col px-2 sm:flex-row">
-                <ButtonV2
-                  onClick={() =>
-                    navigate(
-                      `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
-                    )
-                  }
-                  className="btn btn-primary m-1 w-full hover:text-white"
-                >
-                  <CareIcon className="care-l-ambulance h-5 w-5" />
-                  Shift Patient
-                </ButtonV2>
+                {hasActiveShiftingRequest() ? (
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/shifting/${
+                          activeShiftingData[activeShiftingData.length - 1].id
+                        }`
+                      )
+                    }
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    <CareIcon className="care-l-ambulance h-5 w-5" />
+                    Track Shifting
+                  </ButtonV2>
+                ) : (
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/facility/${patientData.facility}/patient/${patientData.id}/shift/new`
+                      )
+                    }
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    <CareIcon className="care-l-ambulance h-5 w-5" />
+                    Shift Patient
+                  </ButtonV2>
+                )}
                 <button
                   onClick={() => {
                     triggerGoal("Doctor Connect Clicked", {
@@ -359,22 +412,6 @@ export const ConsultationDetails = (props: any) => {
                   </div>
                 )*/}
 
-                {consultationData.icd11_principal_diagnosis && (
-                  <ShowDiagnosis
-                    label="Principal Diagnosis (as per ICD-11 recommended by WHO)"
-                    diagnoses={[
-                      [
-                        ...(consultationData?.icd11_diagnoses_object ?? []),
-                        ...(consultationData?.icd11_provisional_diagnoses_object ??
-                          []),
-                      ].find(
-                        (d) =>
-                          d.id === consultationData.icd11_principal_diagnosis
-                      )!,
-                    ]}
-                  />
-                )}
-
                 <ShowDiagnosis
                   diagnoses={
                     consultationData?.icd11_provisional_diagnoses_object
@@ -385,13 +422,7 @@ export const ConsultationDetails = (props: any) => {
                 <ShowDiagnosis
                   diagnoses={[
                     ...(consultationData?.diagnosis
-                      ? [
-                          {
-                            id: "0",
-                            label: consultationData?.diagnosis,
-                            parentId: null,
-                          },
-                        ]
+                      ? [{ id: "0", label: consultationData?.diagnosis }]
                       : []),
                     ...(consultationData?.icd11_diagnoses_object ?? []),
                   ]}
@@ -402,7 +433,7 @@ export const ConsultationDetails = (props: any) => {
                   consultationData.deprecated_verified_by) && (
                   <div className="mt-2 text-sm">
                     <span className="font-semibold leading-relaxed">
-                      Verified By:{" "}
+                      Treating Physician:{" "}
                     </span>
                     {consultationData.verified_by_object
                       ? `${consultationData.verified_by_object.first_name} ${consultationData.verified_by_object.last_name}`
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 49028a62953..01a5f02b7b1 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -97,7 +97,7 @@ type FormDetails = {
   procedure: ProcedureType[];
   investigation: InvestigationType[];
   is_telemedicine: BooleanStrings;
-  action?: string;
+  action?: number;
   assigned_to: string;
   assigned_to_object: UserModel | null;
   special_instruction: string;
@@ -123,7 +123,7 @@ const initForm: FormDetails = {
   facility: "",
   admitted: "false",
   admitted_to: "",
-  category: "Comfort",
+  category: "",
   admission_date: new Date(),
   discharge_date: null,
   referred_to: "",
@@ -143,7 +143,7 @@ const initForm: FormDetails = {
   procedure: [],
   investigation: [],
   is_telemedicine: "false",
-  action: "NO_ACTION",
+  action: 10,
   assigned_to: "",
   assigned_to_object: null,
   special_instruction: "",
@@ -279,15 +279,14 @@ export const ConsultationForm = (props: any) => {
         setIsLoading(true);
         const res = await dispatchAction(getPatient({ id: patientId }));
         if (res.data) {
-          setPatientName(res.data.name);
-          setFacilityName(res.data.facility_object.name);
           if (isUpdate) {
-            const form = { ...state.form };
-            form.action = TELEMEDICINE_ACTIONS.find(
-              (a) => a.id === res.data.action
-            )?.text;
-            dispatch({ type: "set_form", form });
+            dispatch({
+              type: "set_form",
+              form: { ...state.form, action: res.data.action },
+            });
           }
+          setPatientName(res.data.name);
+          setFacilityName(res.data.facility_object.name);
         }
       } else {
         setPatientName("");
@@ -302,6 +301,49 @@ export const ConsultationForm = (props: any) => {
     !!state.form.symptoms.length && !state.form.symptoms.includes(1);
   const isOtherSymptomsSelected = state.form.symptoms.includes(9);
 
+  const handleFormFieldChange: FieldChangeEventHandler<unknown> = (event) => {
+    if (event.name === "consultation_status" && event.value === "1") {
+      dispatch({
+        type: "set_form",
+        form: {
+          ...state.form,
+          consultation_status: 1,
+          symptoms: [1],
+          symptoms_onset_date: new Date(),
+          category: "Critical",
+          suggestion: "DD",
+        },
+      });
+    } else if (event.name === "suggestion" && event.value === "DD") {
+      dispatch({
+        type: "set_form",
+        form: {
+          ...state.form,
+          suggestion: "DD",
+          consultation_notes: "Patient declared dead",
+          verified_by: "Declared Dead",
+        },
+      });
+    } else if (
+      event.name === "icd11_diagnoses_object" ||
+      event.name === "icd11_provisional_diagnoses_object"
+    ) {
+      dispatch({
+        type: "set_form",
+        form: {
+          ...state.form,
+          [event.name]: event.value,
+          icd11_principal_diagnosis: undefined,
+        },
+      });
+    } else {
+      dispatch({
+        type: "set_form",
+        form: { ...state.form, [event.name]: event.value },
+      });
+    }
+  };
+
   const fetchData = useCallback(
     async (status: statusType) => {
       if (!patientId) setIsLoading(true);
@@ -331,8 +373,8 @@ export const ConsultationForm = (props: any) => {
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
             category: res.data.category
               ? PATIENT_CATEGORIES.find((i) => i.text === res.data.category)
-                  ?.id ?? "Comfort"
-              : "Comfort",
+                  ?.id ?? ""
+              : "",
             patient_no: res.data.patient_no ?? "",
             OPconsultation: res.data.consultation_notes,
             is_telemedicine: `${res.data.is_telemedicine}`,
@@ -352,7 +394,7 @@ export const ConsultationForm = (props: any) => {
             death_confirmed_doctor: res.data?.death_confirmed_doctor || "",
             InvestigationAdvice: res.data.investigation,
           };
-          dispatch({ type: "set_form", form: formData });
+          dispatch({ type: "set_form", form: { ...state.form, ...formData } });
           setBed(formData.bed);
 
           if (res.data.last_daily_round) {
@@ -364,7 +406,7 @@ export const ConsultationForm = (props: any) => {
         setIsLoading(false);
       }
     },
-    [dispatchAction, id]
+    [dispatchAction, id, patientName, patientId]
   );
 
   useAbortableEffect(
@@ -539,7 +581,7 @@ export const ConsultationForm = (props: any) => {
 
         case "verified_by": {
           if (state.form.suggestion !== "DD" && !state.form[field]) {
-            errors[field] = "Please fill verified by";
+            errors[field] = "Please fill treating physician";
             invalidForm = true;
             break;
           }
@@ -745,49 +787,6 @@ export const ConsultationForm = (props: any) => {
     }
   };
 
-  const handleFormFieldChange: FieldChangeEventHandler<unknown> = (event) => {
-    if (event.name === "consultation_status" && event.value === "1") {
-      dispatch({
-        type: "set_form",
-        form: {
-          ...state.form,
-          consultation_status: 1,
-          symptoms: [1],
-          symptoms_onset_date: new Date(),
-          category: "Critical",
-          suggestion: "DD",
-        },
-      });
-    } else if (event.name === "suggestion" && event.value === "DD") {
-      dispatch({
-        type: "set_form",
-        form: {
-          ...state.form,
-          suggestion: "DD",
-          consultation_notes: "Patient declared dead",
-          verified_by: "Declared Dead",
-        },
-      });
-    } else if (
-      event.name === "icd11_diagnoses_object" ||
-      event.name === "icd11_provisional_diagnoses_object"
-    ) {
-      dispatch({
-        type: "set_form",
-        form: {
-          ...state.form,
-          [event.name]: event.value,
-          icd11_principal_diagnosis: undefined,
-        },
-      });
-    } else {
-      dispatch({
-        type: "set_form",
-        form: { ...state.form, [event.name]: event.value },
-      });
-    }
-  };
-
   const handleDoctorSelect = (event: FieldChangeEvent<UserModel | null>) => {
     if (event.value?.id) {
       dispatch({
@@ -1321,7 +1320,7 @@ export const ConsultationForm = (props: any) => {
                           >
                             <UserAutocompleteFormField
                               name={"verified_by"}
-                              label="Verified by"
+                              label="Treating Physician"
                               placeholder="Attending Doctors Name and Designation"
                               required
                               value={state.form.verified_by_object ?? undefined}
@@ -1347,12 +1346,12 @@ export const ConsultationForm = (props: any) => {
                             </div>
                             <div className="flex-1" ref={fieldRef["action"]}>
                               <SelectFormField
-                                {...field("action")}
+                                {...selectField("action")}
                                 label="Action"
                                 position="above"
                                 options={TELEMEDICINE_ACTIONS}
                                 optionLabel={(option) => option.desc}
-                                optionValue={(option) => option.text}
+                                optionDescription={() => ""}
                               />
                             </div>
                           </div>
diff --git a/src/Components/Facility/Consultations/Feed.tsx b/src/Components/Facility/Consultations/Feed.tsx
index 84b3e62ef9e..75ab72d168c 100644
--- a/src/Components/Facility/Consultations/Feed.tsx
+++ b/src/Components/Facility/Consultations/Feed.tsx
@@ -30,7 +30,7 @@ import { useDispatch } from "react-redux";
 import { useHLSPLayer } from "../../../Common/hooks/useHLSPlayer";
 import useKeyboardShortcut from "use-keyboard-shortcut";
 import useFullscreen from "../../../Common/hooks/useFullscreen.js";
-import { triggerGoal } from "../../Common/Plausible.js";
+import { triggerGoal } from "../../../Integrations/Plausible.js";
 import useAuthUser from "../../../Common/hooks/useAuthUser.js";
 
 interface IFeedProps {
diff --git a/src/Components/Facility/Consultations/NeurologicalTables.tsx b/src/Components/Facility/Consultations/NeurologicalTables.tsx
index 79a0675a708..89e9d598604 100644
--- a/src/Components/Facility/Consultations/NeurologicalTables.tsx
+++ b/src/Components/Facility/Consultations/NeurologicalTables.tsx
@@ -411,7 +411,9 @@ export const NeurologicalTable = (props: any) => {
           <div className="my-2 text-xl font-semibold">Scale Description</div>
           <div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
             <div className="rounded-lg border bg-white px-4 py-2 shadow">
-              <div className="mb-2 text-xl font-semibold">Eye Open</div>
+              <div className="mb-2 text-xl font-semibold">
+                Eye Opening Response
+              </div>
               <div>
                 {EYE_OPEN_SCALE.map((x: any) => (
                   <div
diff --git a/src/Components/Facility/DischargeModal.tsx b/src/Components/Facility/DischargeModal.tsx
index 8376a0ad299..b069b371a72 100644
--- a/src/Components/Facility/DischargeModal.tsx
+++ b/src/Components/Facility/DischargeModal.tsx
@@ -75,7 +75,7 @@ const DischargeModal = ({
   const [latestClaim, setLatestClaim] = useState<HCXClaimModel>();
   const [isCreateClaimLoading, setIsCreateClaimLoading] = useState(false);
   const [isSendingDischargeApi, setIsSendingDischargeApi] = useState(false);
-  const [facility, setFacility] = useState<FacilityModel>({ id: 0, name: "" }); // for referred to external
+  const [facility, setFacility] = useState<FacilityModel>();
   const [errors, setErrors] = useState<any>({});
 
   const fetchLatestClaim = useCallback(async () => {
@@ -186,12 +186,13 @@ const DischargeModal = ({
   const prescriptionActions = PrescriptionActions(consultationData.id ?? "");
 
   const handleFacilitySelect = (selected: FacilityModel) => {
-    setFacility(selected ? selected : facility);
-    const { id, name } = selected;
+    setFacility(selected);
+    const { id, name } = selected || {};
     const isExternal = id === -1;
     setPreDischargeForm((prev) => ({
       ...prev,
-      ...(isExternal ? { referred_to_external: name } : { referred_to: id }),
+      referred_to: isExternal ? null : id,
+      referred_to_external: isExternal ? name : null,
     }));
   };
 
@@ -238,8 +239,8 @@ const DischargeModal = ({
                 handleFacilitySelect(selected as FacilityModel)
               }
               selected={facility}
-              showAll={true}
-              freeText={true}
+              showAll
+              freeText
               multiple={false}
               errors={errors?.referred_to}
               className="mb-4"
diff --git a/src/Components/Facility/FacilityCard.tsx b/src/Components/Facility/FacilityCard.tsx
index e66fc4f3cc2..43e515cec93 100644
--- a/src/Components/Facility/FacilityCard.tsx
+++ b/src/Components/Facility/FacilityCard.tsx
@@ -9,7 +9,7 @@ import ButtonV2, { Cancel, Submit } from "../Common/components/ButtonV2";
 import * as Notification from "../../Utils/Notifications.js";
 import Chip from "../../CAREUI/display/Chip";
 import CareIcon from "../../CAREUI/icons/CareIcon";
-import { parsePhoneNumber } from "libphonenumber-js";
+import { formatPhoneNumber, parsePhoneNumber } from "../../Utils/utils";
 import DialogModal from "../Common/Dialog";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import useConfig from "../../Common/hooks/useConfig";
@@ -147,10 +147,9 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
                     href={`tel:${facility.phone_number}`}
                     className="text-sm font-semibold tracking-wider"
                   >
-                    {parsePhoneNumber(
-                      facility.phone_number as string,
-                      "IN"
-                    ).formatInternational() || "-"}
+                    {formatPhoneNumber(
+                      parsePhoneNumber(facility.phone_number as string) ?? "-"
+                    )}
                   </a>
                 </div>
               </div>
diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx
index d1243daaf1d..e742caefb82 100644
--- a/src/Components/Facility/FacilityCreate.tsx
+++ b/src/Components/Facility/FacilityCreate.tsx
@@ -26,7 +26,11 @@ import {
   listDoctor,
   updateFacility,
 } from "../../Redux/actions";
-import { getPincodeDetails, includesIgnoreCase } from "../../Utils/utils";
+import {
+  getPincodeDetails,
+  includesIgnoreCase,
+  parsePhoneNumber,
+} from "../../Utils/utils";
 import {
   phonePreg,
   validateLatitude,
@@ -51,11 +55,11 @@ import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 
 import { navigate } from "raviger";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
 import useAppHistory from "../../Common/hooks/useAppHistory";
 import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
+import { PhoneNumberValidator } from "../Form/FieldValidators.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -434,11 +438,11 @@ export const FacilityCreate = (props: FacilityProps) => {
           return;
         case "phone_number":
           // eslint-disable-next-line no-case-declarations
-          const phoneNumber = parsePhoneNumberFromString(state.form[field]);
+          const phoneNumber = state.form[field];
           if (
-            !state.form[field] ||
-            !phoneNumber?.isPossible() ||
-            !phonePreg(String(phoneNumber?.number))
+            !phoneNumber ||
+            !PhoneNumberValidator()(phoneNumber) === undefined ||
+            !phonePreg(phoneNumber)
           ) {
             errors[field] = t("invalid_phone_number");
             invalidForm = true;
@@ -488,9 +492,7 @@ export const FacilityCreate = (props: FacilityProps) => {
         kasp_empanelled: JSON.parse(state.form.kasp_empanelled),
         latitude: state.form.latitude || null,
         longitude: state.form.longitude || null,
-        phone_number: parsePhoneNumberFromString(
-          state.form.phone_number
-        )?.format("E.164"),
+        phone_number: parsePhoneNumber(state.form.phone_number),
         oxygen_capacity: state.form.oxygen_capacity
           ? state.form.oxygen_capacity
           : 0,
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index 81e7fa4906f..15317b1b56c 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -575,6 +575,7 @@ export const FacilityHome = (props: any) => {
                   Resource Request
                 </DropdownItem>
                 <DropdownItem
+                  id="create-assets"
                   onClick={() => navigate(`/facility/${facilityId}/assets/new`)}
                   authorizeFor={NonReadOnlyUsers}
                   icon={<CareIcon className="care-l-plus-circle text-lg" />}
@@ -582,12 +583,14 @@ export const FacilityHome = (props: any) => {
                   Create Asset
                 </DropdownItem>
                 <DropdownItem
+                  id="view-assets"
                   onClick={() => navigate(`/assets?facility=${facilityId}`)}
                   icon={<CareIcon className="care-l-medkit text-lg" />}
                 >
                   View Assets
                 </DropdownItem>
                 <DropdownItem
+                  id="view-users"
                   onClick={() => navigate(`/facility/${facilityId}/users`)}
                   icon={<CareIcon className="care-l-users-alt text-lg" />}
                 >
diff --git a/src/Components/Facility/Investigations/Reports/ReportTable.tsx b/src/Components/Facility/Investigations/Reports/ReportTable.tsx
index 0826ff904fc..1f20ec94180 100644
--- a/src/Components/Facility/Investigations/Reports/ReportTable.tsx
+++ b/src/Components/Facility/Investigations/Reports/ReportTable.tsx
@@ -2,7 +2,7 @@ import { getColorIndex, rowColor, transformData } from "./utils";
 
 import ButtonV2 from "../../../Common/components/ButtonV2";
 import { InvestigationResponse } from "./types";
-import { formatDateTime } from "../../../../Utils/utils";
+import { formatAge, formatDateTime } from "../../../../Utils/utils";
 import { FC } from "react";
 
 const ReportRow = ({ data, name, min, max }: any) => {
@@ -53,6 +53,7 @@ interface ReportTableProps {
   patientDetails?: {
     name: string;
     age: number;
+    date_of_birth: string;
     hospitalName: string;
   };
   investigationData: InvestigationResponse;
@@ -83,7 +84,14 @@ const ReportTable: FC<ReportTableProps> = ({
         {patientDetails && (
           <div className="flex flex-col gap-1 p-1">
             <p>Name: {patientDetails.name}</p>
-            <p>Age: {patientDetails.age}</p>
+            <p>
+              Age:{" "}
+              {formatAge(
+                patientDetails.age,
+                patientDetails.date_of_birth,
+                true
+              )}
+            </p>
             <p>Hospital: {patientDetails.hospitalName}</p>
           </div>
         )}
diff --git a/src/Components/Facility/Investigations/Reports/index.tsx b/src/Components/Facility/Investigations/Reports/index.tsx
index c4c69bc9169..ab5380c62ca 100644
--- a/src/Components/Facility/Investigations/Reports/index.tsx
+++ b/src/Components/Facility/Investigations/Reports/index.tsx
@@ -100,8 +100,9 @@ const InvestigationReports = ({ id }: any) => {
   const [patientDetails, setPatientDetails] = useState<{
     name: string;
     age: number;
+    date_of_birth: string;
     hospitalName: string;
-  }>({ name: "", age: -1, hospitalName: "" });
+  }>({ name: "", age: -1, date_of_birth: "", hospitalName: "" });
   const [state, dispatch] = useReducer(
     investigationReportsReducer,
     initialState
@@ -220,6 +221,7 @@ const InvestigationReports = ({ id }: any) => {
           setPatientDetails({
             name: res.data.name,
             age: res.data.age,
+            date_of_birth: res.data.date_of_birth,
             hospitalName: res.data.facility_object.name,
           });
         }
@@ -227,6 +229,7 @@ const InvestigationReports = ({ id }: any) => {
         setPatientDetails({
           name: "",
           age: -1,
+          date_of_birth: "",
           hospitalName: "",
         });
       }
diff --git a/src/Components/Facility/LegacyMonitorCard.tsx b/src/Components/Facility/LegacyMonitorCard.tsx
index 9f9fb8f1ea0..61bff3d607b 100644
--- a/src/Components/Facility/LegacyMonitorCard.tsx
+++ b/src/Components/Facility/LegacyMonitorCard.tsx
@@ -4,6 +4,7 @@ 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;
@@ -28,7 +29,7 @@ export const LegacyMonitorCard = ({
           {patient.name}
         </Link>
         <span>
-          {patient.age}y |{" "}
+          {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">
diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index dbca307d38b..3fbd80ac8b2 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -10,7 +10,7 @@ import { statusType, useAbortableEffect } from "../../Common/utils";
 import { PatientModel } from "../Patient/models";
 
 import { GENDER_TYPES } from "../../Common/constants";
-import { formatDate, formatDateTime } from "../../Utils/utils";
+import { formatAge, formatDate, formatDateTime } from "../../Utils/utils";
 const Loading = lazy(() => import("../Common/Loading"));
 
 const TreatmentSummary = (props: any) => {
@@ -132,7 +132,8 @@ const TreatmentSummary = (props: any) => {
 
               <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> {patientData.age}
+                  <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 md:border-b-0 md:border-r-2">
                   <b>Date of admission :</b>
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index cc34140e7a9..de2c6af698a 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -223,5 +223,4 @@ export interface CurrentBed {
 export type ICD11DiagnosisModel = {
   id: string;
   label: string;
-  parentId: string | null;
 };
diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
index d06067af957..5f33c6388c5 100644
--- a/src/Components/Form/AutoCompleteAsync.tsx
+++ b/src/Components/Form/AutoCompleteAsync.tsx
@@ -7,6 +7,7 @@ import {
   MultiSelectOptionChip,
   dropdownOptionClassNames,
 } from "./MultiSelectMenuV2";
+import { useTranslation } from "react-i18next";
 
 interface Props {
   name?: string;
@@ -23,6 +24,7 @@ interface Props {
   placeholder?: string;
   disabled?: boolean;
   error?: string;
+  required?: boolean;
   onBlur?: () => void;
   onFocus?: () => void;
 }
@@ -42,11 +44,13 @@ const AutoCompleteAsync = (props: Props) => {
     className = "",
     placeholder,
     disabled = false,
+    required = false,
     error,
   } = props;
   const [data, setData] = useState([]);
   const [query, setQuery] = useState("");
   const [loading, setLoading] = useState(false);
+  const { t } = useTranslation();
 
   const hasSelection =
     (!multiple && selected) || (multiple && selected?.length > 0);
@@ -86,9 +90,7 @@ const AutoCompleteAsync = (props: Props) => {
                   : placeholder || "Start typing to search..."
               }
               displayValue={() =>
-                hasSelection && !multiple
-                  ? optionLabel && optionLabel(selected)
-                  : ""
+                hasSelection && !multiple ? optionLabel?.(selected) : ""
               }
               onChange={({ target }) => setQuery(target.value)}
               onFocus={props.onFocus}
@@ -100,6 +102,20 @@ const AutoCompleteAsync = (props: Props) => {
             />
             <Combobox.Button className="absolute inset-y-0 right-0 flex items-center pr-2">
               <div className="absolute right-0 top-1 mr-2 flex items-center text-lg text-secondary-900">
+                {hasSelection && !loading && !required && (
+                  <div className="tooltip">
+                    <CareIcon
+                      className="care-l-times-circle mb-[-5px] h-4 w-4 text-gray-800 transition-colors duration-200 ease-in-out hover:text-gray-500"
+                      onClick={(e) => {
+                        e.preventDefault();
+                        onChange(null);
+                      }}
+                    />
+                    <span className="tooltip-text tooltip-bottom -translate-x-1/2 text-xs">
+                      {t("clear_selection")}
+                    </span>
+                  </div>
+                )}
                 {loading ? (
                   <CareIcon className="care-l-spinner -mb-1.5 animate-spin" />
                 ) : (
diff --git a/src/Components/Form/FormFields/Autocomplete.tsx b/src/Components/Form/FormFields/Autocomplete.tsx
index dcf3ab5e8b6..c4b3ea3686e 100644
--- a/src/Components/Form/FormFields/Autocomplete.tsx
+++ b/src/Components/Form/FormFields/Autocomplete.tsx
@@ -157,6 +157,7 @@ export const Autocomplete = <T, V>(props: AutocompleteProps<T, V>) => {
               placeholder={props.placeholder ?? "Select"}
               displayValue={(value: any) => value?.label || ""}
               onChange={(event) => setQuery(event.target.value.toLowerCase())}
+              onBlur={() => value && setQuery("")}
               autoComplete="off"
             />
             <Combobox.Button className="absolute inset-y-0 right-0 flex items-center pr-2">
@@ -164,7 +165,7 @@ export const Autocomplete = <T, V>(props: AutocompleteProps<T, V>) => {
                 <span>{value?.icon}</span>
 
                 {value && !props.isLoading && !props.required && (
-                  <div className="tooltip">
+                  <div className="tooltip" id="clear-button">
                     <CareIcon
                       className="care-l-times-circle h-4 w-4 text-gray-800 transition-colors duration-200 ease-in-out hover:text-gray-500"
                       onClick={(e) => {
diff --git a/src/Components/Form/FormFields/PhoneNumberFormField.tsx b/src/Components/Form/FormFields/PhoneNumberFormField.tsx
index 64c93c51500..6aa70f801de 100644
--- a/src/Components/Form/FormFields/PhoneNumberFormField.tsx
+++ b/src/Components/Form/FormFields/PhoneNumberFormField.tsx
@@ -1,12 +1,13 @@
 import { FormFieldBaseProps, useFormFieldPropsResolver } from "./Utils";
 import FormField from "./FormField";
+import { useEffect, useMemo, useState } from "react";
 import {
-  AsYouType,
-  isValidPhoneNumber,
+  classNames,
   parsePhoneNumber,
-} from "libphonenumber-js";
-import { useMemo, useState } from "react";
-import { classNames } from "../../../Utils/utils";
+  formatPhoneNumber as formatPhoneNumberUtil,
+  getCountryCode,
+  CountryData,
+} from "../../../Utils/utils";
 import phoneCodesJson from "../../../Common/static/countryPhoneAndFlags.json";
 import {
   FieldError,
@@ -15,12 +16,6 @@ import {
 } from "../FieldValidators";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
 
-interface CountryData {
-  flag: string;
-  name: string;
-  code: string;
-}
-
 const phoneCodes: Record<string, CountryData> = phoneCodesJson;
 
 interface Props extends FormFieldBaseProps<string> {
@@ -39,21 +34,6 @@ export default function PhoneNumberFormField(props: Props) {
     [props.types]
   );
 
-  const asYouType = useMemo(() => {
-    const asYouType = new AsYouType();
-
-    asYouType.reset();
-
-    if (field.value) {
-      asYouType.input(field.value);
-    } else {
-      asYouType.input("+91");
-      field.handleChange(asYouType.getNumberValue());
-    }
-
-    return asYouType;
-  }, []);
-
   const validate = useMemo(
     () => (value: string | undefined, event: "blur" | "change") => {
       if (!value || props.disableValidation) {
@@ -73,9 +53,9 @@ export default function PhoneNumberFormField(props: Props) {
 
   const setValue = (value: string) => {
     value = value.replaceAll(/[^0-9+]/g, "");
-
-    asYouType.reset();
-    asYouType.input(value);
+    if (value.length > 12 && value.startsWith("+910")) {
+      value = "+91" + value.slice(4);
+    }
 
     const error = validate(value, "change");
     field.handleChange(value);
@@ -83,6 +63,8 @@ export default function PhoneNumberFormField(props: Props) {
     setError(error);
   };
 
+  useEffect(() => setValue(field.value || "+91"), []);
+
   return (
     <FormField
       field={{
@@ -106,7 +88,7 @@ export default function PhoneNumberFormField(props: Props) {
           )}
           maxLength={field.value?.startsWith("1800") ? 11 : 15}
           placeholder={props.placeholder}
-          value={formatPhoneNumber(field.value)}
+          value={formatPhoneNumber(field.value, props.types)}
           onChange={(e) => setValue(e.target.value)}
           disabled={field.disabled}
           onBlur={() => setError(validate(field.value, "blur"))}
@@ -122,7 +104,7 @@ export default function PhoneNumberFormField(props: Props) {
             autoComplete="country"
             className="cui-input-base h-full border-0 bg-transparent pl-2 pr-8 text-end font-medium tracking-wider text-gray-700 focus:ring-2 focus:ring-inset"
             value={
-              asYouType.getCountry() ??
+              getCountryCode(field.value) ??
               (field.value?.startsWith("1800") ? "1800" : "Other")
             }
             onChange={(e) => {
@@ -176,15 +158,15 @@ const conditionPhoneCode = (code: string) => {
   return code.startsWith("+") ? code : "+" + code;
 };
 
-const formatPhoneNumber = (value: string) => {
+const formatPhoneNumber = (value: string, types: PhoneNumberType[]) => {
   if (value === undefined || value === null) {
     return "+91 ";
   }
 
-  if (!isValidPhoneNumber(value)) {
+  if (PhoneNumberValidator(types)(value) !== undefined || value.length < 13) {
     return value;
   }
 
   const phoneNumber = parsePhoneNumber(value);
-  return phoneNumber.formatInternational();
+  return phoneNumber ? formatPhoneNumberUtil(phoneNumber) : value;
 };
diff --git a/src/Components/Medicine/MedibaseAutocompleteFormField.tsx b/src/Components/Medicine/MedibaseAutocompleteFormField.tsx
index 337546691f9..2b5612f6f32 100644
--- a/src/Components/Medicine/MedibaseAutocompleteFormField.tsx
+++ b/src/Components/Medicine/MedibaseAutocompleteFormField.tsx
@@ -49,7 +49,7 @@ export default function MedibaseAutocompleteFormField(
         value={field.value}
         required
         onChange={field.handleChange}
-        options={options(field.value && [field.value])}
+        options={options(field.value && !query && [field.value])}
         optionLabel={(option) => option.name.toUpperCase()}
         optionDescription={(option) => <OptionDescription medicine={option} />}
         optionValue={(option) => option}
diff --git a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
index 81282126d7c..470caa1042b 100644
--- a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
+++ b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
@@ -47,6 +47,10 @@ export default function PrescriptionAdministrationsTable({
   const { t } = useTranslation();
 
   const [state, setState] = useState<State>();
+
+  const [showDiscontinued, setShowDiscontinued] = useState(false);
+  const [discontinuedCount, setDiscontinuedCount] = useState<number>();
+
   const pagination = useRangePagination({
     bounds: state?.administrationsTimeBounds ?? {
       start: new Date(),
@@ -54,7 +58,8 @@ export default function PrescriptionAdministrationsTable({
     },
     perPage: 24 * 60 * 60 * 1000,
     slots: 24,
-    defaultEnd: true,
+    snapToLatest: true,
+    reverse: true,
   });
   const [showBulkAdminister, setShowBulkAdminister] = useState(false);
 
@@ -64,8 +69,13 @@ export default function PrescriptionAdministrationsTable({
   );
 
   const refetch = useCallback(async () => {
+    const filters = {
+      is_prn: prn,
+      prescription_type: "REGULAR",
+    };
+
     const res = await dispatch(
-      list({ is_prn: prn, prescription_type: "REGULAR" })
+      list(showDiscontinued ? filters : { ...filters, discontinued: false })
     );
 
     setState({
@@ -74,7 +84,14 @@ export default function PrescriptionAdministrationsTable({
       ),
       administrationsTimeBounds: getAdministrationBounds(res.data.results),
     });
-  }, [consultation_id, dispatch]);
+
+    if (showDiscontinued === false) {
+      const discontinuedRes = await dispatch(
+        list({ ...filters, discontinued: true, limit: 0 })
+      );
+      setDiscontinuedCount(discontinuedRes.data.count);
+    }
+  }, [consultation_id, showDiscontinued, dispatch]);
 
   useEffect(() => {
     refetch();
@@ -141,17 +158,22 @@ export default function PrescriptionAdministrationsTable({
         }
       />
 
-      <div className="overflow-x-auto rounded border border-white shadow">
-        <table className="w-full overflow-x-scroll whitespace-nowrap rounded">
+      <div className="relative overflow-x-auto rounded border border-white shadow">
+        <table className="w-full whitespace-nowrap rounded">
           <thead className="bg-white text-xs font-medium text-black">
             <tr>
-              <th className="py-3 pl-4 text-left text-sm">{t("medicine")}</th>
-
-              <th className="px-2 text-center leading-none">
-                <p>Dosage &</p>
-                <p>
-                  {!state?.prescriptions[0]?.is_prn ? "Frequency" : "Indicator"}
-                </p>
+              <th className="sticky left-0 z-10 bg-white py-3 pl-4 text-left">
+                <div className="flex justify-between gap-2">
+                  <span className="text-sm">{t("medicine")}</span>
+                  <span className="hidden px-2 text-center text-xs leading-none lg:block">
+                    <p>Dosage &</p>
+                    <p>
+                      {!state?.prescriptions[0]?.is_prn
+                        ? "Frequency"
+                        : "Indicator"}
+                    </p>
+                  </span>
+                </div>
               </th>
 
               <th>
@@ -162,8 +184,10 @@ export default function PrescriptionAdministrationsTable({
                   border
                   className="mx-2 px-1"
                   variant="secondary"
-                  disabled={!pagination.hasPrevious}
-                  onClick={pagination.previous}
+                  disabled={!pagination.hasNext}
+                  onClick={pagination.next}
+                  tooltip="Next 24 hours"
+                  tooltipClassName="tooltip-bottom -translate-x-1/2 text-xs"
                 >
                   <CareIcon icon="l-angle-left-b" className="text-base" />
                 </ButtonV2>
@@ -177,24 +201,26 @@ export default function PrescriptionAdministrationsTable({
                       <p className="h-4 w-6 animate-pulse rounded bg-gray-500" />
                     </th>
                   ))
-                : pagination.slots?.map(({ start, end }, index) => (
-                    <th
-                      className="tooltip px-0.5 py-2 text-center font-semibold leading-none text-gray-900"
-                      key={index}
-                    >
-                      <p>{formatDateTime(start, "DD/MM")}</p>
-                      <p>{formatDateTime(start, "HH:mm")}</p>
-
-                      <span className="tooltip-text tooltip-top -translate-x-1/2 text-xs font-normal">
-                        Administration(s) between
-                        <br />
-                        <strong>{formatTime(start)}</strong> and{" "}
-                        <strong>{formatTime(end)}</strong>
-                        <br />
-                        on <strong>{formatDate(start)}</strong>
-                      </span>
-                    </th>
-                  ))}
+                : pagination.slots
+                    ?.map(({ start, end }, index) => (
+                      <th
+                        className="tooltip px-0.5 py-2 text-center font-semibold leading-none text-gray-900"
+                        key={index}
+                      >
+                        <p>{formatDateTime(end, "DD/MM")}</p>
+                        <p>{formatDateTime(end, "HH:mm")}</p>
+
+                        <span className="tooltip-text tooltip-top -translate-x-1/2 text-xs font-normal">
+                          Administration(s) between
+                          <br />
+                          <strong>{formatTime(start)}</strong> and{" "}
+                          <strong>{formatTime(end)}</strong>
+                          <br />
+                          on <strong>{formatDate(start)}</strong>
+                        </span>
+                      </th>
+                    ))
+                    .reverse()}
               <th>
                 <ButtonV2
                   size="small"
@@ -203,8 +229,10 @@ export default function PrescriptionAdministrationsTable({
                   border
                   className="mx-2 px-1"
                   variant="secondary"
-                  disabled={!pagination.hasNext}
-                  onClick={pagination.next}
+                  disabled={!pagination.hasPrevious}
+                  onClick={pagination.previous}
+                  tooltip="Previous 24 hours"
+                  tooltipClassName="tooltip-bottom -translate-x-1/2 text-xs"
                 >
                   <CareIcon icon="l-angle-right-b" className="text-base" />
                 </ButtonV2>
@@ -227,6 +255,23 @@ export default function PrescriptionAdministrationsTable({
           </tbody>
         </table>
 
+        {showDiscontinued === false && !!discontinuedCount && (
+          <ButtonV2
+            variant="secondary"
+            className="sticky left-0 z-10 w-full"
+            ghost
+            onClick={() => setShowDiscontinued(true)}
+          >
+            <span className="flex w-full justify-start gap-1 text-sm">
+              <CareIcon icon="l-eye" className="text-lg" />
+              <span>
+                Show <strong>{discontinuedCount}</strong> other discontinued
+                prescription(s)
+              </span>
+            </span>
+          </ButtonV2>
+        )}
+
         {state?.prescriptions.length === 0 && (
           <div className="my-16 flex w-full flex-col items-center justify-center gap-4 text-gray-500">
             <CareIcon className="care-l-tablets text-5xl" />
@@ -283,12 +328,7 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
   }, [prescription.id, dispatch, props.intervals]);
 
   return (
-    <tr
-      className={classNames(
-        "border-separate border border-gray-300 bg-gray-100 transition-all duration-200 ease-in-out hover:border-primary-300 hover:bg-primary-100"
-        // prescription.discontinued && "opacity-60"
-      )}
-    >
+    <>
       {showDiscontinue && (
         <DiscontinuePrescription
           prescription={prescription}
@@ -356,77 +396,89 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
           </div>
         </DialogModal>
       )}
-      <td
-        className="cursor-pointer py-3 pl-4 text-left"
-        onClick={() => setShowDetails(true)}
+      <tr
+        className={classNames(
+          "group border-separate border border-gray-300 bg-gray-100 transition-all duration-200 ease-in-out hover:border-primary-300 hover:bg-primary-100"
+          // prescription.discontinued && "opacity-60"
+        )}
       >
-        <div className="flex items-center gap-2">
-          <span
-            className={classNames(
-              "text-sm font-semibold",
-              prescription.discontinued ? "text-gray-700" : "text-gray-900"
-            )}
-          >
-            {prescription.medicine_object?.name ?? prescription.medicine_old}
-          </span>
+        <td
+          className="sticky left-0 z-10 cursor-pointer bg-gray-100 py-3 pl-4 text-left transition-all duration-200 ease-in-out group-hover:bg-primary-100"
+          onClick={() => setShowDetails(true)}
+        >
+          <div className="flex flex-col gap-1 lg:flex-row lg:justify-between lg:gap-2">
+            <div className="flex items-center gap-2">
+              <span
+                className={classNames(
+                  "text-sm font-semibold",
+                  prescription.discontinued ? "text-gray-700" : "text-gray-900"
+                )}
+              >
+                {prescription.medicine_object?.name ??
+                  prescription.medicine_old}
+              </span>
 
-          {prescription.discontinued && (
-            <span className="rounded-full border border-gray-500 bg-gray-200 px-1.5 text-xs font-medium text-gray-700">
-              {t("discontinued")}
-            </span>
-          )}
+              {prescription.discontinued && (
+                <span className="hidden rounded-full border border-gray-500 bg-gray-200 px-1.5 text-xs font-medium text-gray-700 lg:block">
+                  {t("discontinued")}
+                </span>
+              )}
 
-          {prescription.route && (
-            <span className="rounded-full border border-blue-500 bg-blue-100 px-1.5 text-xs font-medium text-blue-700">
-              {t(prescription.route)}
-            </span>
-          )}
-        </div>
-      </td>
-
-      <td className="text-center text-xs font-semibold text-gray-900">
-        <p>{prescription.dosage}</p>
-        <p>
-          {!prescription.is_prn
-            ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
-            : prescription.indicator}
-        </p>
-      </td>
-
-      <td />
-      {/* Administration Cells */}
-      {props.intervals.map(({ start, end }, index) => (
-        <td className="text-center" key={index}>
-          {administrations === undefined ? (
-            <CareIcon
-              icon="l-spinner"
-              className="animate-spin text-lg text-gray-500"
-            />
-          ) : (
-            <AdministrationCell
-              administrations={administrations}
-              interval={{ start, end }}
-              prescription={prescription}
-            />
-          )}
+              {prescription.route && (
+                <span className="hidden rounded-full border border-blue-500 bg-blue-100 px-1.5 text-xs font-medium text-blue-700 lg:block">
+                  {t(prescription.route)}
+                </span>
+              )}
+            </div>
+
+            <div className="flex gap-1 text-xs font-semibold text-gray-900 lg:flex-col lg:px-2 lg:text-center">
+              <p>{prescription.dosage}</p>
+              <p>
+                {!prescription.is_prn
+                  ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
+                  : prescription.indicator}
+              </p>
+            </div>
+          </div>
         </td>
-      ))}
-      <td />
-
-      {/* Action Buttons */}
-      <td className="space-x-1 pr-2 text-right">
-        <ButtonV2
-          type="button"
-          size="small"
-          disabled={prescription.discontinued}
-          ghost
-          border
-          onClick={() => setShowAdminister(true)}
-        >
-          {t("administer")}
-        </ButtonV2>
-      </td>
-    </tr>
+
+        <td />
+        {/* Administration Cells */}
+        {props.intervals
+          .map(({ start, end }, index) => (
+            <td className="text-center" key={index}>
+              {administrations === undefined ? (
+                <CareIcon
+                  icon="l-spinner"
+                  className="animate-spin text-lg text-gray-500"
+                />
+              ) : (
+                <AdministrationCell
+                  administrations={administrations}
+                  interval={{ start, end }}
+                  prescription={prescription}
+                />
+              )}
+            </td>
+          ))
+          .reverse()}
+        <td />
+
+        {/* Action Buttons */}
+        <td className="space-x-1 pr-2 text-right">
+          <ButtonV2
+            type="button"
+            size="small"
+            disabled={prescription.discontinued}
+            ghost
+            border
+            onClick={() => setShowAdminister(true)}
+          >
+            {t("administer")}
+          </ButtonV2>
+        </td>
+      </tr>
+    </>
   );
 };
 
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 351136e32d4..a84ad4a3e8b 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -42,7 +42,7 @@ const initForm: any = {
   other_symptoms: "",
   physical_examination_info: "",
   other_details: "",
-  patient_category: "Comfort",
+  patient_category: "",
   current_health: 0,
   recommend_discharge: false,
   action: null,
@@ -142,14 +142,14 @@ export const DailyRounds = (props: any) => {
       );
 
       if (!status.aborted) {
-        if (res && res.data) {
+        if (res?.data) {
           const data = {
             ...res.data,
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
-                )?.id || "Comfort"
-              : "Comfort",
+                )?.id ?? ""
+              : "",
             rhythm:
               (res.data.rhythm &&
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
@@ -186,8 +186,8 @@ export const DailyRounds = (props: any) => {
             patient_category: res.data.patient_category
               ? PATIENT_CATEGORIES.find(
                   (i) => i.text === res.data.patient_category
-                )?.id || "Comfort"
-              : "Comfort",
+                )?.id ?? ""
+              : "",
             rhythm:
               (res.data.rhythm &&
                 RHYTHM_CHOICES.find((i) => i.text === res.data.rhythm)?.id) ||
@@ -205,6 +205,12 @@ export const DailyRounds = (props: any) => {
     let invalidForm = false;
     Object.keys(state.form).forEach((field) => {
       switch (field) {
+        case "patient_category":
+          if (!state.form[field]) {
+            errors[field] = "Please select a category";
+            invalidForm = true;
+          }
+          return;
         case "other_symptoms":
           if (
             state.form.additional_symptoms?.includes(9) &&
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index 54d22b5f54c..6e83eb9bc91 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -36,15 +36,14 @@ import RecordMeta from "../../CAREUI/display/RecordMeta";
 import SearchInput from "../Form/SearchInput";
 import SortDropdownMenu from "../Common/SortDropdown";
 import SwitchTabs from "../Common/components/SwitchTabs";
-import SwipeableViews from "react-swipeable-views";
 import { parseOptionId } from "../../Common/utils";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
+import { formatAge, parsePhoneNumber } from "../../Utils/utils.js";
 import { useDispatch } from "react-redux";
 import useFilters from "../../Common/hooks/useFilters";
 import { useTranslation } from "react-i18next";
 import Page from "../Common/components/Page.js";
 import dayjs from "dayjs";
-import { triggerGoal } from "../Common/Plausible.js";
+import { triggerGoal } from "../../Integrations/Plausible.js";
 import useAuthUser from "../../Common/hooks/useAuthUser.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
@@ -161,12 +160,10 @@ export const PatientManager = () => {
       (qParams.is_active || "True"),
     disease_status: qParams.disease_status || undefined,
     phone_number: qParams.phone_number
-      ? parsePhoneNumberFromString(qParams.phone_number)?.format("E.164")
+      ? parsePhoneNumber(qParams.phone_number)
       : undefined,
     emergency_phone_number: qParams.emergency_phone_number
-      ? parsePhoneNumberFromString(qParams.emergency_phone_number)?.format(
-          "E.164"
-        )
+      ? parsePhoneNumber(qParams.emergency_phone_number)
       : undefined,
     local_body: qParams.lsgBody || undefined,
     facility: qParams.facility,
@@ -561,7 +558,9 @@ export const PatientManager = () => {
               <div className="flex w-full justify-between gap-2">
                 <div className="font-semibold">
                   <span className="text-xl capitalize">{patient.name}</span>
-                  <span className="ml-4 text-gray-800">{`${patient.age} yrs.`}</span>
+                  <span className="ml-4 text-gray-800">
+                    {formatAge(patient.age, patient.date_of_birth, true)}
+                  </span>
                 </div>
               </div>
 
@@ -987,14 +986,12 @@ export const PatientManager = () => {
       </div>
       <div>
         <PatientFilter {...advancedFilter} key={window.location.search} />
-        <SwipeableViews index={tabValue}>
-          <TabPanel value={tabValue} index={0}>
-            <div className="mb-4">{managePatients}</div>
-          </TabPanel>
-          <TabPanel value={tabValue} index={1}>
-            <div className="mb-4">{managePatients}</div>
-          </TabPanel>
-        </SwipeableViews>
+        <TabPanel value={tabValue} index={0}>
+          <div className="mb-4">{managePatients}</div>
+        </TabPanel>
+        <TabPanel value={tabValue} index={1}>
+          <div className="mb-4">{managePatients}</div>
+        </TabPanel>
         <DoctorVideoSlideover
           facilityId={params.facility}
           show={showDoctors}
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 3d39f377462..b6ceaf2e4dc 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -19,7 +19,7 @@ import { ConsultationModel } from "../Facility/models";
 import { PatientModel, SampleTestModel } from "./models";
 import { SampleTestCard } from "./SampleTestCard";
 import Chip from "../../CAREUI/display/Chip";
-import { classNames, formatDateTime } from "../../Utils/utils";
+import { classNames, formatAge, formatDateTime } from "../../Utils/utils";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import RelativeDateUserMention from "../Common/RelativeDateUserMention";
@@ -30,7 +30,7 @@ import Page from "../Common/components/Page";
 import ConfirmDialog from "../Common/ConfirmDialog";
 import UserAutocompleteFormField from "../Common/UserAutocompleteFormField";
 import dayjs from "../../Utils/dayjs";
-import { triggerGoal } from "../Common/Plausible";
+import { triggerGoal } from "../../Integrations/Plausible";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 
 const Loading = lazy(() => import("../Common/Loading"));
@@ -476,7 +476,12 @@ export const PatientHome = (props: any) => {
               <div>
                 <div className="flex flex-row gap-4">
                   <h1 className="flex flex-row pb-3 text-2xl font-bold">
-                    {patientData.name} - {patientData.age}
+                    {patientData.name} -{" "}
+                    {formatAge(
+                      patientData.age,
+                      patientData.date_of_birth,
+                      true
+                    )}
                   </h1>
                   <div className="ml-auto mr-9 flex flex-wrap gap-3">
                     {patientData.is_vaccinated ? (
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index dbb4aac34ce..701b76b5e3a 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -20,7 +20,7 @@ import { PatientModel } from "./models";
 import { getDimensionOrDash } from "../../Common/utils";
 import useConfig from "../../Common/hooks/useConfig";
 import { useState } from "react";
-import { formatDate, formatDateTime } from "../../Utils/utils.js";
+import { formatAge, formatDate, formatDateTime } from "../../Utils/utils.js";
 import dayjs from "../../Utils/dayjs";
 
 export default function PatientInfoCard(props: {
@@ -171,7 +171,7 @@ export default function PatientInfoCard(props: {
               </p>
             )}
             <p className="text-sm text-gray-900 sm:text-sm">
-              <span>{patient.age} years</span>
+              <span>{formatAge(patient.age, patient.date_of_birth, true)}</span>
               <span className="mx-2">•</span>
               <span>{patient.gender}</span>
               {consultation?.suggestion === "DC" && (
diff --git a/src/Components/Patient/PatientNotes.tsx b/src/Components/Patient/PatientNotes.tsx
index b7993ed1ea3..68a5ab4dc5d 100644
--- a/src/Components/Patient/PatientNotes.tsx
+++ b/src/Components/Patient/PatientNotes.tsx
@@ -101,10 +101,6 @@ const PatientNotes = (props: PatientNotesProps) => {
     });
   };
 
-  if (isLoading) {
-    return <Loading />;
-  }
-
   return (
     <div className="flex w-full flex-col">
       <PageTitle
@@ -119,6 +115,7 @@ const PatientNotes = (props: PatientNotesProps) => {
       <h3 className="pl-10 text-lg">Add new notes</h3>
       <textarea
         rows={3}
+        value={noteField}
         placeholder="Type your Note"
         className="mx-10 my-4 rounded-lg border border-gray-500 p-4 focus:border-primary-500 focus:outline-none focus:ring-primary-500"
         onChange={(e) => setNoteField(e.target.value)}
@@ -132,66 +129,70 @@ const PatientNotes = (props: PatientNotesProps) => {
           Post Your Note
         </ButtonV2>
       </div>
-      <div className="px-10 py-5">
-        <h3 className="text-lg">Added Notes</h3>
-        <div className="w-full">
-          {state.notes.length ? (
-            state.notes.map((note: any) => (
-              <div
-                key={note.id}
-                className="mt-4 flex w-full flex-col rounded-lg border border-gray-300 bg-white p-4 text-gray-800"
-              >
-                <span className="whitespace-pre-wrap break-words">
-                  {note.note}
-                </span>
-                <div className="mt-3">
-                  <span className="text-xs text-gray-500">
-                    {formatDateTime(note.created_date) || "-"}
+      {isLoading ? (
+        <Loading />
+      ) : (
+        <div className="px-10 py-5">
+          <h3 className="text-lg">Added Notes</h3>
+          <div className="w-full">
+            {state.notes.length ? (
+              state.notes.map((note: any) => (
+                <div
+                  key={note.id}
+                  className="mt-4 flex w-full flex-col rounded-lg border border-gray-300 bg-white p-4 text-gray-800"
+                >
+                  <span className="whitespace-pre-wrap break-words">
+                    {note.note}
                   </span>
-                </div>
-
-                <div className="space-y-2 sm:flex sm:space-y-0">
-                  <div className="mr-2 inline-flex w-full items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto">
-                    <div className="flex h-8 w-8 items-center justify-center rounded-full">
-                      <i className="fas fa-user" />
-                    </div>
-                    <span className="text-sm text-gray-700">
-                      {note.created_by_object?.first_name || "Unknown"}{" "}
-                      {note.created_by_object?.last_name}
+                  <div className="mt-3">
+                    <span className="text-xs text-gray-500">
+                      {formatDateTime(note.created_date) || "-"}
                     </span>
                   </div>
 
-                  <div
-                    className="inline-flex w-full cursor-pointer items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto"
-                    onClick={() => navigate(`/facility/${note.facility?.id}`)}
-                  >
-                    <div className="flex h-8 w-8 items-center justify-center rounded-full">
-                      <i className="fas fa-hospital" />
+                  <div className="space-y-2 sm:flex sm:space-y-0">
+                    <div className="mr-2 inline-flex w-full items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto">
+                      <div className="flex h-8 w-8 items-center justify-center rounded-full">
+                        <i className="fas fa-user" />
+                      </div>
+                      <span className="text-sm text-gray-700">
+                        {note.created_by_object?.first_name || "Unknown"}{" "}
+                        {note.created_by_object?.last_name}
+                      </span>
+                    </div>
+
+                    <div
+                      className="inline-flex w-full cursor-pointer items-center justify-center rounded-md border bg-gray-100 py-1 pl-2 pr-3 md:w-auto"
+                      onClick={() => navigate(`/facility/${note.facility?.id}`)}
+                    >
+                      <div className="flex h-8 w-8 items-center justify-center rounded-full">
+                        <i className="fas fa-hospital" />
+                      </div>
+                      <span className="text-sm text-gray-700">
+                        {note.facility?.name || "Unknown"}
+                      </span>
                     </div>
-                    <span className="text-sm text-gray-700">
-                      {note.facility?.name || "Unknown"}
-                    </span>
                   </div>
                 </div>
+              ))
+            ) : (
+              <div className="mt-2 flex items-center justify-center text-2xl font-bold text-gray-500">
+                No Notes Found
               </div>
-            ))
-          ) : (
-            <div className="mt-2 flex items-center justify-center text-2xl font-bold text-gray-500">
-              No Notes Found
-            </div>
-          )}
-          {state.count > pageSize && (
-            <div className="mt-4 flex w-full justify-center">
-              <Pagination
-                data={{ totalCount: state.count }}
-                onChange={handlePagination}
-                defaultPerPage={pageSize}
-                cPage={state.cPage}
-              />
-            </div>
-          )}
+            )}
+            {state.count > pageSize && (
+              <div className="mt-4 flex w-full justify-center">
+                <Pagination
+                  data={{ totalCount: state.count }}
+                  onChange={handlePagination}
+                  defaultPerPage={pageSize}
+                  cPage={state.cPage}
+                />
+              </div>
+            )}
+          </div>
         </div>
-      </div>
+      )}
     </div>
   );
 };
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index d52ce840090..c515e7584c1 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -25,6 +25,7 @@ import {
   dateQueryString,
   getPincodeDetails,
   includesIgnoreCase,
+  parsePhoneNumber,
 } from "../../Utils/utils";
 import { navigate, useQueryParams } from "raviger";
 import { statusType, useAbortableEffect } from "../../Common/utils";
@@ -40,7 +41,11 @@ import DateFormField from "../Form/FormFields/DateFormField";
 import DialogModal from "../Common/Dialog";
 import { DupPatientModel } from "../Facility/models";
 import DuplicatePatientDialog from "../Facility/DuplicatePatientDialog";
-import { FieldError, RequiredFieldValidator } from "../Form/FieldValidators";
+import {
+  FieldError,
+  PhoneNumberValidator,
+  RequiredFieldValidator,
+} from "../Form/FieldValidators";
 import { FieldErrorText, FieldLabel } from "../Form/FormFields/FormField";
 import Form from "../Form/Form";
 import { HCXPolicyModel } from "../HCX/models";
@@ -58,7 +63,6 @@ import TransferPatientDialog from "../Facility/TransferPatientDialog";
 import countryList from "../../Common/static/countries.json";
 import { debounce } from "lodash";
 
-import { parsePhoneNumberFromString } from "libphonenumber-js";
 import useAppHistory from "../../Common/hooks/useAppHistory";
 import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
@@ -68,8 +72,6 @@ import { FormContextValue } from "../Form/FormContext.js";
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
 
-// const debounce = require("lodash.debounce");
-
 interface PatientRegisterProps extends PatientModel {
   facilityId: string;
 }
@@ -98,7 +100,7 @@ const initForm: any = {
   age: "",
   gender: "",
   phone_number: "+91",
-  emergency_phone_number: null,
+  emergency_phone_number: "+91",
   blood_group: "",
   disease_status: diseaseStatus[2],
   is_declared_positive: "false",
@@ -596,14 +598,22 @@ export const PatientRegister = (props: PatientRegisterProps) => {
           }
           return;
         case "phone_number":
-          phoneNumber = parsePhoneNumberFromString(form[field]);
-          if (!form[field] || !phoneNumber?.isPossible()) {
+          phoneNumber = parsePhoneNumber(form[field]);
+          if (
+            !form[field] ||
+            !phoneNumber ||
+            !PhoneNumberValidator()(phoneNumber) === undefined
+          ) {
             errors[field] = "Please enter valid phone number";
           }
           return;
         case "emergency_phone_number":
-          emergency_phone_number = parsePhoneNumberFromString(form[field]);
-          if (!form[field] || !emergency_phone_number?.isPossible()) {
+          emergency_phone_number = parsePhoneNumber(form[field]);
+          if (
+            !form[field] ||
+            !emergency_phone_number ||
+            !PhoneNumberValidator()(emergency_phone_number) === undefined
+          ) {
             errors[field] = "Please enter valid phone number";
           }
           return;
@@ -729,12 +739,8 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     });
     const data = {
       abha_number: state.form.abha_number,
-      phone_number: parsePhoneNumberFromString(formData.phone_number)?.format(
-        "E.164"
-      ),
-      emergency_phone_number: parsePhoneNumberFromString(
-        formData.emergency_phone_number
-      )?.format("E.164"),
+      phone_number: parsePhoneNumber(formData.phone_number),
+      emergency_phone_number: parsePhoneNumber(formData.emergency_phone_number),
       date_of_birth: dateQueryString(formData.date_of_birth),
       disease_status: formData.disease_status,
       date_of_test: formData.date_of_test ? formData.date_of_test : undefined,
@@ -912,12 +918,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     if (mobile) {
       field("phone_number").onChange({
         name: "phone_number",
-        value: parsePhoneNumberFromString(mobile, "IN")?.format("E.164"),
+        value: parsePhoneNumber(mobile),
       });
 
       field("emergency_phone_number").onChange({
         name: "emergency_phone_number",
-        value: parsePhoneNumberFromString(mobile, "IN")?.format("E.164"),
+        value: parsePhoneNumber(mobile),
       });
     }
 
@@ -958,9 +964,12 @@ export const PatientRegister = (props: PatientRegisterProps) => {
 
   const duplicateCheck = useCallback(
     debounce(async (phoneNo: string) => {
-      if (phoneNo && parsePhoneNumberFromString(phoneNo)?.isPossible()) {
+      if (
+        phoneNo &&
+        PhoneNumberValidator()(parsePhoneNumber(phoneNo) ?? "") === undefined
+      ) {
         const query = {
-          phone_number: parsePhoneNumberFromString(phoneNo)?.format("E.164"),
+          phone_number: parsePhoneNumber(phoneNo),
         };
         const res = await dispatchAction(searchPatient(query));
         if (res?.data?.results) {
@@ -1249,7 +1258,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                               required
                               label="Phone Number"
                               onChange={(event) => {
-                                duplicateCheck(event.value);
+                                if (!id) duplicateCheck(event.value);
                                 field("phone_number").onChange(event);
                               }}
                               types={["mobile", "landline"]}
diff --git a/src/Components/Patient/SampleDetails.tsx b/src/Components/Patient/SampleDetails.tsx
index a5f802115bd..7814109978b 100644
--- a/src/Components/Patient/SampleDetails.tsx
+++ b/src/Components/Patient/SampleDetails.tsx
@@ -8,7 +8,7 @@ import Card from "../../CAREUI/display/Card";
 import { FileUpload } from "./FileUpload";
 import Page from "../Common/components/Page";
 import _ from "lodash";
-import { formatDateTime } from "../../Utils/utils";
+import { formatAge, formatDateTime } from "../../Utils/utils";
 import { getTestSample } from "../../Redux/actions";
 
 import { navigate } from "raviger";
@@ -118,7 +118,7 @@ export const SampleDetails = ({ id }: SampleDetailsProps) => {
             ) : (
               <div>
                 <span className="font-semibold leading-relaxed">Age: </span>
-                {patientData?.age}
+                {formatAge(patientData.age, patientData.date_of_birth)}
               </div>
             )}
             <div>
diff --git a/src/Components/Patient/ShiftCreate.tsx b/src/Components/Patient/ShiftCreate.tsx
index 7283fb3d5d7..fb15039a2ea 100644
--- a/src/Components/Patient/ShiftCreate.tsx
+++ b/src/Components/Patient/ShiftCreate.tsx
@@ -18,7 +18,7 @@ import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 import { navigate } from "raviger";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
+import { parsePhoneNumber } from "../../Utils/utils.js";
 import { phonePreg } from "../../Common/validation";
 import useAppHistory from "../../Common/hooks/useAppHistory";
 import useConfig from "../../Common/hooks/useConfig";
@@ -28,6 +28,7 @@ import Page from "../Common/components/Page.js";
 import Card from "../../CAREUI/display/Card.js";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField.js";
 import { SelectFormField } from "../Form/FormFields/SelectFormField.js";
+import { PhoneNumberValidator } from "../Form/FieldValidators.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -56,13 +57,13 @@ export const ShiftCreate = (props: patientShiftProps) => {
     vehicle_preference: "",
     comments: "",
     refering_facility_contact_name: "",
-    refering_facility_contact_number: "+91",
+    refering_facility_contact_number: "",
     assigned_facility_type: null,
     preferred_vehicle_choice: null,
     breathlessness_level: null,
     patient_category: "",
     ambulance_driver_name: "",
-    ambulance_phone_number: undefined,
+    ambulance_phone_number: "",
     ambulance_number: "",
   };
 
@@ -144,6 +145,11 @@ export const ShiftCreate = (props: patientShiftProps) => {
           errors: action.errors,
         };
       }
+      case "set_field":
+        return {
+          form: { ...state.form, [action.name]: action.value },
+          errors: { ...state.errors, [action.name]: action.error },
+        };
       default:
         return state;
     }
@@ -162,10 +168,10 @@ export const ShiftCreate = (props: patientShiftProps) => {
             errors[field] = requiredFields[field].errorText;
             isInvalidForm = true;
           } else if (
-            !parsePhoneNumberFromString(state.form[field])?.isPossible() ||
-            !phonePreg(
-              String(parsePhoneNumberFromString(state.form[field])?.number)
-            )
+            !PhoneNumberValidator()(
+              parsePhoneNumber(state.form[field]) ?? ""
+            ) === undefined ||
+            !phonePreg(String(parsePhoneNumber(state.form[field])))
           ) {
             errors[field] = requiredFields[field].invalidText;
             isInvalidForm = true;
@@ -187,8 +193,10 @@ export const ShiftCreate = (props: patientShiftProps) => {
 
   const handleFormFieldChange = (event: FieldChangeEvent<unknown>) => {
     dispatch({
-      type: "set_form",
-      form: { ...state.form, [event.name]: event.value },
+      type: "set_field",
+      name: event.name,
+      value: event.value,
+      error: "",
     });
   };
 
@@ -222,15 +230,15 @@ export const ShiftCreate = (props: patientShiftProps) => {
         preferred_vehicle_choice: state.form.preferred_vehicle_choice,
         refering_facility_contact_name:
           state.form.refering_facility_contact_name,
-        refering_facility_contact_number: parsePhoneNumberFromString(
+        refering_facility_contact_number: parsePhoneNumber(
           state.form.refering_facility_contact_number
-        )?.format("E.164"),
+        ),
         breathlessness_level: state.form.breathlessness_level,
         patient_category: patientCategory,
         ambulance_driver_name: state.form.ambulance_driver_name,
-        ambulance_phone_number: parsePhoneNumberFromString(
+        ambulance_phone_number: parsePhoneNumber(
           state.form.ambulance_phone_number
-        )?.format("E.164"),
+        ),
         ambulance_number: state.form.ambulance_number,
       };
 
diff --git a/src/Components/Resource/ResourceCreate.tsx b/src/Components/Resource/ResourceCreate.tsx
index 417455d1ec1..cf9e5f6f22a 100644
--- a/src/Components/Resource/ResourceCreate.tsx
+++ b/src/Components/Resource/ResourceCreate.tsx
@@ -9,7 +9,7 @@ import {
   RESOURCE_CATEGORY_CHOICES,
   RESOURCE_SUBCATEGORIES,
 } from "../../Common/constants";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
+import { parsePhoneNumber } from "../../Utils/utils";
 import { phonePreg } from "../../Common/validation";
 
 import { createResource, getAnyFacility } from "../../Redux/actions";
@@ -25,6 +25,7 @@ import RadioFormField from "../Form/FormFields/RadioFormField";
 import { FieldLabel } from "../Form/FormFields/FormField";
 import Card from "../../CAREUI/display/Card";
 import Page from "../Common/components/Page";
+import { PhoneNumberValidator } from "../Form/FieldValidators";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -41,7 +42,7 @@ const initForm: any = {
   title: "",
   reason: "",
   refering_facility_contact_name: "",
-  refering_facility_contact_number: "",
+  refering_facility_contact_number: "+91",
   required_quantity: null,
 };
 
@@ -131,13 +132,14 @@ export default function ResourceCreate(props: resourceProps) {
     Object.keys(requiredFields).forEach((field) => {
       switch (field) {
         case "refering_facility_contact_number": {
-          const phoneNumber = parsePhoneNumberFromString(state.form[field]);
+          const phoneNumber = parsePhoneNumber(state.form[field]);
           if (!state.form[field]) {
             errors[field] = requiredFields[field].errorText;
             isInvalidForm = true;
           } else if (
-            !phoneNumber?.isPossible() ||
-            !phonePreg(String(phoneNumber?.number))
+            !phoneNumber ||
+            !PhoneNumberValidator()(phoneNumber) === undefined ||
+            !phonePreg(String(phoneNumber))
           ) {
             errors[field] = requiredFields[field].invalidText;
             isInvalidForm = true;
@@ -194,9 +196,9 @@ export default function ResourceCreate(props: resourceProps) {
         reason: state.form.reason,
         refering_facility_contact_name:
           state.form.refering_facility_contact_name,
-        refering_facility_contact_number: parsePhoneNumberFromString(
+        refering_facility_contact_number: parsePhoneNumber(
           state.form.refering_facility_contact_number
-        )?.format("E.164"),
+        ),
         requested_quantity: state.form.requested_quantity || 0,
       };
 
diff --git a/src/Components/Shifting/ListFilter.tsx b/src/Components/Shifting/ListFilter.tsx
index afdc087973f..5f2233c2263 100644
--- a/src/Components/Shifting/ListFilter.tsx
+++ b/src/Components/Shifting/ListFilter.tsx
@@ -19,13 +19,12 @@ import FiltersSlideover from "../../CAREUI/interactive/FiltersSlideover";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { navigate } from "raviger";
-import parsePhoneNumberFromString from "libphonenumber-js";
 import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
 import useMergeState from "../../Common/hooks/useMergeState";
 import { useTranslation } from "react-i18next";
 import UserAutocompleteFormField from "../Common/UserAutocompleteFormField";
-import { dateQueryString } from "../../Utils/utils";
+import { dateQueryString, parsePhoneNumber } from "../../Utils/utils";
 import dayjs from "dayjs";
 
 const clearFilterState = {
@@ -207,10 +206,10 @@ export default function ListFilter(props: any) {
       assigned_facility: assigned_facility || "",
       emergency: emergency || "",
       is_up_shift: is_up_shift || "",
-      patient_phone_number: patient_phone_number
-        ? parsePhoneNumberFromString(patient_phone_number)?.format("E.164") ??
-          ""
-        : "",
+      patient_phone_number:
+        patient_phone_number === "+91"
+          ? ""
+          : parsePhoneNumber(patient_phone_number) ?? "",
       created_date_before: dateQueryString(created_date_before),
       created_date_after: dateQueryString(created_date_after),
       modified_date_before: dateQueryString(modified_date_before),
diff --git a/src/Components/Shifting/ListView.tsx b/src/Components/Shifting/ListView.tsx
index dddfd275f9d..6d55122ea11 100644
--- a/src/Components/Shifting/ListView.tsx
+++ b/src/Components/Shifting/ListView.tsx
@@ -12,7 +12,7 @@ import { ExportButton } from "../Common/Export";
 import ListFilter from "./ListFilter";
 import Page from "../Common/components/Page";
 import SearchInput from "../Form/SearchInput";
-import { formatDateTime } from "../../Utils/utils";
+import { formatAge, formatDateTime } from "../../Utils/utils";
 import { formatFilter } from "./Commons";
 import { navigate } from "raviger";
 import useConfig from "../../Common/hooks/useConfig";
@@ -127,7 +127,12 @@ export default function ListView() {
             <div>
               <div className="flex justify-between">
                 <div className="mb-2 text-xl font-bold capitalize">
-                  {shift.patient_object.name} - {shift.patient_object.age}
+                  {shift.patient_object.name} -{" "}
+                  {formatAge(
+                    shift.patient_object.age,
+                    shift.patient_object.date_of_birth,
+                    true
+                  )}
                 </div>
                 <div>
                   {shift.emergency && (
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx
index 8215bd21e31..03e09702aac 100644
--- a/src/Components/Shifting/ShiftDetails.tsx
+++ b/src/Components/Shifting/ShiftDetails.tsx
@@ -18,7 +18,7 @@ import { CopyToClipboard } from "react-copy-to-clipboard";
 import Page from "../Common/components/Page";
 import QRCode from "qrcode.react";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
-import { formatDateTime } from "../../Utils/utils";
+import { formatAge, formatDateTime } from "../../Utils/utils";
 import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
@@ -110,7 +110,13 @@ export default function ShiftDetails(props: { id: string }) {
       "\n" +
       t("age") +
       ":" +
-      data?.patient_object?.age +
+      +(
+        formatAge(
+          data?.patient_object?.age,
+          data?.patient_object?.date_of_birth,
+          true
+        ) ?? "-"
+      ) +
       "\n" +
       t("origin_facility") +
       ":" +
@@ -195,7 +201,7 @@ export default function ShiftDetails(props: { id: string }) {
               <span className="font-semibold leading-relaxed">
                 {t("age")}:{" "}
               </span>
-              {patientData?.age}
+              {formatAge(patientData?.age, patientData?.date_of_birth, true)}
             </div>
           )}
           {patientData?.gender === 2 && patientData?.is_antenatal && (
@@ -380,7 +386,7 @@ export default function ShiftDetails(props: { id: string }) {
               <span className="font-semibold leading-relaxed">
                 {t("age")}:{" "}
               </span>
-              {patientData?.age}
+              {formatAge(patientData.age, patientData.date_of_birth, true)}
             </div>
             <div>
               <span className="font-semibold leading-relaxed">
diff --git a/src/Components/Shifting/ShiftDetailsUpdate.tsx b/src/Components/Shifting/ShiftDetailsUpdate.tsx
index dd10bae6a96..ec4eab661d9 100644
--- a/src/Components/Shifting/ShiftDetailsUpdate.tsx
+++ b/src/Components/Shifting/ShiftDetailsUpdate.tsx
@@ -23,7 +23,7 @@ import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { SelectFormField } from "../Form/FormFields/SelectFormField.js";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
-import { parsePhoneNumberFromString } from "libphonenumber-js";
+import { parsePhoneNumber } from "../../Utils/utils.js";
 import useAppHistory from "../../Common/hooks/useAppHistory";
 import useConfig from "../../Common/hooks/useConfig";
 import { useDispatch } from "react-redux";
@@ -222,9 +222,10 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => {
         breathlessness_level: state.form.breathlessness_level,
         patient_category: state.form.patient_category,
         ambulance_driver_name: state.form.ambulance_driver_name,
-        ambulance_phone_number: parsePhoneNumberFromString(
-          state.form.ambulance_phone_number
-        )?.format("E.164"),
+        ambulance_phone_number:
+          state.form.ambulance_phone_number === "+91"
+            ? ""
+            : parsePhoneNumber(state.form.ambulance_phone_number),
         ambulance_number: state.form.ambulance_number,
       };
 
diff --git a/src/Components/Shifting/ShiftingBoard.tsx b/src/Components/Shifting/ShiftingBoard.tsx
index 71a33afdda8..7c065d0c0a8 100644
--- a/src/Components/Shifting/ShiftingBoard.tsx
+++ b/src/Components/Shifting/ShiftingBoard.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { classNames, formatDateTime } from "../../Utils/utils";
+import { classNames, formatAge, formatDateTime } from "../../Utils/utils";
 import {
   completeTransfer,
   downloadShiftRequests,
@@ -78,7 +78,12 @@ const ShiftCard = ({ shift, filter }: any) => {
           <div>
             <div className="flex justify-between">
               <div className="mb-2 text-xl font-bold capitalize">
-                {shift.patient_object.name} - {shift.patient_object.age}
+                {shift.patient_object.name} -{" "}
+                {formatAge(
+                  shift.patient_object?.age,
+                  shift.patient_object?.age.date_of_birth,
+                  true
+                )}
               </div>
               <div>
                 {shift.emergency && (
diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index 18b1e9fa73d..a6553bad01b 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -1,5 +1,4 @@
 import { Link, navigate } from "raviger";
-import { parsePhoneNumberFromString } from "libphonenumber-js/max";
 import { lazy, useCallback, useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
 import {
@@ -25,8 +24,11 @@ import {
 import * as Notification from "../../Utils/Notifications.js";
 import { FacilitySelect } from "../Common/FacilitySelect";
 import { FacilityModel } from "../Facility/models";
-
-import { classNames, dateQueryString } from "../../Utils/utils";
+import {
+  classNames,
+  dateQueryString,
+  parsePhoneNumber,
+} from "../../Utils/utils";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
@@ -42,6 +44,7 @@ import CircularProgress from "../Common/components/CircularProgress";
 import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave";
 import dayjs from "../../Utils/dayjs";
 import useAuthUser from "../../Common/hooks/useAuthUser";
+import { PhoneNumberValidator } from "../Form/FieldValidators";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -472,14 +475,11 @@ export const UserAdd = (props: UserProps) => {
           return;
         case "phone_number":
           // eslint-disable-next-line no-case-declarations
-          const phoneNumber = parsePhoneNumberFromString(
-            state.form[field],
-            "IN"
-          );
+          const phoneNumber = parsePhoneNumber(state.form[field]);
           // eslint-disable-next-line no-case-declarations
           let is_valid = false;
           if (phoneNumber) {
-            is_valid = phoneNumber.isValid();
+            is_valid = PhoneNumberValidator()(phoneNumber) === undefined;
           }
           if (!state.form[field] || !is_valid) {
             errors[field] = "Please enter valid phone number";
@@ -491,12 +491,10 @@ export const UserAdd = (props: UserProps) => {
           // eslint-disable-next-line no-case-declarations
           let alt_is_valid = false;
           if (state.form[field] && state.form[field] !== "+91") {
-            const altPhoneNumber = parsePhoneNumberFromString(
-              state.form[field],
-              "IN"
-            );
+            const altPhoneNumber = parsePhoneNumber(state.form[field]);
             if (altPhoneNumber) {
-              alt_is_valid = altPhoneNumber.isValid();
+              alt_is_valid =
+                PhoneNumberValidator(["mobile"])(altPhoneNumber) === undefined;
             }
           }
           if (
@@ -572,15 +570,20 @@ export const UserAdd = (props: UserProps) => {
         state: state.form.state,
         district: state.form.district,
         local_body: showLocalbody ? state.form.local_body : null,
-        phone_number: parsePhoneNumberFromString(
-          state.form.phone_number
-        )?.format("E.164"),
+        phone_number:
+          state.form.phone_number === "+91"
+            ? ""
+            : parsePhoneNumber(state.form.phone_number),
         alt_phone_number:
-          parsePhoneNumberFromString(
+          parsePhoneNumber(
             state.form.phone_number_is_whatsapp
-              ? state.form.phone_number
+              ? state.form.phone_number === "+91"
+                ? ""
+                : state.form.phone_number
+              : state.form.alt_phone_number === "+91"
+              ? ""
               : state.form.alt_phone_number
-          )?.format("E.164") ?? "",
+          ) ?? "",
         date_of_birth: dateQueryString(state.form.date_of_birth),
         age: Number(dayjs().diff(state.form.date_of_birth, "years", false)),
         doctor_qualification:
diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index 681b7517e04..1450e6b6f79 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -3,7 +3,7 @@ import { useDispatch } from "react-redux";
 import { getDistrict } from "../../Redux/actions";
 import { navigate } from "raviger";
 import DistrictSelect from "../Facility/FacilityFilter/DistrictSelect";
-import parsePhoneNumberFromString from "libphonenumber-js";
+import { parsePhoneNumber } from "../../Utils/utils";
 import TextFormField from "../Form/FormFields/TextFormField";
 import SelectMenuV2 from "../Form/SelectMenuV2";
 import { FieldLabel } from "../Form/FormFields/FormField";
@@ -14,8 +14,8 @@ import FiltersSlideover from "../../CAREUI/interactive/FiltersSlideover";
 
 const parsePhoneNumberForFilterParam = (phoneNumber: string) => {
   if (!phoneNumber) return "";
-  if (phoneNumber.startsWith("+"))
-    return parsePhoneNumberFromString(phoneNumber)?.format("E.164") || "";
+  if (phoneNumber === "+91") return "";
+  if (phoneNumber.startsWith("+")) return parsePhoneNumber(phoneNumber) ?? "";
   return phoneNumber;
 };
 
@@ -25,8 +25,8 @@ export default function UserFilter(props: any) {
   const [filterState, setFilterState] = useMergeState({
     first_name: filter.first_name || "",
     last_name: filter.last_name || "",
-    phone_number: filter.phone_number || undefined,
-    alt_phone_number: filter.alt_phone_number || undefined,
+    phone_number: filter.phone_number || "+91",
+    alt_phone_number: filter.alt_phone_number || "+91",
     user_type: filter.user_type || "",
     district_id: filter.district_id || "",
     district_ref: null,
diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
index 3fb4bccc7c7..5c5ad46b9fa 100644
--- a/src/Components/Users/UserProfile.tsx
+++ b/src/Components/Users/UserProfile.tsx
@@ -8,13 +8,12 @@ import {
   partialUpdateUser,
   updateUserPassword,
 } from "../../Redux/actions";
-import { parsePhoneNumberFromString } from "libphonenumber-js/max";
 import { validateEmailAddress } from "../../Common/validation";
 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, handleSignOut } from "../../Utils/utils";
+import { classNames, handleSignOut, parsePhoneNumber } from "../../Utils/utils";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
@@ -23,6 +22,7 @@ import { SkillModel, SkillObjectModel } from "../Users/models";
 import UpdatableApp, { checkForUpdate } from "../Common/UpdatableApp";
 import dayjs from "../../Utils/dayjs";
 import useAuthUser from "../../Common/hooks/useAuthUser";
+import { PhoneNumberValidator } from "../Form/FieldValidators";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -199,15 +199,12 @@ export default function UserProfile() {
           return;
         case "phoneNumber":
           // eslint-disable-next-line no-case-declarations
-          const phoneNumber = parsePhoneNumberFromString(
-            states.form[field],
-            "IN"
-          );
+          const phoneNumber = parsePhoneNumber(states.form[field]);
 
           // eslint-disable-next-line no-case-declarations
           let is_valid = false;
           if (phoneNumber) {
-            is_valid = phoneNumber.isValid();
+            is_valid = PhoneNumberValidator()(phoneNumber) === undefined;
           }
 
           if (!states.form[field] || !is_valid) {
@@ -219,12 +216,10 @@ export default function UserProfile() {
           // eslint-disable-next-line no-case-declarations
           let alt_is_valid = false;
           if (states.form[field] && states.form[field] !== "+91") {
-            const altPhoneNumber = parsePhoneNumberFromString(
-              states.form[field],
-              "IN"
-            );
+            const altPhoneNumber = parsePhoneNumber(states.form[field]);
             if (altPhoneNumber) {
-              alt_is_valid = altPhoneNumber.isValid();
+              alt_is_valid =
+                PhoneNumberValidator(["mobile"])(altPhoneNumber) === undefined;
             }
           }
 
@@ -300,13 +295,8 @@ export default function UserProfile() {
         first_name: states.form.firstName,
         last_name: states.form.lastName,
         email: states.form.email,
-        phone_number: parsePhoneNumberFromString(
-          states.form.phoneNumber
-        )?.format("E.164"),
-        alt_phone_number:
-          parsePhoneNumberFromString(states.form.altPhoneNumber)?.format(
-            "E.164"
-          ) || "",
+        phone_number: parsePhoneNumber(states.form.phoneNumber) ?? "",
+        alt_phone_number: parsePhoneNumber(states.form.altPhoneNumber) ?? "",
         gender: states.form.gender,
         age: states.form.age,
         doctor_qualification:
diff --git a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
index c0b089df8b0..1b45fd80ddc 100644
--- a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
+++ b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
@@ -6,7 +6,7 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import WaveformLabels from "./WaveformLabels";
 import { classNames } from "../../Utils/utils";
 import { IVitalsComponentProps, VitalsValueBase } from "./types";
-import { triggerGoal } from "../Common/Plausible";
+import { triggerGoal } from "../../Integrations/Plausible";
 import useAuthUser from "../../Common/hooks/useAuthUser";
 
 export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
diff --git a/src/Components/Common/Plausible.tsx b/src/Integrations/Plausible.tsx
similarity index 95%
rename from src/Components/Common/Plausible.tsx
rename to src/Integrations/Plausible.tsx
index 77589e0f923..c9b040749d4 100644
--- a/src/Components/Common/Plausible.tsx
+++ b/src/Integrations/Plausible.tsx
@@ -1,6 +1,6 @@
 import { useLocationChange } from "raviger";
-import useConfig from "../../Common/hooks/useConfig";
-import Script from "./Script";
+import useConfig from "../Common/hooks/useConfig";
+import Script from "../Components/Common/Script";
 import { useEffect } from "react";
 
 export default function Plausible() {
diff --git a/src/Integrations/Sentry.tsx b/src/Integrations/Sentry.tsx
new file mode 100644
index 00000000000..466f93487c4
--- /dev/null
+++ b/src/Integrations/Sentry.tsx
@@ -0,0 +1,25 @@
+import { useEffect } from "react";
+import useConfig from "../Common/hooks/useConfig";
+
+interface Props {
+  disabled?: boolean;
+}
+
+export default function Sentry({ disabled }: Props) {
+  const { sentry_dsn, sentry_environment } = useConfig();
+
+  useEffect(() => {
+    if (disabled || !sentry_dsn) {
+      return;
+    }
+
+    import("@sentry/browser").then((Sentry) => {
+      Sentry.init({
+        environment: sentry_environment,
+        dsn: sentry_dsn,
+      });
+    });
+  }, [sentry_dsn, sentry_environment, disabled]);
+
+  return null;
+}
diff --git a/src/Integrations/index.tsx b/src/Integrations/index.tsx
new file mode 100644
index 00000000000..aeb0399a452
--- /dev/null
+++ b/src/Integrations/index.tsx
@@ -0,0 +1,6 @@
+import Sentry from "./Sentry";
+import Plausible from "./Plausible";
+
+const Intergrations = { Sentry, Plausible };
+
+export default Intergrations;
diff --git a/src/Providers/AppConfigProvider.tsx b/src/Providers/AppConfigProvider.tsx
new file mode 100644
index 00000000000..7492a83c126
--- /dev/null
+++ b/src/Providers/AppConfigProvider.tsx
@@ -0,0 +1,25 @@
+import { AppConfigContext } from "../Common/hooks/useConfig";
+import Loading from "../Components/Common/Loading";
+import routes from "../Redux/api";
+import useQuery from "../Utils/request/useQuery";
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export default function AppConfigProvider({ children }: Props) {
+  const { data, loading } = useQuery(routes.config, {
+    refetchOnWindowFocus: false,
+    prefetch: true,
+  });
+
+  if (loading || data === undefined) {
+    return <Loading />;
+  }
+
+  return (
+    <AppConfigContext.Provider value={data}>
+      {children}
+    </AppConfigContext.Provider>
+  );
+}
diff --git a/src/Providers/AuthUserProvider.tsx b/src/Providers/AuthUserProvider.tsx
new file mode 100644
index 00000000000..64027a17215
--- /dev/null
+++ b/src/Providers/AuthUserProvider.tsx
@@ -0,0 +1,63 @@
+import { useEffect } from "react";
+import { AuthUserContext } from "../Common/hooks/useAuthUser";
+import Loading from "../Components/Common/Loading";
+import routes from "../Redux/api";
+import useQuery from "../Utils/request/useQuery";
+import { LocalStorageKeys } from "../Common/constants";
+import request from "../Utils/request/request";
+
+interface Props {
+  children: React.ReactNode;
+  unauthorized: React.ReactNode;
+}
+
+export default function AuthUserProvider({ children, unauthorized }: Props) {
+  const { res, data, loading } = useQuery(routes.currentUser, {
+    refetchOnWindowFocus: false,
+    prefetch: true,
+    silent: true,
+  });
+
+  useEffect(() => {
+    if (!data) {
+      return;
+    }
+
+    updateRefreshToken(true);
+    setInterval(() => updateRefreshToken(), 5 * 60 * 1000); // TODO: move this interval to config.json
+  }, [data]);
+
+  if (loading || !res) {
+    return <Loading />;
+  }
+
+  if (res.status !== 200 || !data) {
+    return unauthorized;
+  }
+
+  return (
+    <AuthUserContext.Provider value={data}>{children}</AuthUserContext.Provider>
+  );
+}
+
+const updateRefreshToken = async (silent = false) => {
+  const refresh = localStorage.getItem(LocalStorageKeys.refreshToken);
+
+  if (!refresh) {
+    return;
+  }
+
+  const { res, data } = await request(routes.token_refresh, {
+    body: { refresh },
+    silent,
+  });
+
+  if (res?.status !== 200 || !data) {
+    localStorage.removeItem(LocalStorageKeys.accessToken);
+    localStorage.removeItem(LocalStorageKeys.refreshToken);
+    return;
+  }
+
+  localStorage.setItem(LocalStorageKeys.accessToken, data.access);
+  localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
+};
diff --git a/src/CAREUI/misc/HistoryAPIProvider.tsx b/src/Providers/HistoryAPIProvider.tsx
similarity index 93%
rename from src/CAREUI/misc/HistoryAPIProvider.tsx
rename to src/Providers/HistoryAPIProvider.tsx
index e82e379053f..3fa4b6fab86 100644
--- a/src/CAREUI/misc/HistoryAPIProvider.tsx
+++ b/src/Providers/HistoryAPIProvider.tsx
@@ -5,7 +5,7 @@ export const HistoryContext = createContext<string[]>([]);
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 export const ResetHistoryContext = createContext(() => {});
 
-export const HistoryAPIProvider = (props: { children: ReactNode }) => {
+export default function HistoryAPIProvider(props: { children: ReactNode }) {
   const [history, setHistory] = useState<string[]>([]);
 
   useLocationChange(
@@ -36,4 +36,4 @@ export const HistoryAPIProvider = (props: { children: ReactNode }) => {
       </ResetHistoryContext.Provider>
     </HistoryContext.Provider>
   );
-};
+}
diff --git a/src/Providers/index.tsx b/src/Providers/index.tsx
new file mode 100644
index 00000000000..728ee9e1f91
--- /dev/null
+++ b/src/Providers/index.tsx
@@ -0,0 +1,5 @@
+import AppConfigProvider from "./AppConfigProvider";
+import AuthUserProvider from "./AuthUserProvider";
+import HistoryAPIProvider from "./HistoryAPIProvider";
+
+export { AppConfigProvider, AuthUserProvider, HistoryAPIProvider };
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index 6e0d91fc59d..1a5bd7e4fb1 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -1003,7 +1003,7 @@ export const PrescriptionActions = (consultation_external_id: string) => {
   const pathParams = { consultation_external_id };
 
   return {
-    list: (query?: Partial<Prescription>) => {
+    list: (query?: Record<string, string | boolean | number>) => {
       let altKey;
       if (query?.is_prn !== undefined) {
         altKey = query?.is_prn
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index b98a099f439..1aa06c7e1bc 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -1,19 +1,28 @@
+import { IConfig } from "../Common/hooks/useConfig";
+import { AssetData } from "../Components/Assets/AssetTypes";
 import { LocationModel } from "../Components/Facility/models";
+import { UserModel } from "../Components/Users/models";
 import { PaginatedResponse } from "../Utils/request/types";
 
 /**
  * A fake function that returns an empty object casted to type T
  * @returns Empty object as type T
  */
-function Res<T>(): T {
+function Type<T>(): T {
   return {} as T;
 }
 
+interface JwtTokenObtainPair {
+  access: string;
+  refresh: string;
+}
+
 const routes = {
   config: {
     path: import.meta.env.REACT_APP_CONFIG ?? "/config.json",
     method: "GET",
     noAuth: true,
+    TRes: Type<IConfig>(),
   },
 
   // Auth Endpoints
@@ -24,8 +33,10 @@ const routes = {
   },
 
   token_refresh: {
-    path: "/api/v1/auth/token/refresh",
+    path: "/api/v1/auth/token/refresh/",
     method: "POST",
+    TRes: Type<JwtTokenObtainPair>(),
+    TBody: Type<{ refresh: string }>(),
   },
 
   token_verify: {
@@ -55,6 +66,7 @@ const routes = {
   // User Endpoints
   currentUser: {
     path: "/api/v1/users/getcurrentuser/",
+    TRes: Type<UserModel>(),
   },
 
   userList: {
@@ -188,7 +200,7 @@ const routes = {
   listFacilityAssetLocation: {
     path: "/api/v1/facility/{facility_external_id}/asset_location/",
     method: "GET",
-    TRes: Res<PaginatedResponse<LocationModel>>(),
+    TRes: Type<PaginatedResponse<LocationModel>>(),
   },
   createFacilityAssetLocation: {
     path: "/api/v1/facility/{facility_external_id}/asset_location/",
@@ -794,6 +806,7 @@ const routes = {
   getAsset: {
     path: "/api/v1/asset/{external_id}/",
     method: "GET",
+    TRes: Type<AssetData>(),
   },
   deleteAsset: {
     path: "/api/v1/asset/{external_id}/",
diff --git a/src/Router/AppRouter.tsx b/src/Routers/AppRouter.tsx
similarity index 100%
rename from src/Router/AppRouter.tsx
rename to src/Routers/AppRouter.tsx
diff --git a/src/Router/SessionRouter.tsx b/src/Routers/SessionRouter.tsx
similarity index 100%
rename from src/Router/SessionRouter.tsx
rename to src/Routers/SessionRouter.tsx
diff --git a/src/Routers/index.tsx b/src/Routers/index.tsx
new file mode 100644
index 00000000000..8a27df7b59d
--- /dev/null
+++ b/src/Routers/index.tsx
@@ -0,0 +1,6 @@
+import SessionRouter from "./SessionRouter";
+import AppRouter from "./AppRouter";
+
+const routers = { SessionRouter, AppRouter };
+
+export default routers;
diff --git a/src/Utils/request/README.md b/src/Utils/request/README.md
new file mode 100644
index 00000000000..b0fa4459ef7
--- /dev/null
+++ b/src/Utils/request/README.md
@@ -0,0 +1,143 @@
+# CARE's data fetching utilities: `useQuery` and `request`
+
+There are two main ways to fetch data in CARE: `useQuery` and `request`. Both of these utilities are built on top of [fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch).
+
+## `useQuery`
+
+`useQuery` is a React hook that allows you to fetch data and automatically update the UI when the data changes. It is
+a wrapper around `request` that is designed to be used in React components. Only "GET" requests are supported with `useQuery`. For other request methods (mutations), use `request`.
+
+### Usage
+
+```jsx
+import { useQuery } from "@care/request";
+import FooRoutes from "@foo/routes";
+
+export default function FooDetails({ children, id }) {
+  const { res, data, loading, error } = useQuery(FooRoutes.getFoo, {
+    pathParams: { id },
+  });
+
+  /* 🪄 Here typeof data is automatically inferred from the specified route. */
+
+  if (loading) return <Loading />;
+
+  if (res.status === 403) {
+    navigate("/forbidden");
+    return null;
+  }
+
+  if (error) {
+    return <Error error={error} />;
+  }
+
+  return (
+    <div>
+      <span>{data.id}</span>
+      <span>{data.name}</span>
+    </div>
+  );
+}
+```
+
+### API
+
+```ts
+useQuery(route: Route, options?: QueryOptions): ReturnType<useQuery>;
+```
+
+#### `route`
+
+A route object that specifies the endpoint to fetch data from.
+
+```ts
+const FooRoutes = {
+  getFoo: {
+    path: "/api/v1/foo/{id}/",  // 👈 The path to the endpoint. Slug parameters can be specified using curly braces.
+
+    method: "GET",              // 👈 The HTTP method to use. Optional; defaults to "GET".
+    TRes: Type<Foo>(),          // 👈 The type of the response body (for type inference).
+    TBody: Type<Foo>(),         // 👈 The type of the request body (for type inference).
+    noAuth: true,               // 👈 Whether to skip adding the Authorization header to the request.
+  },
+} as const; // 👈 This is important for type inference to work properly.
+```
+
+#### `options`
+
+An object that specifies options for the request.
+
+```ts
+const options = {
+  prefetch: true,               // 👈 Whether to prefetch the data when the component mounts.
+  refetchOnWindowFocus: true,   // 👈 Whether to refetch the data when the window regains focus.
+
+  // The following options are passed directly to the underlying `request` function.
+
+  pathParams: { id: "123" },    // 👈 The slug parameters to use in the path.
+  // If you accidentally forget to specify a slug parameter an error will be 
+  // thrown before the request is made.
+
+  query: { limit: 10 },         // 👈 The query parameters to be added to the request URL.
+  body: { name: "foo" },        // 👈 The body to be sent with the request. Should be compatible with the TBody type of the route.
+  headers: { "X-Foo": "bar" },  // 👈 Additional headers to be sent with the request. (Coming soon...)
+
+  silent: true,                 // 👈 Whether to suppress notifications for this request.
+  // This is useful for requests that are made in the background.
+
+  reattempts: 3,                // 👈 The number of times to retry the request if it fails.
+  // Reattempts are only made if the request fails due to a network error. Responses with
+  // status codes in the 400s and 500s are not retried.
+
+  onResponse: (res) => {        // 👈 An optional callback that is called after the response is received.
+    if (res.status === 403) {
+      navigate("/forbidden");
+    }
+  },
+  // This is useful for handling responses with status codes in the 400s and 500s for a specific request.
+};
+```
+
+#### `ReturnType<useQuery>`
+
+The `useQuery` hook returns an object with the following properties:
+
+```ts
+{
+  res: Type<TRes> | undefined;  // 👈 The response object. `undefined` if the request has not been made yet.
+  
+  data: TRes | null;            // 👈 The response body. `null` if the request has not been made yet.
+
+  error: any;                   // 👈 The error that occurred while making the request if any.
+
+  loading: boolean;             // 👈 Whether the request is currently in progress.
+
+  refetch: () => void;          // 👈 A function that can be called to refetch the data. 
+  // Ideal for revalidating stale data after a mutation.
+}
+```
+
+## `request`
+
+`request` is a function that allows you to fetch data. It is a wrapper around `fetch` that adds some useful features. It can be used in both React components and non-React code. For fetching data in React components, prefer using `useQuery`. For mutations, use `request`.
+
+### `request` usage
+
+```ts
+import { request } from "@care/request";
+import FooRoutes from "@foo/routes";
+
+export default async function updateFoo(id: string, object: Foo) {
+  const { res, data } = await request(FooRoutes.updateFoo, {
+    pathParams: { id },
+    body: object,               // 👈 The body is automatically serialized to JSON. Should be compatible with the TBody type of the route.
+  });
+
+  if (res.status === 403) {
+    navigate("/forbidden");
+    return null;
+  }
+
+  return data;
+}
+```
diff --git a/src/Utils/request/handleResponse.ts b/src/Utils/request/handleResponse.ts
new file mode 100644
index 00000000000..2ecad95ac88
--- /dev/null
+++ b/src/Utils/request/handleResponse.ts
@@ -0,0 +1,38 @@
+import { RequestResult } from "./types";
+import * as Notifications from "../Notifications";
+import { navigate } from "raviger";
+
+export default function handleResponse(
+  { res, error }: RequestResult<unknown>,
+  silent?: boolean
+) {
+  const notify = silent ? undefined : Notifications;
+
+  if (res === undefined) {
+    return;
+  }
+
+  // 5xx errors
+  if (res.status >= 500 && res.status < 600) {
+    console.error("Server error", res);
+    notify?.Error({ msg: "Something went wrong...!" });
+    return;
+  }
+
+  // 400/406 Bad Request
+  if (res.status === 400 || res.status === 406) {
+    notify?.BadRequest({ errs: error });
+    return;
+  }
+
+  // Other 400 Errors
+  if (res.status >= 400) {
+    // Invalid token
+    if (!silent && error?.code === "token_not_valid") {
+      navigate("/session-expired");
+    }
+
+    notify?.Error({ msg: error?.detail || "Something went wrong...!" });
+    return;
+  }
+}
diff --git a/src/Utils/request/request.ts b/src/Utils/request/request.ts
index 2dc938fa6f1..2d735734aae 100644
--- a/src/Utils/request/request.ts
+++ b/src/Utils/request/request.ts
@@ -1,27 +1,63 @@
-import { RequestOptions, Route } from "./types";
+import handleResponse from "./handleResponse";
+import { RequestOptions, RequestResult, Route } from "./types";
 import { makeHeaders, makeUrl } from "./utils";
 
-interface Options extends RequestOptions {
+interface Options<TData, TBody> extends RequestOptions<TData, TBody> {
   controller?: AbortController;
 }
 
-export default async function request<TData>(
-  { path, method, noAuth }: Route<TData>,
-  { query, body, pathParams, controller }: Options = {}
-) {
+export default async function request<TData, TBody>(
+  { path, method, noAuth }: Route<TData, TBody>,
+  {
+    query,
+    body,
+    pathParams,
+    controller,
+    onResponse,
+    silent,
+    reattempts = 3,
+  }: Options<TData, TBody> = {}
+): Promise<RequestResult<TData>> {
   const signal = controller?.signal;
-
-  const headers = makeHeaders(noAuth ?? false);
   const url = makeUrl(path, query, pathParams);
 
-  const options: RequestInit = { headers, method, signal };
+  const options: RequestInit = { method, signal };
 
   if (body) {
     options.body = JSON.stringify(body);
   }
 
-  const res = await fetch(url, options);
-  const data: TData = await res.json();
+  let result: RequestResult<TData> = {
+    res: undefined,
+    data: undefined,
+    error: undefined,
+  };
+
+  for (let i = 0; i < reattempts + 1; i++) {
+    options.headers = makeHeaders(noAuth ?? false);
+
+    try {
+      const res = await fetch(url, options);
+      const data: TData = await res.json();
+
+      result = {
+        res,
+        data: res.ok ? data : undefined,
+        error: res.ok ? undefined : (data as Record<string, unknown>),
+      };
+
+      onResponse?.(result);
+      handleResponse(result, silent);
+
+      return result;
+    } catch (error: any) {
+      result = { error, res: undefined, data: undefined };
+    }
+  }
 
-  return { res, data };
+  console.error(
+    `Request failed after ${reattempts + 1} attempts`,
+    result.error
+  );
+  return result;
 }
diff --git a/src/Utils/request/types.ts b/src/Utils/request/types.ts
index e7f0f9544a3..e22d37f3090 100644
--- a/src/Utils/request/types.ts
+++ b/src/Utils/request/types.ts
@@ -12,16 +12,28 @@ export interface QueryRoute<TData> extends RouteBase<TData> {
   method?: "GET";
 }
 
-export interface MutationRoute<TData> extends RouteBase<TData> {
+export interface MutationRoute<TData, TBody> extends RouteBase<TData> {
   method: "POST" | "PUT" | "PATCH" | "DELETE";
+  TBody?: TBody;
 }
 
-export type Route<TData> = QueryRoute<TData> | MutationRoute<TData>;
+export type Route<TData, TBody> =
+  | QueryRoute<TData>
+  | MutationRoute<TData, TBody>;
 
-export interface RequestOptions {
+export interface RequestResult<TData> {
+  res: Response | undefined;
+  data: TData | undefined;
+  error: undefined | Record<string, unknown>;
+}
+
+export interface RequestOptions<TData = unknown, TBody = unknown> {
   query?: QueryParams;
-  body?: object;
+  body?: TBody;
   pathParams?: Record<string, string>;
+  onResponse?: (res: RequestResult<TData>) => void;
+  silent?: boolean;
+  reattempts?: number;
 }
 
 export interface PaginatedResponse<TItem> {
diff --git a/src/Utils/request/useQuery.ts b/src/Utils/request/useQuery.ts
index e459a579e3e..2a8cb2e2ad4 100644
--- a/src/Utils/request/useQuery.ts
+++ b/src/Utils/request/useQuery.ts
@@ -1,26 +1,24 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import { QueryRoute, RequestOptions } from "./types";
+import { QueryRoute, RequestOptions, RequestResult } from "./types";
 import request from "./request";
 import { mergeRequestOptions } from "./utils";
 
-export interface QueryOptions extends RequestOptions {
+export interface QueryOptions<TData> extends RequestOptions<TData> {
   prefetch?: boolean;
   refetchOnWindowFocus?: boolean;
 }
 
 export default function useQuery<TData>(
   route: QueryRoute<TData>,
-  options?: QueryOptions
+  options?: QueryOptions<TData>
 ) {
-  const [res, setRes] = useState<Response>();
-  const [data, setData] = useState<TData>();
-  const [error, setError] = useState<any>();
+  const [response, setResponse] = useState<RequestResult<TData>>();
   const [loading, setLoading] = useState(false);
 
   const controllerRef = useRef<AbortController>();
 
   const runQuery = useCallback(
-    async (overrides?: QueryOptions) => {
+    async (overrides?: QueryOptions<TData>) => {
       controllerRef.current?.abort();
 
       const controller = new AbortController();
@@ -32,20 +30,8 @@ export default function useQuery<TData>(
           : options;
 
       setLoading(true);
-
-      try {
-        const { res, data } = await request<TData>(route, resolvedOptions);
-
-        setRes(res);
-        setData(res.ok ? data : undefined);
-        setError(res.ok ? undefined : data);
-      } catch (error) {
-        console.error(error);
-        setData(undefined);
-        setError(error);
-      } finally {
-        setLoading(false);
-      }
+      setResponse(await request(route, resolvedOptions));
+      setLoading(false);
     },
     [route, JSON.stringify(options)]
   );
@@ -66,5 +52,5 @@ export default function useQuery<TData>(
     }
   }, [runQuery, options?.refetchOnWindowFocus]);
 
-  return { res, data, error, loading, refetch: runQuery };
+  return { ...response, loading, refetch: runQuery };
 }
diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
index 21236a8145f..f159df1b7a7 100644
--- a/src/Utils/request/utils.ts
+++ b/src/Utils/request/utils.ts
@@ -69,13 +69,22 @@ export function getAuthorizationHeader() {
   return null;
 }
 
-export function mergeRequestOptions(
-  options: RequestOptions,
-  overrides: RequestOptions
-): RequestOptions {
+export function mergeRequestOptions<TData>(
+  options: RequestOptions<TData>,
+  overrides: RequestOptions<TData>
+): RequestOptions<TData> {
   return {
+    ...options,
+    ...overrides,
+
     query: { ...options.query, ...overrides.query },
     body: { ...options.body, ...overrides.body },
     pathParams: { ...options.pathParams, ...overrides.pathParams },
+
+    onResponse: (res) => {
+      options.onResponse?.(res);
+      overrides.onResponse?.(res);
+    },
+    silent: overrides.silent || options.silent,
   };
 }
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 0ccf38ee9ce..3aef5b03d67 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,5 +1,10 @@
 import { navigate } from "raviger";
-import { LocalStorageKeys } from "../Common/constants";
+import {
+  AREACODES,
+  IN_LANDLINE_AREA_CODES,
+  LocalStorageKeys,
+} from "../Common/constants";
+import phoneCodesJson from "../Common/static/countryPhoneAndFlags.json";
 import dayjs from "./dayjs";
 
 interface ApacheParams {
@@ -240,3 +245,164 @@ export const formatCurrency = (price: number) =>
 export const isUserOnline = (user: { last_login: DateLike }) => {
   return dayjs().subtract(5, "minutes").isBefore(user.last_login);
 };
+
+export interface CountryData {
+  flag: string;
+  name: string;
+  code: string;
+}
+
+export const parsePhoneNumber = (phoneNumber: string, countryCode?: string) => {
+  if (!phoneNumber) return "";
+  if (phoneNumber === "+91") return "";
+  const phoneCodes: Record<string, CountryData> = phoneCodesJson;
+  let parsedNumber = phoneNumber.replace(/[-+() ]/g, "");
+  if (countryCode && phoneCodes[countryCode]) {
+    parsedNumber = phoneCodes[countryCode].code + parsedNumber;
+  } else if (!phoneNumber.startsWith("+")) {
+    return undefined;
+  }
+  parsedNumber = "+" + parsedNumber;
+  return parsedNumber;
+};
+
+export const formatPhoneNumber = (phoneNumber: string) => {
+  if (phoneNumber.startsWith("+91")) {
+    phoneNumber = phoneNumber.startsWith("+910")
+      ? phoneNumber.slice(4)
+      : phoneNumber.slice(3);
+    const landline_code = IN_LANDLINE_AREA_CODES.find((code) =>
+      phoneNumber.startsWith(code)
+    );
+    if (landline_code === undefined)
+      return "+91" + " " + phoneNumber.slice(0, 5) + " " + phoneNumber.slice(5);
+    const subscriber_no_length = 10 - landline_code.length;
+    return (
+      "+91" +
+      " " +
+      landline_code +
+      " " +
+      phoneNumber.slice(
+        landline_code.length,
+        subscriber_no_length / 2 + landline_code.length
+      ) +
+      " " +
+      phoneNumber.slice(subscriber_no_length / 2 + landline_code.length)
+    );
+  } else if (phoneNumber.startsWith("1800")) {
+    return "1800" + " " + phoneNumber.slice(4, 7) + " " + phoneNumber.slice(7);
+  } else if (phoneNumber.startsWith("+")) {
+    const countryCode = getCountryCode(phoneNumber);
+    if (!countryCode) return phoneNumber;
+    const phoneCodes: Record<string, CountryData> = phoneCodesJson;
+    return (
+      "+" +
+      phoneCodes[countryCode].code +
+      " " +
+      phoneNumber.slice(phoneCodes[countryCode].code.length + 1)
+    );
+  }
+  return phoneNumber;
+};
+
+export const getCountryCode = (phoneNumber: string) => {
+  if (phoneNumber.startsWith("+")) {
+    const phoneCodes: Record<string, CountryData> = phoneCodesJson;
+    const phoneCodesArr = Object.keys(phoneCodes);
+    phoneNumber = phoneNumber.slice(1);
+    const allMatchedCountries: { name: string; code: string }[] = [];
+    for (let i = 0; i < phoneCodesArr.length; i++) {
+      if (
+        phoneNumber.startsWith(
+          phoneCodes[phoneCodesArr[i]].code.replaceAll("-", "")
+        )
+      ) {
+        allMatchedCountries.push({
+          name: phoneCodesArr[i],
+          code: phoneCodes[phoneCodesArr[i]].code.replaceAll("-", ""),
+        });
+      }
+    }
+    // returns the country which is longest in case there are multiple matches
+    if (allMatchedCountries.length === 0) return undefined;
+    const matchedCountry = allMatchedCountries.reduce((max, country) =>
+      max.code > country.code ? max : country
+    );
+    const sameCodeCountries = allMatchedCountries.filter(
+      (country) => country.code === matchedCountry.code
+    );
+    if (matchedCountry === undefined) return undefined;
+    // some countries share same country code but differ in area codes
+    // The area codes are checked for such countries
+    if (matchedCountry.code == "1") {
+      const areaCode = phoneNumber.substring(1, 4);
+      return (
+        sameCodeCountries.find((country) =>
+          AREACODES[country.name]?.includes(areaCode)
+        )?.name ?? "US"
+      );
+    } else if (matchedCountry.code === "262") {
+      const areaCode = phoneNumber.substring(3, 6);
+      return sameCodeCountries.find((country) =>
+        AREACODES[country.name]?.includes(areaCode)
+      )?.name;
+    } else if (matchedCountry.code === "61") {
+      const areaCode = phoneNumber.substring(2, 7);
+      return (
+        sameCodeCountries.find((country) =>
+          AREACODES[country.name]?.includes(areaCode)
+        )?.name ?? "AU"
+      );
+    } else if (matchedCountry.code === "599") {
+      const areaCode = phoneNumber.substring(3, 4);
+      return (
+        sameCodeCountries.find((country) =>
+          AREACODES[country.name]?.includes(areaCode)
+        )?.name ?? "CW"
+      );
+    } else if (matchedCountry.code == "7") {
+      const areaCode = phoneNumber.substring(1, 2);
+      return (
+        sameCodeCountries.find((country) =>
+          AREACODES[country.name]?.includes(areaCode)
+        )?.name ?? "RU"
+      );
+    } else if (matchedCountry.code == "47") {
+      const areaCode = phoneNumber.substring(2, 4);
+      return (
+        sameCodeCountries.find((country) =>
+          AREACODES[country.name]?.includes(areaCode)
+        )?.name ?? "NO"
+      );
+    }
+    return matchedCountry.name;
+  }
+  return undefined;
+};
+
+export const formatAge = (
+  age?: number,
+  date_of_birth?: string,
+  abbreviated = false
+) => {
+  if (!age && !date_of_birth) return undefined;
+  if (!age) age = 0;
+
+  const daySuffix = abbreviated ? "d" : "days";
+  const monthSuffix = abbreviated ? "mo" : "months";
+  const yearSuffix = abbreviated ? "yr" : "years";
+
+  if (age < 1 && date_of_birth) {
+    const dob = new Date(date_of_birth);
+    const today = new Date();
+    const diffTime = Math.abs(today.getTime() - dob.getTime());
+    const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+    const months = Math.floor(diffDays / 30);
+    const days = diffDays % 30;
+    if (months === 0) {
+      return `${days} ${daySuffix}`;
+    }
+    return `${months} ${monthSuffix} ${days} ${daySuffix}`;
+  }
+  return `${age} ${yearSuffix}`;
+};