diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
index f04045d0c72..001ceda68dc 100644
--- a/.github/workflows/cypress.yaml
+++ b/.github/workflows/cypress.yaml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1,2,3,4,5,6,7,8]
+        containers: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
       - name: Checkout 📥
         uses: actions/checkout@v3
@@ -32,9 +32,9 @@ jobs:
         run: |
           cd care
           make docker_config_file=docker-compose.pre-built.yaml up 
-          while docker compose exec backend bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
+          while docker compose exec celery-beat bash -c "python manage.py showmigrations 2>/dev/null | cat | grep -q '\[ \]'"; do
             >&2 echo "Migrations are not yet applied - sleeping"
-            sleep 5
+            sleep 10
           done
           echo "Migrations are applied"
           cd ..
@@ -43,10 +43,16 @@ jobs:
         run: |
           cd care
           docker compose exec backend bash -c "python manage.py load_dummy_data"
+          docker restart care-backend-1
           cd ..
 
-      - name: Check care is up ♻
-        run: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+      - name: Wait for care to be up ♻
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 1
+          max_attempts: 5
+          command: curl -o /dev/null -s -w "%{http_code}\n" http://localhost:9000
+          on_retry_command: sleep 5
 
       - name: Install dependencies 📦
         run: npm install
@@ -79,4 +85,3 @@ jobs:
         with:
           name: cypress-screenshots
           path: cypress/screenshots
-
diff --git a/cypress/e2e/external_results_spec/filter.cy.ts b/cypress/e2e/external_results_spec/filter.cy.ts
index 577b6a46d98..3dd18704a46 100644
--- a/cypress/e2e/external_results_spec/filter.cy.ts
+++ b/cypress/e2e/external_results_spec/filter.cy.ts
@@ -20,7 +20,7 @@ describe("External Results Filters", () => {
     cy.get("#local_bodies").click();
     cy.get("#wards").click();
     cy.get("[role='option']").should("be.visible");
-    cy.contains("[role='option']", "12").click();
+    cy.contains("[role='option']", "4").click();
     cy.contains("Apply").click();
   });
 
diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
index 9fe78f84256..9725ed42a28 100644
--- a/cypress/e2e/facility_spec/facility_creation.cy.ts
+++ b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -120,6 +120,8 @@ describe("Facility Creation", () => {
       cy.get("[role='option']").contains(featureText).click();
     });
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
@@ -190,6 +192,8 @@ describe("Facility Creation", () => {
     facilityPage.visitCreateFacilityPage();
     facilityPage.fillFacilityName(facilityName);
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
@@ -217,7 +221,7 @@ describe("Facility Creation", () => {
       .should("be.visible");
     // verify the facility homepage
     cy.visit("/facility");
-    cy.clearAllFilters();
+    cy.get("#removeicon").click();
     manageUserPage.typeFacilitySearch(facilityName);
     facilityPage.verifyFacilityBadgeContent(facilityName);
     manageUserPage.assertFacilityInCard(facilityName);
@@ -228,6 +232,8 @@ describe("Facility Creation", () => {
     facilityPage.visitCreateFacilityPage();
     facilityPage.fillFacilityName(facilityName);
     facilityPage.fillPincode("682001");
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
     facilityPage.selectLocalBody("Aluva");
     facilityPage.selectWard("4");
     facilityPage.fillAddress(facilityAddress);
diff --git a/cypress/e2e/patient_spec/patient_crud.cy.ts b/cypress/e2e/patient_spec/patient_crud.cy.ts
index b9843c1556d..06a27333b9e 100644
--- a/cypress/e2e/patient_spec/patient_crud.cy.ts
+++ b/cypress/e2e/patient_spec/patient_crud.cy.ts
@@ -2,6 +2,7 @@ import { afterEach, before, beforeEach, cy, describe, it } from "local-cypress";
 import LoginPage from "../../pageobject/Login/LoginPage";
 import { PatientPage } from "../../pageobject/Patient/PatientCreation";
 import { UpdatePatientPage } from "../../pageobject/Patient/PatientUpdate";
+import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import { PatientConsultationPage } from "../../pageobject/Patient/PatientConsultation";
 import {
   emergency_phone_number,
@@ -19,6 +20,7 @@ describe("Patient Creation with consultation", () => {
   const patientPage = new PatientPage();
   const updatePatientPage = new UpdatePatientPage();
   const patientConsultationPage = new PatientConsultationPage();
+  const facilityPage = new FacilityPage();
 
   before(() => {
     loginPage.loginAsDisctrictAdmin();
@@ -42,10 +44,13 @@ describe("Patient Creation with consultation", () => {
       "Male",
       "Test Patient Address",
       "682001",
-      "1: PAZHAMTHOTTAM",
       "O+",
       "01012001"
     );
+    facilityPage.selectStateOnPincode("Kerala");
+    facilityPage.selectDistrictOnPincode("Ernakulam");
+    facilityPage.selectLocalBody("Aluva");
+    facilityPage.selectWard("4");
     patientPage.clickCreatePatient();
 
     patientPage.verifyPatientIsCreated();
diff --git a/cypress/e2e/patient_spec/patient_manage.cy.ts b/cypress/e2e/patient_spec/patient_manage.cy.ts
index 89d00b6bb9f..6c58767c06b 100644
--- a/cypress/e2e/patient_spec/patient_manage.cy.ts
+++ b/cypress/e2e/patient_spec/patient_manage.cy.ts
@@ -36,7 +36,7 @@ describe("Patient", () => {
   // commented out the shifting request, as logic need to be re-visited
 
   it("Post doctor notes for an already created patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 3");
     patientConsultationPage.visitDoctorNotesPage();
     patientConsultationPage.addDoctorsNotes("Test Doctor Notes");
     patientConsultationPage.postDoctorNotes();
@@ -46,7 +46,7 @@ describe("Patient", () => {
   });
 
   it("Edit prescription for an already created patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 4");
     patientConsultationPage.visitEditPrescriptionPage();
     patientConsultationPage.clickAddPrescription();
     patientConsultationPage.interceptMediaBase();
@@ -59,14 +59,14 @@ describe("Patient", () => {
   });
 
   it("Upload consultations file ", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 5");
     patientConsultationPage.visitFilesPage();
     patientConsultationPage.uploadFile();
     patientConsultationPage.clickUploadFile();
   });
 
   it("Discharge a patient", () => {
-    patientPage.visitPatient();
+    patientPage.visitPatient("Dummy Patient 6");
     patientConsultationPage.clickDischargePatient();
     patientConsultationPage.selectDischargeReason("Recovered");
     patientConsultationPage.addDischargeNotes("Discharge notes");
diff --git a/cypress/pageobject/Facility/FacilityCreation.ts b/cypress/pageobject/Facility/FacilityCreation.ts
index c13f5beac8e..608dd9c357b 100644
--- a/cypress/pageobject/Facility/FacilityCreation.ts
+++ b/cypress/pageobject/Facility/FacilityCreation.ts
@@ -402,6 +402,40 @@ class FacilityPage {
       .its("response.statusCode")
       .should("eq", 201);
   }
+
+  getStateElement() {
+    return cy.get("#state");
+  }
+
+  getDistrictElement() {
+    return cy.get("#district");
+  }
+
+  selectStateOnPincode(stateName) {
+    this.getStateElement()
+      .scrollIntoView()
+      .should("be.visible")
+      .then(($element) => {
+        const text = $element.text();
+        if (!text.includes(stateName)) {
+          this.getStateElement().click();
+          cy.get("li[role=option]").contains(stateName).click();
+        }
+      });
+  }
+
+  selectDistrictOnPincode(districtName) {
+    this.getDistrictElement()
+      .scrollIntoView()
+      .should("be.visible")
+      .then(($element) => {
+        const text = $element.text();
+        if (!text.includes(districtName)) {
+          this.getDistrictElement().click();
+          cy.get("li[role=option]").contains(districtName).click();
+        }
+      });
+  }
 }
 
 export default FacilityPage;
diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index 26d75feba2e..7528b30da06 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -103,7 +103,8 @@ export class PatientConsultationPage {
   }
 
   visitFilesPage() {
-    cy.get("a").contains("Files").click();
+    cy.get("#consultation_tab_nav").scrollIntoView();
+    cy.get("#consultation_tab_nav").contains("Files").click();
   }
 
   uploadFile() {
@@ -199,11 +200,13 @@ export class PatientConsultationPage {
   }
 
   visitDoctorNotesPage() {
+    cy.get("#patient_doctor_notes").scrollIntoView();
     cy.get("#patient_doctor_notes").click();
   }
 
   addDoctorsNotes(notes: string) {
-    cy.get("#doctor_notes_textarea").type(notes);
+    cy.get("#doctor_notes_textarea").scrollIntoView();
+    cy.get("#doctor_notes_textarea").click().type(notes);
   }
 
   postDoctorNotes() {
@@ -213,6 +216,7 @@ export class PatientConsultationPage {
   }
 
   clickDischargePatient() {
+    cy.get("#show-more").scrollIntoView();
     cy.get("#show-more").click();
     cy.contains("p", "Discharge from CARE").click();
   }
@@ -248,6 +252,7 @@ export class PatientConsultationPage {
   }
 
   visitEditPrescriptionPage() {
+    cy.get("#consultation_tab_nav").scrollIntoView();
     cy.get("#consultation_tab_nav").contains("Medicines").click();
     cy.get("a[href='prescriptions']").first().click();
   }
diff --git a/cypress/pageobject/Patient/PatientCreation.ts b/cypress/pageobject/Patient/PatientCreation.ts
index 47bf9c913ad..4e2f92ac040 100644
--- a/cypress/pageobject/Patient/PatientCreation.ts
+++ b/cypress/pageobject/Patient/PatientCreation.ts
@@ -10,10 +10,14 @@ export class PatientPage {
     cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
   }
 
-  visitPatient() {
+  visitPatient(patientName) {
+    cy.get("#name").click().type(patientName);
     cy.intercept("GET", "**/api/v1/consultation/**").as("getPatient");
-    cy.get("[data-cy='patient']").first().click();
+    cy.get("#patient-name-list").contains(patientName).click();
     cy.wait("@getPatient").its("response.statusCode").should("eq", 200);
+    cy.get("#patient-name-consultation")
+      .should("be.visible")
+      .contains(patientName);
   }
 
   selectFacility(facilityName: string) {
@@ -41,7 +45,6 @@ export class PatientPage {
     gender: string,
     address: string,
     pincode: string,
-    wardName: string,
     bloodGroup: string,
     dateOfBirth: string
   ) {
@@ -58,16 +61,6 @@ export class PatientPage {
     cy.get("[data-testid=current-address] textarea").type(address);
     cy.get("[data-testid=permanent-address] input").check();
     cy.get("#pincode").type(pincode);
-    cy.get("[data-testid=localbody] button")
-      .click()
-      .then(() => {
-        cy.get("[role='option']").first().click();
-      });
-    cy.get("[data-testid=ward-respective-lsgi] button")
-      .click()
-      .then(() => {
-        cy.get("[role='option']").contains(wardName).click();
-      });
     cy.get("[name=medical_history_check_1]").check();
     cy.get("[data-testid=blood-group] button")
       .click()
diff --git a/cypress/pageobject/Users/ManageUserPage.ts b/cypress/pageobject/Users/ManageUserPage.ts
index b79b96447f0..d3f7e17e7d5 100644
--- a/cypress/pageobject/Users/ManageUserPage.ts
+++ b/cypress/pageobject/Users/ManageUserPage.ts
@@ -94,6 +94,7 @@ export class ManageUserPage {
   }
 
   typeFacilitySearch(facilityName) {
+    cy.get("#search").click().clear();
     cy.get("#search").click().type(facilityName);
   }
 
diff --git a/index.html b/index.html
index 58cb9fffcd1..83c80ef3214 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,34 @@
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+    <div id="root">
+      <style>
+        .App-logo {
+          height: 10vmin;
+          pointer-events: none;
+          filter: brightness(80%);
+        }
+       @media (prefers-reduced-motion: no-preference) {
+          .App-logo {
+            animation: App-logo-blink 1s linear infinite;
+          }
+        }
+        @keyframes App-logo-blink {
+          0% { opacity: 0;}
+          25% { opacity: 0.5;}
+          50% {opacity: 1;}
+          75% {opacity: 0.5;}
+          100% {opacity: 0;}
+        }
+      </style>
+      <div style="display: grid;place-items: center;height: 100vh; text-align: center;">
+        <img 
+        class="App-logo"
+        src="https://cdn.coronasafe.network/light-logo.svg"
+        alt="Care is loading"
+        />
+      </div>
+    </div>
     <script type="module" src="/src/index.tsx"></script>
     <script
       src="https://kit.fontawesome.com/d69454c2e7.js"
diff --git a/src/Common/hooks/useAuthUser.ts b/src/Common/hooks/useAuthUser.ts
index e46bbb4f0b2..dda5f399952 100644
--- a/src/Common/hooks/useAuthUser.ts
+++ b/src/Common/hooks/useAuthUser.ts
@@ -1,14 +1,32 @@
 import { createContext, useContext } from "react";
 import { UserModel } from "../../Components/Users/models";
+import { RequestResult } from "../../Utils/request/types";
+import { JwtTokenObtainPair, LoginCredentials } from "../../Redux/api";
 
-export const AuthUserContext = createContext<UserModel | null>(null);
+type SignInReturnType = RequestResult<JwtTokenObtainPair>;
 
-export default function useAuthUser() {
-  const user = useContext(AuthUserContext);
+type AuthContextType = {
+  user: UserModel | undefined;
+  signIn: (creds: LoginCredentials) => Promise<SignInReturnType>;
+  signOut: () => Promise<void>;
+};
 
-  if (!user) {
-    throw new Error("useAuthUser must be used within an AuthUserProvider");
+export const AuthUserContext = createContext<AuthContextType | null>(null);
+
+export const useAuthContext = () => {
+  const ctx = useContext(AuthUserContext);
+  if (!ctx) {
+    throw new Error(
+      "'useAuthContext' must be used within 'AuthUserProvider' only"
+    );
   }
+  return ctx;
+};
 
+export default function useAuthUser() {
+  const user = useAuthContext().user;
+  if (!user) {
+    throw new Error("'useAuthUser' must be used within 'AppRouter' only");
+  }
   return user;
 }
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index 4aad207c25a..c2acb88cf0c 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -9,12 +9,13 @@ import LanguageSelectorLogin from "../Common/LanguageSelectorLogin";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import useConfig from "../../Common/hooks/useConfig";
 import CircularProgress from "../Common/components/CircularProgress";
-import { LocalStorageKeys } from "../../Common/constants";
 import ReactMarkdown from "react-markdown";
 import rehypeRaw from "rehype-raw";
-import { handleRedirection, invalidateFiltersCache } from "../../Utils/utils";
+import { invalidateFiltersCache } from "../../Utils/utils";
+import { useAuthContext } from "../../Common/hooks/useAuthUser";
 
 export const Login = (props: { forgot?: boolean }) => {
+  const { signIn } = useAuthContext();
   const {
     main_logo,
     recaptcha_site_key,
@@ -82,7 +83,7 @@ export const Login = (props: { forgot?: boolean }) => {
     return form;
   };
 
-  // set loading to false when component is dismounted
+  // set loading to false when component is unmounted
   useEffect(() => {
     return () => {
       setLoading(false);
@@ -91,35 +92,17 @@ export const Login = (props: { forgot?: boolean }) => {
 
   const handleSubmit = async (e: any) => {
     e.preventDefault();
+
+    setLoading(true);
     invalidateFiltersCache();
-    const valid = validateData();
-    if (valid) {
-      // replaces button with spinner
-      setLoading(true);
 
-      const { res, data } = await request(routes.login, {
-        body: { ...valid },
-      });
-      if (res && res.status === 429) {
-        setCaptcha(true);
-        // captcha displayed set back to login button
-        setLoading(false);
-      } else if (res && res.status === 200 && data) {
-        localStorage.setItem(LocalStorageKeys.accessToken, data.access);
-        localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
-        if (
-          window.location.pathname === "/" ||
-          window.location.pathname === "/login"
-        ) {
-          handleRedirection();
-        } else {
-          window.location.href = window.location.pathname.toString();
-        }
-      } else {
-        // error from server set back to login button
-        setLoading(false);
-      }
-    }
+    const validated = validateData();
+    if (!validated) return;
+
+    const { res } = await signIn(validated);
+
+    setCaptcha(res?.status === 429);
+    setLoading(false);
   };
 
   const validateForgetData = () => {
diff --git a/src/Components/Common/Sidebar/SidebarUserCard.tsx b/src/Components/Common/Sidebar/SidebarUserCard.tsx
index 59970e8a73c..75cf2d9ce43 100644
--- a/src/Components/Common/Sidebar/SidebarUserCard.tsx
+++ b/src/Components/Common/Sidebar/SidebarUserCard.tsx
@@ -1,13 +1,13 @@
 import { Link } from "raviger";
 import { useTranslation } from "react-i18next";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
-import { handleSignOut } from "../../../Utils/utils";
-import useAuthUser from "../../../Common/hooks/useAuthUser";
+import { formatName } from "../../../Utils/utils";
+import useAuthUser, { useAuthContext } from "../../../Common/hooks/useAuthUser";
 
 const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
   const { t } = useTranslation();
   const user = useAuthUser();
-  const profileName = `${user.first_name ?? ""} ${user.last_name ?? ""}`.trim();
+  const { signOut } = useAuthContext();
 
   return (
     <div
@@ -18,10 +18,7 @@ const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
       <Link href="/user/profile" className="flex-none py-3">
         <CareIcon className="care-l-user-circle text-3xl text-white" />
       </Link>
-      <div
-        className="flex cursor-pointer justify-center"
-        onClick={() => handleSignOut(true)}
-      >
+      <div className="flex cursor-pointer justify-center" onClick={signOut}>
         <CareIcon
           className={`care-l-sign-out-alt text-2xl text-gray-400 ${
             shrinked ? "visible" : "hidden"
@@ -39,12 +36,12 @@ const SidebarUserCard = ({ shrinked }: { shrinked: boolean }) => {
             className="flex-nowrap overflow-hidden break-words font-semibold text-white"
             id="profilenamelink"
           >
-            {profileName}
+            {formatName(user)}
           </Link>
         </div>
         <div
           className="min-h-6 flex cursor-pointer items-center"
-          onClick={() => handleSignOut(true)}
+          onClick={signOut}
         >
           <CareIcon
             className={`care-l-sign-out-alt ${
diff --git a/src/Components/ErrorPages/SessionExpired.tsx b/src/Components/ErrorPages/SessionExpired.tsx
index 25b57e789c9..419c9c44dce 100644
--- a/src/Components/ErrorPages/SessionExpired.tsx
+++ b/src/Components/ErrorPages/SessionExpired.tsx
@@ -1,12 +1,12 @@
 import * as Notification from "../../Utils/Notifications";
 import { useNavigate } from "raviger";
-import { useContext, useEffect } from "react";
-import { handleSignOut } from "../../Utils/utils";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { AuthUserContext } from "../../Common/hooks/useAuthUser";
+import { useAuthContext } from "../../Common/hooks/useAuthUser";
 
 export default function SessionExpired() {
-  const isAuthenticated = !!useContext(AuthUserContext);
+  const { signOut, user } = useAuthContext();
+  const isAuthenticated = !!user;
   const navigate = useNavigate();
   const { t } = useTranslation();
 
@@ -32,9 +32,7 @@ export default function SessionExpired() {
           <br />
           <br />
           <div
-            onClick={() => {
-              handleSignOut(false);
-            }}
+            onClick={signOut}
             className="hover:bg-primary- inline-block cursor-pointer rounded-lg bg-primary-600 px-4 py-2 text-white hover:text-white"
           >
             {t("return_to_login")}
diff --git a/src/Components/ExternalResult/ExternalResultUpload.tsx b/src/Components/ExternalResult/ExternalResultUpload.tsx
index 5a9262b2990..a8f9e339254 100644
--- a/src/Components/ExternalResult/ExternalResultUpload.tsx
+++ b/src/Components/ExternalResult/ExternalResultUpload.tsx
@@ -1,6 +1,6 @@
 import _ from "lodash-es";
 import { navigate } from "raviger";
-import { lazy, useState } from "react";
+import { lazy, useEffect, useState } from "react";
 import CSVReader from "react-csv-reader";
 import useConfig from "../../Common/hooks/useConfig";
 import * as Notification from "../../Utils/Notifications.js";
@@ -11,6 +11,7 @@ import useAppHistory from "../../Common/hooks/useAppHistory";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import { IExternalResult } from "./models";
+import CareIcon from "../../CAREUI/icons/CareIcon";
 
 export default function ExternalResultUpload() {
   const { sample_format_external_result_import } = useConfig();
@@ -18,12 +19,31 @@ export default function ExternalResultUpload() {
   const [loading, setLoading] = useState(false);
   const [csvData, setCsvData] = useState(new Array<IExternalResult>());
   const [errors, setErrors] = useState<any>([]);
+  const [validationErrorCount, setValidationErrorCount] = useState(0);
+  const [user, setUser] = useState<any>({});
   const handleForce = (data: any) => {
     setCsvData(data);
+    setValidationErrorCount(
+      data.filter(
+        (result: IExternalResult) =>
+          result.district !== user.district_object.name
+      ).length
+    );
   };
   const { t } = useTranslation();
   const { goBack } = useAppHistory();
 
+  const fetchUser = async () => {
+    const { data: userData } = await request(routes.currentUser, {
+      pathParams: {},
+    });
+    setUser(userData);
+  };
+
+  useEffect(() => {
+    fetchUser();
+  }, []);
+
   const papaparseOptions = {
     header: true,
     dynamicTyping: true,
@@ -44,13 +64,21 @@ export default function ExternalResultUpload() {
         try {
           const { res, data } = await request(routes.externalResultUploadCsv, {
             body: {
-              sample_tests: csvData,
+              sample_tests: validationErrorCount
+                ? csvData.filter(
+                    (data: IExternalResult) =>
+                      data.district === user.district_object.name
+                  )
+                : csvData,
             },
           });
 
           if (res && res.status === 202) {
             setLoading(false);
             navigate("/external_results");
+            Notification.Success({
+              msg: "External Results imported successfully",
+            });
           } else {
             if (data) {
               setErrors(data.map((err: any) => Object.entries(err)));
@@ -59,6 +87,9 @@ export default function ExternalResultUpload() {
           }
         } catch (error) {
           console.error("An error occurred:", error);
+          Notification.Error({
+            msg: "Something went wrong: " + error,
+          });
           setLoading(false);
         }
       } else {
@@ -121,6 +152,9 @@ export default function ExternalResultUpload() {
               </div>
             </div>
           </div>
+          {csvData.length > 0 && (
+            <p className="flex justify-end p-2">Total: {csvData.length}</p>
+          )}
           <div className=" rounded bg-white shadow">
             {csvData.map((data: any, index: number) => {
               return (
@@ -140,6 +174,14 @@ export default function ExternalResultUpload() {
                         })
                       : null}
                   </div>
+                  <div>
+                    {data.district !== user.district_object.name && (
+                      <p className="mt-2 flex items-center justify-center gap-1 text-red-500">
+                        <CareIcon icon="l-exclamation-triangle" /> Different
+                        districts
+                      </p>
+                    )}
+                  </div>
                 </div>
               );
             })}
@@ -149,8 +191,14 @@ export default function ExternalResultUpload() {
             <Cancel onClick={() => goBack()} />
             <Submit
               onClick={handleSubmit}
-              disabled={loading}
-              label={t("save")}
+              disabled={loading || csvData.length === validationErrorCount}
+              label={
+                validationErrorCount
+                  ? `Save Valid Records(${
+                      csvData.length - validationErrorCount
+                    })`
+                  : t("save")
+              }
               data-testid="submit-button"
             />
           </div>
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
index cf0ce7bd6af..ea0e466dffa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationABGTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></ABGPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
index c3515a80953..43aaf627534 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
@@ -8,7 +8,7 @@ export const ConsultationDialysisTab = (props: ConsultationTabProps) => {
   return (
     <div>
       <PageTitle title="Dialysis Plots" hideBack={true} breadcrumbs={false} />
-      <DialysisPlots consultationId={props.consultationId}></DialysisPlots>
+      <DialysisPlots consultationId={props.consultationId} />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
index 85f34f0ec63..5956071e5fa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
@@ -18,7 +18,7 @@ export const ConsultationNeurologicalMonitoringTab = (
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NeurologicalTable>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
index 721ee18d13e..f8d38b2adb3 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNursingTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NursingPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
index 74e250f0577..75e0987cffd 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNutritionTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NutritionPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
index 69d20dd64c9..09f6cb05a7b 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationSummaryTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></PrimaryParametersPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
index 0d8a70781da..beac7f595a8 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -233,7 +233,7 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                               ? formatDate(
                                   props.consultationData.discharge_date
                                 )
-                              : "--/--/----"}
+                              : "--/--/---- --:-- --"}
                           </span>
                         </div>
                         <div>
@@ -294,10 +294,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                           Discharge Date {" - "}
                           <span className="font-semibold">
                             {props.consultationData.discharge_date
-                              ? formatDate(
+                              ? formatDateTime(
                                   props.consultationData.discharge_date
                                 )
-                              : "--/--/----"}
+                              : "--/--/---- --:-- --"}
                           </span>
                         </div>
                         <div>
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
index d14b54cc096..36a72ab789e 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationVentilatorTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></VentilatorPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 2f6ca03ef06..54eee52878e 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -462,7 +462,6 @@ export const ConsultationDetails = (props: any) => {
             </div>
           </div>
         </div>
-
         <SelectedTab {...consultationTabProps} />
       </div>
 
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 1d4abbedc39..3207787a27d 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -400,7 +400,9 @@ export const ConsultationForm = (props: any) => {
             cause_of_death: res.data?.discharge_notes || "",
             death_datetime: res.data?.death_datetime || "",
             death_confirmed_doctor: res.data?.death_confirmed_doctor || "",
-            InvestigationAdvice: res.data.investigation,
+            InvestigationAdvice: Array.isArray(res.data.investigation)
+              ? res.data.investigation
+              : [],
             diagnoses: res.data.diagnoses.sort(
               (a: ConsultationDiagnosis, b: ConsultationDiagnosis) =>
                 ConditionVerificationStatuses.indexOf(a.verification_status) -
@@ -410,7 +412,7 @@ export const ConsultationForm = (props: any) => {
           dispatch({ type: "set_form", form: { ...state.form, ...formData } });
           setBed(formData.bed);
 
-          if (res.data.last_daily_round) {
+          if (res.data.last_daily_round && state.form.category) {
             setDisabledFields((fields) => [...fields, "category"]);
           }
         } else {
diff --git a/src/Components/Facility/Consultations/Mews.tsx b/src/Components/Facility/Consultations/Mews.tsx
new file mode 100644
index 00000000000..6b8e7de806e
--- /dev/null
+++ b/src/Components/Facility/Consultations/Mews.tsx
@@ -0,0 +1,174 @@
+import { DailyRoundsModel } from "../../Patient/models";
+import RecordMeta from "../../../CAREUI/display/RecordMeta";
+import { classNames } from "../../../Utils/utils";
+
+const getRespScore = (value?: number) => {
+  if (typeof value !== "number") return;
+
+  if (value < 8) return 2;
+  if (value <= 8) return 1;
+  if (value <= 17) return 0;
+  if (value <= 20) return 1;
+  if (value <= 29) return 2;
+  return 3;
+};
+
+const getHeartRateScore = (value?: number) => {
+  if (typeof value !== "number") return;
+
+  if (value < 40) return 2;
+  if (value <= 50) return 1;
+  if (value <= 100) return 0;
+  if (value <= 110) return 1;
+  if (value <= 129) return 2;
+  return 3;
+};
+
+const getSystolicBPScore = (value?: number) => {
+  if (typeof value !== "number") return;
+
+  if (value <= 70) return 3;
+  if (value <= 80) return 2;
+  if (value <= 100) return 1;
+  if (value <= 159) return 0;
+  if (value <= 199) return 1;
+  if (value <= 220) return 2;
+  return 3;
+};
+
+const getTempRange = (value?: number) => {
+  console.log(value);
+  if (typeof value !== "number") return;
+
+  if (value < 95) return 2;
+  if (value <= 96.8) return 1;
+  if (value <= 100.4) return 0;
+  if (value <= 101.3) return 1;
+  return 2;
+};
+
+const getLOCRange = (value?: DailyRoundsModel["consciousness_level"]) => {
+  if (!value) return;
+
+  return {
+    UNRESPONSIVE: 3,
+    RESPONDS_TO_PAIN: 2,
+    RESPONDS_TO_VOICE: 1,
+    ALERT: 0,
+    AGITATED_OR_CONFUSED: 1,
+    ONSET_OF_AGITATION_AND_CONFUSION: 2,
+    UNKNOWN: undefined,
+  }[value];
+};
+
+export const Mews = ({ dailyRound }: { dailyRound: DailyRoundsModel }) => {
+  const mewsCard = (isMissing: boolean, data: string[] | number) => {
+    if (isMissing) {
+      return (
+        <>
+          <div className="tooltip mt-2 text-gray-800">
+            <p className="my-auto text-center text-2xl font-bold">N/A</p>
+            <div className="tooltip-text tooltip-bottom w-48 -translate-x-1/2 translate-y-3 whitespace-pre-wrap text-xs font-medium lg:w-64">
+              <span className="font-bold">{(data as string[]).join(", ")}</span>{" "}
+              data is missing from the last log update.
+            </div>
+          </div>
+          <div>
+            <RecordMeta
+              time={dailyRound.modified_date}
+              prefix={"Updated"}
+              className="mx-auto mt-2 w-10/12 text-xs font-medium leading-none text-gray-800"
+              inlineClassName="flex flex-wrap items-center justify-center"
+            />
+            <div className="mt-1 flex h-2 w-full flex-col items-center justify-center rounded-b-lg bg-gray-500"></div>
+          </div>
+        </>
+      );
+    } else {
+      const value = Number(data);
+      return (
+        <>
+          <div className="tooltip mt-2">
+            <p className="my-auto text-center text-2xl font-bold">{data}</p>
+            <div className="tooltip-text tooltip-bottom w-48 -translate-x-1/2 translate-y-3 whitespace-pre-wrap text-xs font-medium lg:w-64">
+              <p>
+                Resp. Rate: <span className="font-bold">{dailyRound.resp}</span>
+              </p>
+              <p>
+                Heart Rate:{" "}
+                <span className="font-bold">{dailyRound.pulse}</span>
+              </p>
+              <p>
+                Systolic BP:{" "}
+                <span className="font-bold">{dailyRound.bp?.systolic}</span>
+              </p>
+              <p>
+                Temperature:{" "}
+                <span className="font-bold">{dailyRound.temperature}</span>
+              </p>
+              <p>
+                Consciousness:{" "}
+                <span className="font-bold capitalize">
+                  {dailyRound.consciousness_level
+                    ?.replaceAll("_", " ")
+                    .toLowerCase()}
+                </span>
+              </p>
+            </div>
+          </div>
+          <div>
+            <RecordMeta
+              time={dailyRound.modified_date}
+              prefix={"Updated"}
+              className="mx-auto mt-2 w-10/12 text-xs font-medium leading-none text-gray-800"
+              inlineClassName="flex flex-wrap items-center justify-center"
+            />
+            <div
+              className={classNames(
+                "mt-1 flex h-2 w-full flex-col items-center justify-center rounded-b-lg",
+                value <= 2 && "bg-primary-500",
+                value <= 3 && "bg-yellow-300",
+                value <= 5 && "bg-warning-600",
+                value > 6 && "bg-danger-500"
+              )}
+            ></div>
+          </div>
+        </>
+      );
+    }
+  };
+
+  const scores = {
+    "Respiratory rate": getRespScore(dailyRound.resp),
+    "Heart rate": getHeartRateScore(dailyRound.pulse),
+    "Systolic BP": getSystolicBPScore(dailyRound.bp?.systolic),
+    Temperature: getTempRange(
+      dailyRound.temperature ? parseFloat(dailyRound.temperature) : undefined
+    ),
+    "Level of Consciousness": getLOCRange(dailyRound.consciousness_level),
+  };
+
+  if (Object.values(scores).some((value) => value === undefined)) {
+    return (
+      <div className="flex h-fit flex-col justify-start rounded-lg border border-black">
+        <p className="pt-1 text-center font-bold text-gray-900">MEWS Score</p>
+        {mewsCard(
+          true,
+          Object.entries(scores)
+            .filter(([_, value]) => value === undefined)
+            .map(([key]) => key)
+        )}
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-fit flex-col justify-start rounded-lg border border-black">
+      <p className="pt-1 text-center font-bold text-gray-900">MEWS Score</p>
+      {mewsCard(
+        false,
+        Object.values(scores as Record<string, number>).reduce((p, v) => p + v)
+      )}
+    </div>
+  );
+};
diff --git a/src/Components/Facility/Consultations/NursingPlot.tsx b/src/Components/Facility/Consultations/NursingPlot.tsx
index 83444b6c50f..b141e18f987 100644
--- a/src/Components/Facility/Consultations/NursingPlot.tsx
+++ b/src/Components/Facility/Consultations/NursingPlot.tsx
@@ -121,7 +121,7 @@ export const NursingPlot = (props: any) => {
         </div>
       </div>
 
-      {totalCount > PAGINATION_LIMIT && (
+      {!areFieldsEmpty() && totalCount > PAGINATION_LIMIT && (
         <div className="mt-4 flex w-full justify-center">
           <Pagination
             cPage={currentPage}
diff --git a/src/Components/Facility/FacilityCard.tsx b/src/Components/Facility/FacilityCard.tsx
index 900b6b00f47..c34fed49a6e 100644
--- a/src/Components/Facility/FacilityCard.tsx
+++ b/src/Components/Facility/FacilityCard.tsx
@@ -160,7 +160,7 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
                 <div className="flex w-full flex-wrap justify-between gap-2 py-2">
                   <div className="flex flex-wrap gap-2">
                     <div
-                      className={`tooltip ml-auto flex h-[38px] w-fit items-center justify-center rounded-md px-2 text-xl ${
+                      className={`tooltip button-size-default ml-auto flex w-fit items-center justify-center rounded-md px-2 ${
                         facility.patient_count / facility.bed_count > 0.85
                           ? "button-danger-border bg-red-500"
                           : "button-primary-border bg-primary-100"
@@ -178,7 +178,7 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
                         )}
                       />{" "}
                       <dt
-                        className={`my-1 text-sm font-semibold ${
+                        className={`text-sm font-semibold ${
                           facility.patient_count / facility.bed_count > 0.85
                             ? "text-white"
                             : "text-gray-700"
diff --git a/src/Components/Facility/FacilityUsers.tsx b/src/Components/Facility/FacilityUsers.tsx
index aba12cc3833..ca2e1d0e363 100644
--- a/src/Components/Facility/FacilityUsers.tsx
+++ b/src/Components/Facility/FacilityUsers.tsx
@@ -3,7 +3,12 @@ import CountBlock from "../../CAREUI/display/Count";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import { RESULTS_PER_PAGE_LIMIT } from "../../Common/constants";
 import * as Notification from "../../Utils/Notifications.js";
-import { classNames, isUserOnline, relativeTime } from "../../Utils/utils";
+import {
+  classNames,
+  isUserOnline,
+  relativeTime,
+  showUserDelete,
+} from "../../Utils/utils";
 import Pagination from "../Common/Pagination";
 import UserDetails from "../Common/UserDetails";
 import ButtonV2 from "../Common/components/ButtonV2";
@@ -16,6 +21,7 @@ import useAuthUser from "../../Common/hooks/useAuthUser";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import useQuery from "../../Utils/request/useQuery";
+import { UserModel } from "../Users/models";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -256,7 +262,7 @@ export default function FacilityUsers(props: any) {
   facilityUserData &&
     facilityUserData.results &&
     facilityUserData.results.length &&
-    (userList = facilityUserData.results.map((user: any) => {
+    (userList = facilityUserData.results.map((user: UserModel) => {
       return (
         <div
           key={`usr_${user.id}`}
@@ -299,7 +305,7 @@ export default function FacilityUsers(props: any) {
                       aria-label="Online"
                     ></i>
                   ) : null}
-                  {authUser.user_type === "StateAdmin" && (
+                  {showUserDelete(authUser, user) && (
                     <button
                       type="button"
                       className="focus:ring-blue m-3 w-20 self-end rounded-md border border-red-500 bg-white px-3 py-2 text-center text-sm font-medium leading-4 text-red-700 transition duration-150 ease-in-out hover:text-red-500 hover:shadow focus:border-red-300 focus:outline-none active:bg-gray-50 active:text-red-800"
diff --git a/src/Components/Facility/Investigations/ViewInvestigations.tsx b/src/Components/Facility/Investigations/ViewInvestigations.tsx
index a1381015963..7c420522c44 100644
--- a/src/Components/Facility/Investigations/ViewInvestigations.tsx
+++ b/src/Components/Facility/Investigations/ViewInvestigations.tsx
@@ -4,6 +4,7 @@ import ReportTable from "./Reports/ReportTable";
 import { formatDateTime } from "../../../Utils/utils";
 import { InvestigationSessionType } from "./investigationsTab";
 import { lazy } from "react";
+
 const Loading = lazy(() => import("../../Common/Loading"));
 
 export default function ViewInvestigations(props: {
@@ -26,7 +27,9 @@ export default function ViewInvestigations(props: {
   return (
     <div className="mx-auto max-w-7xl">
       {isLoading ? (
-        <Loading />
+        <div className="min-h-screen">
+          <Loading />
+        </div>
       ) : (
         <div className="mt-4 space-y-2 ">
           {investigations.length > 0 && (
diff --git a/src/Components/Facility/TransferPatientDialog.tsx b/src/Components/Facility/TransferPatientDialog.tsx
index 632765c2492..e6133279a9e 100644
--- a/src/Components/Facility/TransferPatientDialog.tsx
+++ b/src/Components/Facility/TransferPatientDialog.tsx
@@ -125,8 +125,11 @@ const TransferPatientDialog = (props: Props) => {
       if (res && res.data && res.status === 200) {
         dispatch({ type: "set_form", form: initForm });
         handleOk();
+
+        const patientName =
+          patientOptions.find((p) => p.id === state.form.patient)?.text || "";
         Notification.Success({
-          msg: `Patient ${res.data.patient} transferred successfully`,
+          msg: `Patient ${patientName} transferred successfully`,
         });
         const newFacilityId =
           res.data && res.data.facility_object && res.data.facility_object.id;
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 0c6d8027ce9..92daaf4ca5b 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -1,4 +1,4 @@
-import { AssignedToObjectModel } from "../Patient/models";
+import { AssignedToObjectModel, DailyRoundsModel } from "../Patient/models";
 import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import { AssetData } from "../Assets/AssetTypes";
@@ -152,7 +152,7 @@ export interface ConsultationModel {
   ett_tt?: number;
   cuff_pressure?: number;
   lines?: any;
-  last_daily_round?: any;
+  last_daily_round?: DailyRoundsModel;
   current_bed?: CurrentBed;
   review_interval?: number;
   cause_of_death?: string;
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 9b37c53f599..e94d740c0db 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -117,7 +117,9 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           }
         >
           {loading ? (
-            <Loading />
+            <div className="min-h-screen">
+              <Loading />
+            </div>
           ) : (
             <>
               {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index ce619370d03..4105cffb96c 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -45,11 +45,12 @@ const initForm: any = {
   patient_category: "",
   current_health: 0,
   actions: null,
+  action: "",
   review_interval: 0,
   admitted_to: "",
   taken_at: null,
   rounds_type: "NORMAL",
-  clone_last: null,
+  clone_last: true,
   systolic: null,
   diastolic: null,
   pulse: null,
@@ -108,9 +109,27 @@ export const DailyRounds = (props: any) => {
   const [prevReviewInterval, setPreviousReviewInterval] = useState(-1);
   const [prevAction, setPreviousAction] = useState("NO_ACTION");
   const [hasPreviousLog, setHasPreviousLog] = useState(false);
+  const [initialData, setInitialData] = useState<any>({
+    ...initForm,
+    action: "",
+  });
   const headerText = !id ? "Add Consultation Update" : "Info";
   const buttonText = !id ? "Save" : "Continue";
 
+  const formFields = [
+    "physical_examination_info",
+    "other_details",
+    "additional_symptoms",
+    "action",
+    "review_interval",
+    "bp",
+    "pulse",
+    "resp",
+    "ventilator_spo2",
+    "rhythm",
+    "rhythm_detail",
+  ];
+
   useEffect(() => {
     (async () => {
       if (patientId) {
@@ -121,10 +140,21 @@ export const DailyRounds = (props: any) => {
           setPreviousReviewInterval(
             Number(res.data.last_consultation.review_interval)
           );
-          setPreviousAction(
+          const getAction =
             TELEMEDICINE_ACTIONS.find((action) => action.id === res.data.action)
-              ?.text || "NO_ACTION"
-          );
+              ?.text || "NO_ACTION";
+          setPreviousAction(getAction);
+          setInitialData({
+            ...initialData,
+            action: getAction,
+          });
+          dispatch({
+            type: "set_form",
+            form: {
+              ...state.form,
+              action: getAction,
+            },
+          });
         }
       } else {
         setPatientName("");
@@ -156,6 +186,7 @@ export const DailyRounds = (props: any) => {
             admitted_to: res.data.admitted_to ? res.data.admitted_to : "Select",
           };
           dispatch({ type: "set_form", form: data });
+          setInitialData(data);
         }
         setIsLoading(false);
       }
@@ -225,16 +256,7 @@ export const DailyRounds = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "resp":
-          if (
-            state.form.resp === null &&
-            state.form.rounds_type === "NORMAL" &&
-            state.form.clone_last !== true
-          ) {
-            errors[field] = "Please enter a respiratory rate";
-            invalidForm = true;
-          }
-          return;
+
         default:
           return;
       }
@@ -557,7 +579,6 @@ export const DailyRounds = (props: any) => {
                   {...field("resp")}
                   label="Respiratory Rate"
                   unit="bpm"
-                  required
                   start={0}
                   end={50}
                   step={1}
@@ -627,7 +648,20 @@ export const DailyRounds = (props: any) => {
 
         <div className="mt-4 flex flex-col-reverse justify-end gap-2 md:flex-row">
           <Cancel onClick={() => goBack()} />
-          <Submit onClick={(e) => handleSubmit(e)} label={buttonText} />
+          <Submit
+            disabled={
+              state.form.clone_last !== null &&
+              !state.form.clone_last &&
+              formFields.every(
+                (field: string) => state.form[field] == initialData[field]
+              ) &&
+              (state.form.temperature == initialData.temperature ||
+                isNaN(state.form.temperature)) &&
+              state.form.rounds_type !== "VENTILATOR"
+            }
+            onClick={(e) => handleSubmit(e)}
+            label={buttonText}
+          />
         </div>
       </form>
     </Page>
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index f4d02404b7f..e1ea368af72 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -239,6 +239,7 @@ export const FileUpload = (props: FileUploadProps) => {
         setFacilityName("");
       }
     }
+
     fetchPatientName();
   }, [dispatch, patientId]);
 
@@ -898,7 +899,11 @@ export const FileUpload = (props: FileUploadProps) => {
   };
 
   if (isLoading) {
-    return <Loading />;
+    return (
+      <div className="min-h-screen">
+        <Loading />
+      </div>
+    );
   }
 
   const onFileChange = (e: ChangeEvent<HTMLInputElement>): any => {
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index 6a52d68130c..9113e8654bf 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -589,10 +589,13 @@ export const PatientManager = () => {
               )}
             </div>
             <div className="flex w-full flex-col gap-2 pl-2 md:block md:flex-row">
-              <div className="flex w-full justify-between gap-2">
-                <div className="font-semibold">
+              <div className="flex w-full items-center justify-between gap-2">
+                <div
+                  className="flex flex-wrap gap-2 font-semibold"
+                  id="patient-name-list"
+                >
                   <span className="text-xl capitalize">{patient.name}</span>
-                  <span className="ml-4 text-gray-800">
+                  <span className="text-gray-800">
                     {formatAge(patient.age, patient.date_of_birth, true)}
                   </span>
                 </div>
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index 8bf20a65f64..ed4cd609aa2 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -27,7 +27,9 @@ import request from "../../Utils/request/request.js";
 import routes from "../../Redux/api.js";
 import DropdownMenu from "../Common/components/Menu.js";
 import { triggerGoal } from "../../Integrations/Plausible.js";
-import useAuthUser from "../../Common/hooks/useAuthUser.js";
+
+import useAuthUser from "../../Common/hooks/useAuthUser";
+import { Mews } from "../Facility/Consultations/Mews.js";
 import DischargeSummaryModal from "../Facility/DischargeSummaryModal.js";
 import DischargeModal from "../Facility/DischargeModal.js";
 import { useTranslation } from "react-i18next";
@@ -188,7 +190,10 @@ export default function PatientInfoCard(props: {
             </ButtonV2>
           </div>
           <div className="flex flex-col items-center gap-4 lg:items-start lg:gap-0 lg:pl-6">
-            <div className="mb-1 font-semibold sm:text-xl md:text-4xl">
+            <div
+              className="mb-1 font-semibold sm:text-xl md:text-4xl"
+              id="patient-name-consultation"
+            >
               {patient.name}
             </div>
             <div>
@@ -340,6 +345,11 @@ export default function PatientInfoCard(props: {
             )}
           </div>
         </div>
+        {consultation?.last_daily_round && (
+          <div className="flex w-full justify-center bg-white px-4 py-2 lg:w-5/12 lg:flex-row lg:justify-end lg:p-6">
+            <Mews dailyRound={consultation?.last_daily_round} />
+          </div>
+        )}
 
         <div className="flex w-full flex-col gap-2 px-4 py-1 lg:w-fit lg:p-6">
           {!!consultation?.discharge_date && (
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index af69d8464bc..3a856a04765 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -301,6 +301,14 @@ export interface DailyRoundsModel {
   created_date?: string;
   modified_date?: string;
   taken_at?: string;
+  consciousness_level?:
+    | "UNRESPONSIVE"
+    | "RESPONDS_TO_PAIN"
+    | "RESPONDS_TO_VOICE"
+    | "ALERT"
+    | "AGITATED_OR_CONFUSED"
+    | "ONSET_OF_AGITATION_AND_CONFUSION"
+    | "UNKNOWN";
   rounds_type: (typeof DailyRoundTypes)[number];
   last_updated_by_telemedicine?: boolean;
   created_by_telemedicine?: boolean;
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 3b469081754..750603ccf6f 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -15,7 +15,12 @@ import UnlinkFacilityDialog from "./UnlinkFacilityDialog";
 import UserDeleteDialog from "./UserDeleteDialog";
 import UserDetails from "../Common/UserDetails";
 import UserFilter from "./UserFilter";
-import { classNames, isUserOnline, relativeTime } from "../../Utils/utils";
+import {
+  classNames,
+  isUserOnline,
+  relativeTime,
+  showUserDelete,
+} from "../../Utils/utils";
 import { navigate } from "raviger";
 import useFilters from "../../Common/hooks/useFilters";
 import useWindowDimensions from "../../Common/hooks/useWindowDimensions";
@@ -159,17 +164,6 @@ export default function ManageUsers() {
     });
   };
 
-  const showDelete = (user: any) => {
-    if (user.is_superuser) return true;
-
-    if (
-      USER_TYPES.indexOf(authUser.user_type) >= USER_TYPES.indexOf("StateAdmin")
-    )
-      return user.state_object?.id === authUser.state;
-
-    return false;
-  };
-
   let userList: any[] = [];
 
   userListData?.results &&
@@ -233,7 +227,7 @@ export default function ManageUsers() {
                       aria-label="Online"
                     ></i>
                   ) : null}
-                  {showDelete(user) && (
+                  {showUserDelete(authUser, user) && (
                     <ButtonV2
                       variant="danger"
                       ghost
diff --git a/src/Components/Users/SkillsSlideOver.tsx b/src/Components/Users/SkillsSlideOver.tsx
index 744dfacde7e..1819333451d 100644
--- a/src/Components/Users/SkillsSlideOver.tsx
+++ b/src/Components/Users/SkillsSlideOver.tsx
@@ -105,7 +105,11 @@ export default ({ show, setShow, username }: IProps) => {
         <div>
           <div className="col-span-full sm:col-span-3 sm:col-start-2">
             {(!isLoading || !skillsLoading) && (
-              <div className="tooltip flex items-center gap-2">
+              <div
+                className={`${
+                  !authorizeForAddSkill && "tooltip"
+                } flex items-center gap-2`}
+              >
                 <SkillSelect
                   id="select-skill"
                   multiple={false}
diff --git a/src/Components/Users/UserProfile.tsx b/src/Components/Users/UserProfile.tsx
index 76a94745c1a..2dc75d33613 100644
--- a/src/Components/Users/UserProfile.tsx
+++ b/src/Components/Users/UserProfile.tsx
@@ -5,7 +5,7 @@ import * as Notification from "../../Utils/Notifications.js";
 import LanguageSelector from "../../Components/Common/LanguageSelector";
 import TextFormField from "../Form/FormFields/TextFormField";
 import ButtonV2, { Submit } from "../Common/components/ButtonV2";
-import { classNames, handleSignOut, parsePhoneNumber } from "../../Utils/utils";
+import { classNames, parsePhoneNumber } from "../../Utils/utils";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
 import { FieldChangeEvent } from "../Form/FormFields/Utils";
@@ -13,7 +13,7 @@ import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import { GenderType, SkillModel, UpdatePasswordForm } from "../Users/models";
 import UpdatableApp, { checkForUpdate } from "../Common/UpdatableApp";
 import dayjs from "../../Utils/dayjs";
-import useAuthUser from "../../Common/hooks/useAuthUser";
+import useAuthUser, { useAuthContext } from "../../Common/hooks/useAuthUser";
 import { PhoneNumberValidator } from "../Form/FieldValidators";
 import useQuery from "../../Utils/request/useQuery";
 import routes from "../../Redux/api";
@@ -100,6 +100,7 @@ const editFormReducer = (state: State, action: Action) => {
 };
 
 export default function UserProfile() {
+  const { signOut } = useAuthContext();
   const [states, dispatch] = useReducer(editFormReducer, initialState);
   const [updateStatus, setUpdateStatus] = useState({
     isChecking: false,
@@ -413,7 +414,7 @@ export default function UserProfile() {
                 >
                   {showEdit ? "Cancel" : "Edit User Profile"}
                 </ButtonV2>
-                <ButtonV2 variant="danger" onClick={(_) => handleSignOut(true)}>
+                <ButtonV2 variant="danger" onClick={signOut}>
                   <CareIcon className="care-l-sign-out-alt" />
                   Sign out
                 </ButtonV2>
diff --git a/src/Providers/AuthUserProvider.tsx b/src/Providers/AuthUserProvider.tsx
index d515149341e..5435b0f0b45 100644
--- a/src/Providers/AuthUserProvider.tsx
+++ b/src/Providers/AuthUserProvider.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useCallback, useEffect } from "react";
 import { AuthUserContext } from "../Common/hooks/useAuthUser";
 import Loading from "../Components/Common/Loading";
 import routes from "../Redux/api";
@@ -6,6 +6,7 @@ import useQuery from "../Utils/request/useQuery";
 import { LocalStorageKeys } from "../Common/constants";
 import request from "../Utils/request/request";
 import useConfig from "../Common/hooks/useConfig";
+import { navigate } from "raviger";
 
 interface Props {
   children: React.ReactNode;
@@ -14,34 +15,78 @@ interface Props {
 
 export default function AuthUserProvider({ children, unauthorized }: Props) {
   const { jwt_token_refresh_interval } = useConfig();
-  const { res, data, loading } = useQuery(routes.currentUser, {
-    refetchOnWindowFocus: false,
-    prefetch: true,
-    silent: true,
-  });
+  const tokenRefreshInterval = jwt_token_refresh_interval ?? 5 * 60 * 1000;
+
+  const {
+    res,
+    data: user,
+    loading,
+    refetch,
+  } = useQuery(routes.currentUser, { silent: true });
 
   useEffect(() => {
-    if (!data) {
+    if (!user) {
       return;
     }
 
     updateRefreshToken(true);
-    setInterval(
-      () => updateRefreshToken(),
-      jwt_token_refresh_interval ?? 5 * 60 * 1000
-    );
-  }, [data, jwt_token_refresh_interval]);
+    setInterval(() => updateRefreshToken(), tokenRefreshInterval);
+  }, [user, tokenRefreshInterval]);
+
+  const signIn = useCallback(
+    async (creds: { username: string; password: string }) => {
+      const query = await request(routes.login, { body: creds });
+
+      if (query.res?.ok && query.data) {
+        localStorage.setItem(LocalStorageKeys.accessToken, query.data.access);
+        localStorage.setItem(LocalStorageKeys.refreshToken, query.data.refresh);
+
+        await refetch();
+        navigate(getRedirectOr("/"));
+      }
+
+      return query;
+    },
+    [refetch]
+  );
+
+  const signOut = useCallback(async () => {
+    localStorage.removeItem(LocalStorageKeys.accessToken);
+    localStorage.removeItem(LocalStorageKeys.refreshToken);
+
+    await refetch();
+
+    const redirectURL = getRedirectURL();
+    navigate(redirectURL ? `/?redirect=${redirectURL}` : "/");
+  }, [refetch]);
+
+  // Handles signout from current tab, if signed out from another tab.
+  useEffect(() => {
+    const listener = (event: any) => {
+      if (
+        !event.newValue &&
+        (LocalStorageKeys.accessToken === event.key ||
+          LocalStorageKeys.refreshToken === event.key)
+      ) {
+        signOut();
+      }
+    };
+
+    addEventListener("storage", listener);
+
+    return () => {
+      removeEventListener("storage", listener);
+    };
+  }, [signOut]);
 
   if (loading || !res) {
     return <Loading />;
   }
 
-  if (res.status !== 200 || !data) {
-    return unauthorized;
-  }
-
   return (
-    <AuthUserContext.Provider value={data}>{children}</AuthUserContext.Provider>
+    <AuthUserContext.Provider value={{ signIn, signOut, user }}>
+      {!res.ok || !user ? unauthorized : children}
+    </AuthUserContext.Provider>
   );
 }
 
@@ -66,3 +111,25 @@ const updateRefreshToken = async (silent = false) => {
   localStorage.setItem(LocalStorageKeys.accessToken, data.access);
   localStorage.setItem(LocalStorageKeys.refreshToken, data.refresh);
 };
+
+const getRedirectURL = () => {
+  return new URLSearchParams(window.location.search).get("redirect");
+};
+
+const getRedirectOr = (fallback: string) => {
+  const url = getRedirectURL();
+
+  if (url) {
+    try {
+      const redirect = new URL(url);
+      if (window.location.origin === redirect.origin) {
+        return redirect.pathname + redirect.search;
+      }
+      console.error("Redirect does not belong to same origin.");
+    } catch {
+      console.error(`Invalid redirect URL: ${url}`);
+    }
+  }
+
+  return fallback;
+};
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 2a7681975a4..9d09f7e889f 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -80,12 +80,12 @@ export function Type<T>(): T {
   return {} as T;
 }
 
-interface JwtTokenObtainPair {
+export interface JwtTokenObtainPair {
   access: string;
   refresh: string;
 }
 
-interface LoginInput {
+export interface LoginCredentials {
   username: string;
   password: string;
 }
@@ -104,16 +104,14 @@ const routes = {
     method: "POST",
     noAuth: true,
     TRes: Type<JwtTokenObtainPair>(),
-    TBody: Type<LoginInput>(),
+    TBody: Type<LoginCredentials>(),
   },
 
   token_refresh: {
     path: "/api/v1/auth/token/refresh/",
     method: "POST",
     TRes: Type<JwtTokenObtainPair>(),
-    TBody: Type<{
-      refresh: string;
-    }>(),
+    TBody: Type<{ refresh: JwtTokenObtainPair["refresh"] }>(),
   },
 
   token_verify: {
@@ -955,7 +953,7 @@ const routes = {
     TBody: Type<Partial<IResource>>(),
   },
   updateResource: {
-    path: "/api/v1/resource/{id}",
+    path: "/api/v1/resource/{id}/",
     method: "PUT",
     TRes: Type<IResource>(),
     TBody: Type<Partial<IResource>>(),
@@ -1057,7 +1055,7 @@ const routes = {
     method: "GET",
   },
   updateAssetService: {
-    path: "/api/v1/asset/{asset_external_id}/service_records/{external_id}",
+    path: "/api/v1/asset/{asset_external_id}/service_records/{external_id}/",
     method: "PUT",
     TRes: Type<AssetService>(),
     TBody: Type<AssetServiceUpdate>(),
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index d098a480149..5e238627bc8 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -10,9 +10,8 @@ import {
   SIDEBAR_SHRINK_PREFERENCE_KEY,
   SidebarShrinkContext,
 } from "../Components/Common/Sidebar/Sidebar";
-import { BLACKLISTED_PATHS, LocalStorageKeys } from "../Common/constants";
+import { BLACKLISTED_PATHS } from "../Common/constants";
 import useConfig from "../Common/hooks/useConfig";
-import { handleSignOut } from "../Utils/utils";
 import SessionExpired from "../Components/ErrorPages/SessionExpired";
 
 import UserRoutes from "./routes/UserRoutes";
@@ -63,19 +62,6 @@ export default function AppRouter() {
   const path = usePath();
   const [sidebarOpen, setSidebarOpen] = useState(false);
 
-  useEffect(() => {
-    addEventListener("storage", (event: any) => {
-      if (
-        [LocalStorageKeys.accessToken, LocalStorageKeys.refreshToken].includes(
-          event.key
-        ) &&
-        !event.newValue
-      ) {
-        handleSignOut(true);
-      }
-    });
-  }, []);
-
   useEffect(() => {
     setSidebarOpen(false);
     let flag = false;
diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
index f22dca369f2..dd1f79fce4f 100644
--- a/src/Utils/request/utils.ts
+++ b/src/Utils/request/utils.ts
@@ -92,6 +92,6 @@ export function mergeRequestOptions<TData>(
       options.onResponse?.(res);
       overrides.onResponse?.(res);
     },
-    silent: overrides.silent || options.silent,
+    silent: overrides.silent ?? options.silent,
   };
 }
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 8821089665b..90e6b323db7 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,11 +1,11 @@
-import { navigate } from "raviger";
 import {
   AREACODES,
   IN_LANDLINE_AREA_CODES,
-  LocalStorageKeys,
+  USER_TYPES,
 } from "../Common/constants";
 import phoneCodesJson from "../Common/static/countryPhoneAndFlags.json";
 import dayjs from "./dayjs";
+import { UserModel } from "../Components/Users/models";
 
 interface ApacheParams {
   age: number;
@@ -119,41 +119,6 @@ export const dateQueryString = (date: DateLike) => {
 
 export const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms));
 
-export const handleSignOut = (forceReload: boolean) => {
-  Object.values(LocalStorageKeys).forEach((key) =>
-    localStorage.removeItem(key)
-  );
-  const redirectURL = new URLSearchParams(window.location.search).get(
-    "redirect"
-  );
-  const url = redirectURL ? `/?redirect=${redirectURL}` : "/";
-  if (forceReload) {
-    window.location.href = url;
-  } else {
-    navigate(url);
-  }
-};
-
-export const handleRedirection = () => {
-  const redirectParam = new URLSearchParams(window.location.search).get(
-    "redirect"
-  );
-  try {
-    if (redirectParam) {
-      const redirectURL = new URL(redirectParam);
-
-      if (redirectURL.origin === window.location.origin) {
-        const newPath = redirectURL.pathname + redirectURL.search;
-        window.location.href = `${window.location.origin}${newPath}`;
-        return;
-      }
-    }
-    window.location.href = "/facility";
-  } catch {
-    window.location.href = "/facility";
-  }
-};
-
 /**
  * Referred from: https://stackoverflow.com/a/9039885/7887936
  * @returns `true` if device is iOS, else `false`
@@ -460,6 +425,29 @@ export const scrollTo = (id: string | boolean) => {
   element?.scrollIntoView({ behavior: "smooth", block: "center" });
 };
 
+export const showUserDelete = (authUser: UserModel, targetUser: UserModel) => {
+  // Auth user should be higher in hierarchy than target user
+  if (
+    USER_TYPES.indexOf(authUser.user_type) <=
+    USER_TYPES.indexOf(targetUser.user_type)
+  )
+    return false;
+
+  if (
+    authUser.user_type === "StateAdmin" &&
+    targetUser.state_object?.id === authUser.state
+  )
+    return true;
+
+  if (
+    authUser.user_type === "DistrictAdmin" &&
+    targetUser.district_object?.id === authUser.district
+  )
+    return true;
+
+  return false;
+};
+
 export const invalidateFiltersCache = () => {
   for (const key in localStorage) {
     if (key.startsWith("filters--")) {