diff --git a/cypress/pageobject/Patient/PatientConsultation.ts b/cypress/pageobject/Patient/PatientConsultation.ts
index 6937559d548..2eb6550cb8b 100644
--- a/cypress/pageobject/Patient/PatientConsultation.ts
+++ b/cypress/pageobject/Patient/PatientConsultation.ts
@@ -49,7 +49,7 @@ export class PatientConsultationPage {
       .click()
       .type("1A");
     cy.get("#icd11_diagnoses_object [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .scrollIntoView()
       .click();
     cy.get("label[for='icd11_diagnoses_object']").click();
@@ -57,7 +57,7 @@ export class PatientConsultationPage {
 
     cy.get("#icd11_principal_diagnosis [role='combobox']").click().type("1A");
     cy.get("#icd11_principal_diagnosis [role='option']")
-      .contains("1A03 Intestinal infections due to Escherichia coli")
+      .contains("1A00 Cholera")
       .click();
 
     cy.get("#consultation_notes").click().type(consulationNotes);
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 7f5484564fc..2dd8c477233 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -81,7 +81,7 @@ Cypress.Commands.add(
 
 Cypress.Commands.add("verifyNotification", (text) => {
   cy.get(".pnotify-container").should("exist").contains(text);
-  return cy.get(".pnotify-container").click({ force: true });
+  return cy.get(".pnotify-container").contains(text).click({ force: true });
 });
 
 Cypress.on("uncaught:exception", () => {
diff --git a/package-lock.json b/package-lock.json
index 4871fbe374b..2a9fe3f520f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14496,8 +14496,6 @@
     },
     "node_modules/npm/node_modules/cross-spawn/node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -15254,8 +15252,6 @@
     },
     "node_modules/npm/node_modules/minipass": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -16398,8 +16394,6 @@
     },
     "node_modules/npm/node_modules/tar": {
       "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz",
-      "integrity": "sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==",
       "dev": true,
       "inBundle": true,
       "license": "ISC",
@@ -16500,8 +16494,6 @@
     },
     "node_modules/npm/node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true,
       "inBundle": true,
       "license": "MIT"
@@ -16569,8 +16561,6 @@
     },
     "node_modules/npm/node_modules/wrap-ansi": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
       "dev": true,
       "inBundle": true,
       "license": "MIT",
@@ -16589,8 +16579,6 @@
     "node_modules/npm/node_modules/wrap-ansi-cjs": {
       "name": "wrap-ansi",
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "inBundle": true,
       "license": "MIT",
@@ -16670,8 +16658,6 @@
     },
     "node_modules/npm/node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true,
       "inBundle": true,
       "license": "ISC"
@@ -16691,8 +16677,6 @@
     },
     "node_modules/npm/node_modules/yallist": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
       "inBundle": true,
       "license": "ISC"
diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
index 83928f1f23a..48cc8d370ad 100644
--- a/src/CAREUI/display/RecordMeta.tsx
+++ b/src/CAREUI/display/RecordMeta.tsx
@@ -11,13 +11,14 @@ interface Props {
     last_name: string;
     last_login: string | undefined;
   };
+  inlineUser?: boolean;
 }
 
 /**
  * A generic component to display relative time along with a tooltip and a user
  * if provided.
  */
-const RecordMeta = ({ time, user, prefix, className }: Props) => {
+const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {
   const isOnline = user && isUserOnline(user);
 
   let child = (
@@ -25,14 +26,15 @@ const RecordMeta = ({ time, user, prefix, className }: Props) => {
       <span className="underline">{relativeTime(time)}</span>
       <span className="tooltip-text tooltip-bottom flex -translate-x-1/2 gap-1 text-xs font-medium tracking-wider">
         {formatDateTime(time)}
-        {user && (
-          <>
+        {user && !inlineUser && (
+          <span className="flex items-center gap-1">
+            by
             <CareIcon className="care-l-user" />
             {user.first_name} {user.last_name}
             {isOnline && (
-              <div className="h-1 w-1 rounded-full bg-primary-500" />
+              <div className="h-1.5 w-1.5 rounded-full bg-primary-400" />
             )}
-          </>
+          </span>
         )}
       </span>
     </div>
@@ -43,7 +45,13 @@ const RecordMeta = ({ time, user, prefix, className }: Props) => {
       <div className="flex items-center gap-1">
         {prefix}
         {child}
+        {user && inlineUser && <span>by</span>}
         {user && <CareIcon className="care-l-user" />}
+        {user && inlineUser && (
+          <span className="font-medium">
+            {user.first_name} {user.last_name}
+          </span>
+        )}
       </div>
     );
   }
diff --git a/src/Common/hooks/useSlug.ts b/src/Common/hooks/useSlug.ts
new file mode 100644
index 00000000000..69d8f591c84
--- /dev/null
+++ b/src/Common/hooks/useSlug.ts
@@ -0,0 +1,45 @@
+import { usePath } from "raviger";
+
+/**
+ * Returns the slug from the current path.
+ * @param prefix The prefix of the slug.
+ * @returns The slug.
+ * @example
+ * // Current path: /consultation/94b9a
+ * const consultation = useSlug("consultation"); // consultation = "94b9a"
+ */
+export default function useSlug(prefix: string) {
+  const path = usePath() ?? "";
+  return findSlug(path.split("/"), prefix);
+}
+
+/**
+ * Returns the slugs from the current path.
+ * @param prefix The prefixes of the slug.
+ * @returns The slugs
+ * @example
+ * // Current path: /facility/5b0a/consultation/94b9a
+ * const [facility, consultation] = useSlug("facility", "consultation");
+ * // facility = "5b0a"
+ * // consultation = "94b9a"
+ */
+export const useSlugs = (...prefix: string[]) => {
+  const path = usePath() ?? "";
+  return prefix.map((p) => findSlug(path.split("/"), p));
+};
+
+const findSlug = (segments: string[], prefix: string) => {
+  const index = segments.findIndex((segment) => segment === prefix);
+  if (index === -1) {
+    throw new Error(
+      `Prefix "${prefix}" not found in path "${segments.join("/")}"`
+    );
+  }
+
+  const slug = segments[index + 1];
+  if (!slug) {
+    throw new Error(`Slug not found in path "${segments.join("/")}"`);
+  }
+
+  return slug;
+};
diff --git a/src/Components/Assets/AssetImportModal.tsx b/src/Components/Assets/AssetImportModal.tsx
index 7382c7eff4f..54ac25e2ac8 100644
--- a/src/Components/Assets/AssetImportModal.tsx
+++ b/src/Components/Assets/AssetImportModal.tsx
@@ -8,7 +8,6 @@ import { Cancel, Submit } from "../Common/components/ButtonV2";
 import { listFacilityAssetLocation } from "../../Redux/actions";
 import { useDispatch } from "react-redux";
 import { Link } from "raviger";
-import SelectMenuV2 from "../Form/SelectMenuV2";
 import readXlsxFile from "read-excel-file";
 import {
   LocalStorageKeys,
@@ -17,6 +16,7 @@ import {
 import { parseCsvFile } from "../../Utils/utils";
 import useConfig from "../../Common/hooks/useConfig";
 import DialogModal from "../Common/Dialog";
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
 
 interface Props {
   open: boolean;
@@ -25,14 +25,18 @@ interface Props {
 }
 
 const AssetImportModal = ({ open, onClose, facility }: Props) => {
-  const [isImporting, setIsUploading] = useState(false);
+  const [isImporting, setIsImporting] = useState(false);
   const [selectedFile, setSelectedFile] = useState<any>();
   const [preview, setPreview] =
     useState<(AssetData & { notes?: string; last_serviced_on?: string })[]>();
   const [location, setLocation] = useState("");
+  const [errors, setErrors] = useState<any>({
+    location: "",
+  });
   const [locations, setLocations] = useState<any>([]);
   const dispatchAction: any = useDispatch();
   const { sample_format_asset_import } = useConfig();
+  const [locationsLoading, setLocationsLoading] = useState(false);
 
   const closeModal = () => {
     setPreview(undefined);
@@ -41,9 +45,11 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
   };
 
   useEffect(() => {
+    setLocationsLoading(true);
     dispatchAction(
       listFacilityAssetLocation({}, { facility_external_id: facility.id })
     ).then(({ data }: any) => {
+      setLocationsLoading(false);
       if (data.count > 0) {
         setLocations(data.results);
       }
@@ -110,7 +116,16 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
       closeModal();
       return;
     }
+    if (!location) {
+      setErrors({
+        ...errors,
+        location: "Please select a location",
+      });
+      return;
+    }
+    setIsImporting(true);
     let error = false;
+    Notification.Success({ msg: "Importing assets..." });
 
     for (const asset of preview || []) {
       const asset_data: any = {
@@ -156,16 +171,22 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
         });
         error = true;
       } else {
-        if (preview) setPreview(preview.filter((a) => a.id !== asset.id));
+        setPreview((preview) => {
+          return preview?.slice(1);
+        });
       }
     }
     if (!error) {
       Notification.Success({ msg: "Assets imported successfully" });
       await sleep(1000);
-      setIsUploading(false);
-      closeModal();
+      setIsImporting(false);
       window.location.reload();
-    } else Notification.Error({ msg: "Error importing some assets" });
+    } else {
+      Notification.Error({ msg: "Error importing some assets" });
+      await sleep(1000);
+      setIsImporting(false);
+      closeModal();
+    }
   };
 
   const dragProps = useDragAndDrop();
@@ -193,7 +214,7 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
       fixedWidth={false}
     >
       <span className="mt-1 text-gray-700">{facility.name}</span>
-      {locations.length === 0 ? (
+      {!locationsLoading && locations.length === 0 ? (
         <>
           <div className="flex h-full flex-col items-center justify-center">
             <h1 className="m-7 text-2xl font-medium text-gray-700">
@@ -218,31 +239,28 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
           {preview && preview?.length > 0 ? (
             <div className="flex flex-col items-center justify-center rounded-lg">
               <h1 className="m-7 text-2xl font-medium text-gray-700">
-                {preview.length} assets will be imported
+                {preview.length} assets {isImporting ? "are being" : "will be"}{" "}
+                imported
               </h1>
               <div className="w-1/2 p-4">
-                <label htmlFor="asset-location">
-                  Select location for import *
+                <label htmlFor="asset-location" className="flex gap-1">
+                  Select location for import{" "}
+                  <p className="font-semibold text-danger-500">*</p>
                 </label>
                 <div className="mt-2" data-testid="select-import-location">
-                  <SelectMenuV2
-                    required
-                    options={[
-                      {
-                        title: "Select",
-                        description: "Select the location",
-                        value: "0",
-                      },
-                      ...locations.map((location: any) => ({
-                        title: location.name,
-                        description: location.facility.name,
-                        value: location.id,
-                      })),
-                    ]}
+                  <SelectFormField
+                    name="asset-import-location"
+                    options={locations.map((location: any) => ({
+                      title: location.name,
+                      description: location.facility.name,
+                      value: location.id,
+                    }))}
                     optionLabel={(o) => o.title}
                     optionValue={(o) => o.value}
+                    placeholder="Select a location"
                     value={location}
-                    onChange={(e) => setLocation(e)}
+                    onChange={({ value }) => setLocation(value)}
+                    error={errors.location}
                   />
                 </div>
               </div>
diff --git a/src/Components/Assets/AssetServiceEditModal.tsx b/src/Components/Assets/AssetServiceEditModal.tsx
index 66d44d11907..690524e471b 100644
--- a/src/Components/Assets/AssetServiceEditModal.tsx
+++ b/src/Components/Assets/AssetServiceEditModal.tsx
@@ -7,10 +7,10 @@ import DialogModal from "../Common/Dialog";
 import { AssetData, AssetService, AssetServiceEdit } from "./AssetTypes";
 import dayjs from "dayjs";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
-import DateInputV2 from "../Common/DateInputV2";
-import { FieldLabel } from "../Form/FormFields/FormField";
 import { formatDate, formatDateTime } from "../../Utils/utils";
 import CareIcon from "../../CAREUI/icons/CareIcon";
+import DateFormField from "../Form/FormFields/DateFormField";
+import { t } from "i18next";
 
 export const AssetServiceEditModal = (props: {
   asset?: AssetData;
@@ -61,12 +61,12 @@ export const AssetServiceEditModal = (props: {
       <DialogModal
         show={props.show}
         onClose={props.handleClose}
-        title="Edit History"
+        title={t("edit_history")}
       >
         <div>
           <div className="mb-4">
             <p className="text-md mt-1 text-gray-500">
-              Update record for asset
+              {t("update_record_for_asset")}
               <strong> {props.asset?.name}</strong>
             </p>
           </div>
@@ -110,13 +110,17 @@ export const AssetServiceEditModal = (props: {
             <div className="mb-4 rounded-lg border border-gray-300 p-4 py-2">
               <div className="my-2 flex justify-between">
                 <div className="grow">
-                  <p className="text-sm font-medium text-gray-500">Edited On</p>
+                  <p className="text-sm font-medium text-gray-500">
+                    {t("edited_on")}
+                  </p>
                   <p className="text-gray-900">
                     {formatDateTime(editRecord.edited_on)}
                   </p>
                 </div>
                 <div className="grow">
-                  <p className="text-sm font-medium text-gray-500">Edited By</p>
+                  <p className="text-sm font-medium text-gray-500">
+                    {t("edited_by")}
+                  </p>
                   <p className="text-gray-900">
                     {editRecord.edited_by.username}
                   </p>
@@ -125,7 +129,7 @@ export const AssetServiceEditModal = (props: {
               <div className="mt-4 flex flex-col justify-between">
                 <div className="grow">
                   <p className="text-sm font-medium text-gray-500">
-                    Serviced On
+                    {t("serviced_on")}
                   </p>
                   <p
                     className="text-gray-900"
@@ -135,7 +139,9 @@ export const AssetServiceEditModal = (props: {
                   </p>
                 </div>
                 <div className="mt-4 grow">
-                  <p className="text-sm font-medium text-gray-500">Notes</p>
+                  <p className="text-sm font-medium text-gray-500">
+                    {t("notes")}
+                  </p>
                   <p className="text-gray-900" id="edit-history-asset-note">
                     {editRecord.note || "-"}
                   </p>
@@ -151,7 +157,7 @@ export const AssetServiceEditModal = (props: {
                 editRecord ? setEditRecord(undefined) : props.handleClose();
               }}
             >
-              {editRecord ? "Back" : "Close"}
+              {editRecord ? t("back") : t("close")}
             </ButtonV2>
           </div>
         </div>
@@ -163,12 +169,12 @@ export const AssetServiceEditModal = (props: {
     <DialogModal
       show={props.show}
       onClose={props.handleClose}
-      title="Update Asset Service Record"
+      title={t("update_asset_service_record")}
     >
       <div>
         <div className="mb-4">
           <p className="text-md mt-1 text-gray-500">
-            Update record for asset
+            {t("update_record_for_asset")}
             <strong> {props.asset?.name}</strong>
           </p>
         </div>
@@ -178,19 +184,31 @@ export const AssetServiceEditModal = (props: {
               className="col-span-6 sm:col-span-3"
               data-testid="asset-last-serviced-on-input"
             >
-              <FieldLabel>Serviced On</FieldLabel>
-              <DateInputV2
+              <DateFormField
+                label={t("serviced_on")}
                 name="serviced_on"
                 className="mt-2"
                 position="LEFT"
                 value={new Date(form.serviced_on)}
                 onChange={(date) => {
-                  setForm({
-                    ...form,
-                    serviced_on: dayjs(date).format("YYYY-MM-DD"),
-                  });
+                  if (
+                    dayjs(date.value).format("YYYY-MM-DD") >
+                    new Date(
+                      props.service_record.created_date
+                    ).toLocaleDateString("en-ca")
+                  ) {
+                    Notification.Error({
+                      msg: `Service date can't be after ${formatDate(
+                        props.service_record.created_date
+                      )} (Creation date)`,
+                    });
+                  } else {
+                    setForm({
+                      ...form,
+                      serviced_on: dayjs(date.value).format("YYYY-MM-DD"),
+                    });
+                  }
                 }}
-                max={new Date(props.service_record.created_date)}
               />
             </div>
 
@@ -198,8 +216,8 @@ export const AssetServiceEditModal = (props: {
               <TextAreaFormField
                 name="notes"
                 rows={5}
-                label="Notes"
-                placeholder="Eg. Details on functionality, service, etc."
+                label={t("notes")}
+                placeholder={t("eg_details_on_functionality_service_etc")}
                 value={form.note}
                 onChange={(e) => {
                   setForm({ ...form, note: e.value });
@@ -210,7 +228,7 @@ export const AssetServiceEditModal = (props: {
         </div>
         <div className="flex flex-col justify-end gap-2 md:flex-row">
           <Submit
-            label={`${isLoading ? "Updating" : "Update"}`}
+            label={`${isLoading ? t("updating") : t("update")}`}
             onClick={handleSubmit}
             loading={isLoading}
           />
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index cb7ea7f08f8..140a0013fd9 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -1,10 +1,9 @@
 import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
-import { postForgotPassword, postLogin } from "../../Redux/actions";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
 import { useTranslation } from "react-i18next";
 import ReCaptcha from "react-google-recaptcha";
 import * as Notification from "../../Utils/Notifications.js";
-import { get } from "lodash";
 import LegendInput from "../../CAREUI/interactive/LegendInput";
 import LanguageSelectorLogin from "../Common/LanguageSelectorLogin";
 import CareIcon from "../../CAREUI/icons/CareIcon";
@@ -25,7 +24,6 @@ export const Login = (props: { forgot?: boolean }) => {
     custom_logo_alt,
     custom_description,
   } = useConfig();
-  const dispatch: any = useDispatch();
   const initForm: any = {
     username: "",
     password: "",
@@ -90,37 +88,35 @@ export const Login = (props: { forgot?: boolean }) => {
     };
   }, []);
 
-  const handleSubmit = (e: any) => {
+  const handleSubmit = async (e: any) => {
     e.preventDefault();
     const valid = validateData();
     if (valid) {
       // replaces button with spinner
       setLoading(true);
 
-      dispatch(postLogin(valid)).then((resp: any) => {
-        const res = get(resp, "data", null);
-        const statusCode = get(resp, "status", "");
-        if (res && statusCode === 429) {
-          setCaptcha(true);
-          // captcha displayed set back to login button
-          setLoading(false);
-        } else if (res && statusCode === 200) {
-          localStorage.setItem(LocalStorageKeys.accessToken, res.access);
-          localStorage.setItem(LocalStorageKeys.refreshToken, res.refresh);
-
-          if (
-            window.location.pathname === "/" ||
-            window.location.pathname === "/login"
-          ) {
-            window.location.href = "/facility";
-          } else {
-            window.location.href = window.location.pathname.toString();
-          }
+      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"
+        ) {
+          window.location.href = "/facility";
         } else {
-          // error from server set back to login button
-          setLoading(false);
+          window.location.href = window.location.pathname.toString();
         }
-      });
+      } else {
+        // error from server set back to login button
+        setLoading(false);
+      }
     }
   };
 
@@ -146,26 +142,22 @@ export const Login = (props: { forgot?: boolean }) => {
     return form;
   };
 
-  const handleForgetSubmit = (e: any) => {
+  const handleForgetSubmit = async (e: any) => {
     e.preventDefault();
     const valid = validateForgetData();
     if (valid) {
       setLoading(true);
-      dispatch(postForgotPassword(valid)).then((resp: any) => {
-        setLoading(false);
-        const res = resp && resp.data;
-        if (res && res.status === "OK") {
-          Notification.Success({
-            msg: t("password_sent"),
-          });
-        } else if (res && res.data) {
-          setErrors(res.data);
-        } else {
-          Notification.Error({
-            msg: t("something_wrong"),
-          });
-        }
+      const { res, error } = await request(routes.forgotPassword, {
+        body: { ...valid },
       });
+      setLoading(false);
+      if (res?.ok) {
+        Notification.Success({
+          msg: t("password_sent"),
+        });
+      } else if (res && error) {
+        setErrors(error);
+      }
     }
   };
 
diff --git a/src/Components/Auth/ResetPassword.tsx b/src/Components/Auth/ResetPassword.tsx
index 08dd1da44a0..47d120e1a97 100644
--- a/src/Components/Auth/ResetPassword.tsx
+++ b/src/Components/Auth/ResetPassword.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from "react";
-import { useDispatch } from "react-redux";
+import request from "../../Utils/request/request.js";
 import * as Notification from "../../Utils/Notifications.js";
-import { postResetPassword, checkResetToken } from "../../Redux/actions";
 import { navigate } from "raviger";
 import { useTranslation } from "react-i18next";
 import { LocalStorageKeys } from "../../Common/constants";
@@ -9,9 +8,9 @@ import { Cancel, Submit } from "../Common/components/ButtonV2";
 import TextFormField from "../Form/FormFields/TextFormField";
 import { validateRule } from "../Users/UserAdd";
 import { validatePassword } from "../../Common/validation.js";
+import routes from "../../Redux/api.js";
 
 export const ResetPassword = (props: any) => {
-  const dispatch: any = useDispatch();
   const initForm: any = {
     password: "",
     confirm: "",
@@ -65,36 +64,37 @@ export const ResetPassword = (props: any) => {
     return form;
   };
 
-  const handleSubmit = (e: any) => {
+  const handleSubmit = async (e: any) => {
     e.preventDefault();
     const valid = validateData();
     if (valid) {
       valid.token = props.token;
-      dispatch(postResetPassword(valid)).then((resp: any) => {
-        const res = resp && resp.data;
-        if (res && res.status === "OK") {
-          localStorage.removeItem(LocalStorageKeys.accessToken);
-          Notification.Success({
-            msg: t("password_reset_success"),
-          });
-          navigate("/login");
-        } else if (res && res.data) {
-          setErrors(res.data);
-        } else {
-          Notification.Error({
-            msg: t("password_reset_failure"),
-          });
-        }
+      const { res, error } = await request(routes.resetPassword, {
+        body: { ...valid },
       });
+      if (res?.ok) {
+        localStorage.removeItem(LocalStorageKeys.accessToken);
+        Notification.Success({
+          msg: t("password_reset_success"),
+        });
+        navigate("/login");
+      } else if (res && error) {
+        setErrors(error);
+      }
     }
   };
 
   useEffect(() => {
-    if (props.token) {
-      dispatch(checkResetToken({ token: props.token })).then((resp: any) => {
-        const res = resp && resp.data;
-        if (!res || res.status !== "OK") navigate("/invalid-reset");
+    const checkResetToken = async () => {
+      const { res } = await request(routes.checkResetToken, {
+        body: { token: props.token },
       });
+      if (!res || !res.ok) {
+        navigate("/invalid-reset");
+      }
+    };
+    if (props.token) {
+      checkResetToken();
     } else {
       navigate("/invalid-reset");
     }
diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index bcebd4e0055..12009cb495f 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -1,4 +1,4 @@
-import { MutableRefObject, useEffect, useRef, useState } from "react";
+import { MutableRefObject, useEffect, useState } from "react";
 import {
   addMonths,
   addYears,
@@ -60,7 +60,6 @@ const DateInputV2: React.FC<Props> = ({
   const [displayValue, setDisplayValue] = useState<string>(
     value ? dayjs(value).format("DDMMYYYY") : ""
   );
-  const popover = useRef<HTMLDivElement>(null);
 
   const decrement = () => {
     switch (type) {
@@ -114,6 +113,7 @@ const DateInputV2: React.FC<Props> = ({
         )
       );
     close();
+    setIsOpen?.(false);
   };
 
   const getDayCount = (date: Date) => {
@@ -213,13 +213,7 @@ const DateInputV2: React.FC<Props> = ({
         <Popover className="relative">
           {({ open, close }) => (
             <div>
-              <Popover.Button
-                disabled={disabled}
-                className="w-full"
-                onClick={() => {
-                  setIsOpen?.(!isOpen);
-                }}
-              >
+              <Popover.Button disabled={disabled} className="w-full">
                 <input type="hidden" name="date" />
                 <input
                   id={id}
@@ -238,10 +232,6 @@ const DateInputV2: React.FC<Props> = ({
 
               {(open || isOpen) && (
                 <Popover.Panel
-                  onBlur={() => {
-                    setIsOpen?.(false);
-                  }}
-                  ref={popover}
                   static
                   className={classNames(
                     "cui-dropdown-base absolute mt-0.5 w-72 divide-y-0 p-4",
@@ -252,10 +242,6 @@ const DateInputV2: React.FC<Props> = ({
                     <input
                       id="date-input"
                       autoFocus
-                      onBlur={(e) => {
-                        popover.current?.focus();
-                        e.preventDefault();
-                      }}
                       className="cui-input-base bg-gray-50"
                       value={
                         displayValue.replace(
diff --git a/src/Components/Common/GLocationPicker.tsx b/src/Components/Common/GLocationPicker.tsx
index 5356d28fa2a..fc121b8519f 100644
--- a/src/Components/Common/GLocationPicker.tsx
+++ b/src/Components/Common/GLocationPicker.tsx
@@ -7,14 +7,6 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
 import useConfig from "../../Common/hooks/useConfig";
 import { Popover } from "@headlessui/react";
 
-const render = (status: Status) => {
-  if (status === "LOADING") {
-    return <Spinner />;
-  }
-
-  return <h1>{status}</h1>;
-};
-
 interface GLocationPickerProps {
   lat: number;
   lng: number;
@@ -67,22 +59,37 @@ const GLocationPicker = ({
     setCenter(m?.getCenter()?.toJSON());
   };
 
+  const render = (status: Status) => {
+    switch (status) {
+      case Status.LOADING:
+        return <Spinner />;
+      case Status.SUCCESS:
+        return (
+          <Map
+            center={center}
+            onClick={onClick}
+            onIdle={onIdle}
+            handleOnChange={handleOnChange}
+            handleOnClose={handleOnClose}
+            handleOnSelectCurrentLocation={handleOnSelectCurrentLocation}
+            zoom={zoom}
+            style={{ flexGrow: "1", height: "100%" }}
+          >
+            {location && <Marker position={location} />}
+          </Map>
+        );
+      default:
+        return <h1>{status}</h1>;
+    }
+  };
+
   return (
     <div className="flex h-80 w-80 sm:h-96 sm:w-96">
-      <Wrapper libraries={["places"]} apiKey={gmaps_api_key} render={render}>
-        <Map
-          center={center}
-          onClick={onClick}
-          onIdle={onIdle}
-          handleOnChange={handleOnChange}
-          handleOnClose={handleOnClose}
-          handleOnSelectCurrentLocation={handleOnSelectCurrentLocation}
-          zoom={zoom}
-          style={{ flexGrow: "1", height: "100%" }}
-        >
-          {location && <Marker position={location} />}
-        </Map>
-      </Wrapper>
+      <Wrapper
+        libraries={["places"]}
+        apiKey={gmaps_api_key}
+        render={render}
+      ></Wrapper>
     </div>
   );
 };
@@ -149,7 +156,9 @@ const Map: React.FC<MapProps> = ({
           places.length > 0 &&
           places[0].geometry?.location
         ) {
-          handleOnChange(places[0].geometry.location);
+          const selectedLocation = places[0].geometry.location;
+          handleOnChange(selectedLocation);
+          map?.setCenter(selectedLocation);
         }
       });
     }
diff --git a/src/Components/Facility/AssetCreate.tsx b/src/Components/Facility/AssetCreate.tsx
index 156d738857a..84fc09188d0 100644
--- a/src/Components/Facility/AssetCreate.tsx
+++ b/src/Components/Facility/AssetCreate.tsx
@@ -37,7 +37,8 @@ import useVisibility from "../../Utils/useVisibility";
 import { validateEmailAddress } from "../../Common/validation";
 import { dateQueryString, parsePhoneNumber } from "../../Utils/utils.js";
 import dayjs from "../../Utils/dayjs";
-import DateInputV2 from "../Common/DateInputV2.js";
+import DateFormField from "../Form/FormFields/DateFormField.js";
+import { t } from "i18next";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -305,7 +306,7 @@ const AssetCreate = (props: AssetProps) => {
     setLocation("");
     setAssetType(assetTypeInitial);
     setAssetClass(assetClassInitial);
-    setIsWorking("");
+    setIsWorking(undefined);
     setNotWorkingReason("");
     setSerialNumber("");
     setVendorName("");
@@ -404,7 +405,7 @@ const AssetCreate = (props: AssetProps) => {
   if (locations.length === 0) {
     return (
       <Page
-        title={assetId ? "Update Asset" : "Create New Asset"}
+        title={assetId ? t("update_asset") : t("create_new_asset")}
         crumbsReplacements={{
           [facilityId]: { name: facilityName },
           assets: { style: "text-gray-200 pointer-events-none" },
@@ -419,14 +420,14 @@ const AssetCreate = (props: AssetProps) => {
             </div>
           </h1>
           <p className="text-gray-600">
-            You need at least a location to create an assest.
+            {t("you_need_at_least_a_location_to_create_an_assest")}
           </p>
           <button
             className="btn-primary btn mt-5"
             onClick={() => navigate(`/facility/${facilityId}/location/add`)}
           >
             <i className="fas fa-plus mr-2 text-white"></i>
-            Add Location
+            {t("add_location")}
           </button>
         </section>
       </Page>
@@ -440,7 +441,8 @@ const AssetCreate = (props: AssetProps) => {
           onClick={() => setIsScannerActive(false)}
           className="btn btn-default mb-2"
         >
-          <i className="fas fa-times mr-2"></i> Close Scanner
+          <i className="fas fa-times mr-2"></i>
+          {t("close_scanner")}
         </button>
         <QrReader
           delay={300}
@@ -452,7 +454,9 @@ const AssetCreate = (props: AssetProps) => {
           }
           style={{ width: "100%" }}
         />
-        <h2 className="self-center text-center text-lg">Scan Asset QR!</h2>
+        <h2 className="self-center text-center text-lg">
+          {t("scan_asset_qr")}
+        </h2>
       </div>
     );
 
@@ -479,7 +483,7 @@ const AssetCreate = (props: AssetProps) => {
   return (
     <div className="relative flex flex-col">
       <Page
-        title={`${assetId ? "Update" : "Create"} Asset`}
+        title={`${assetId ? t("update") : t("create")} Asset`}
         className="grow-0 pl-6"
         crumbsReplacements={{
           [facilityId]: { name: facilityName },
@@ -534,7 +538,7 @@ const AssetCreate = (props: AssetProps) => {
                     >
                       <TextFormField
                         name="name"
-                        label="Asset Name"
+                        label={t("asset_name")}
                         required
                         value={name}
                         onChange={({ value }) => setName(value)}
@@ -544,7 +548,7 @@ const AssetCreate = (props: AssetProps) => {
 
                     {/* Location */}
                     <FieldLabel className="w-max text-sm" required>
-                      Asset Location
+                      {t("asset_location")}
                     </FieldLabel>
                     <div
                       ref={fieldRef["location"]}
@@ -571,7 +575,7 @@ const AssetCreate = (props: AssetProps) => {
                         data-testid="asset-type-input"
                       >
                         <SelectFormField
-                          label="Asset Type"
+                          label={t("asset_type")}
                           name="asset_type"
                           required
                           options={[
@@ -606,7 +610,7 @@ const AssetCreate = (props: AssetProps) => {
                         <SelectFormField
                           disabled={!!(props.assetId && asset_class)}
                           name="asset_class"
-                          label="Asset Class"
+                          label={t("asset_class")}
                           value={asset_class}
                           options={[
                             { title: "ONVIF Camera", value: AssetClass.ONVIF },
@@ -633,8 +637,8 @@ const AssetCreate = (props: AssetProps) => {
                     >
                       <TextAreaFormField
                         name="asset_description"
-                        label="Description"
-                        placeholder="Details about the equipment"
+                        label={t("description")}
+                        placeholder={t("details_about_the_equipment")}
                         value={description}
                         onChange={({ value }) => setDescription(value)}
                         error={state.errors.description}
@@ -664,7 +668,7 @@ const AssetCreate = (props: AssetProps) => {
                         className="col-span-6"
                         required
                         name="is_working"
-                        label="Working Status"
+                        label={t("working_status")}
                         options={["true", "false"]}
                         optionLabel={(option) => {
                           return (
@@ -692,8 +696,8 @@ const AssetCreate = (props: AssetProps) => {
                     >
                       <TextAreaFormField
                         name="not_working_reason"
-                        label="Why the asset is not working?"
-                        placeholder="Describe why the asset is not working"
+                        label={t("why_the_asset_is_not_working")}
+                        placeholder={t("describe_why_the_asset_is_not_working")}
                         value={not_working_reason}
                         onChange={(e) => setNotWorkingReason(e.value)}
                         error={state.errors.not_working_reason}
@@ -717,7 +721,7 @@ const AssetCreate = (props: AssetProps) => {
                           id="qr_code_id"
                           name="qr_code_id"
                           placeholder=""
-                          label="Asset QR ID"
+                          label={t("asset_qr_id")}
                           value={qrCodeId}
                           onChange={(e) => setQrCodeId(e.value)}
                           error={state.errors.qr_code_id}
@@ -743,9 +747,9 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         id="manufacturer"
                         name="manufacturer"
-                        label="Manufacturer"
+                        label={t("manufacturer")}
                         value={manufacturer}
-                        placeholder="Eg. XYZ"
+                        placeholder={t("eg_xyz")}
                         onChange={(e) => setManufacturer(e.value)}
                         error={state.errors.manufacturer}
                       />
@@ -760,7 +764,7 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         name="WarrantyAMCExpiry"
                         value={warranty_amc_end_of_validity}
-                        label="Warranty / AMC Expiry"
+                        label={t("warranty_amc_expiry")}
                         error={state.errors.warranty_amc_end_of_validity}
                         onChange={(event) => {
                           const value = dayjs(event.value);
@@ -788,8 +792,8 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         id="support-name"
                         name="support_name"
-                        label="Customer Support Name"
-                        placeholder="Eg. ABC"
+                        label={t("customer_support_name")}
+                        placeholder={t("eg_abc")}
                         value={support_name}
                         onChange={(e) => setSupportName(e.value)}
                         error={state.errors.support_name}
@@ -804,7 +808,7 @@ const AssetCreate = (props: AssetProps) => {
                     >
                       <PhoneNumberFormField
                         name="support_phone"
-                        label="Customer support number"
+                        label={t("customer_support_number")}
                         required
                         value={support_phone}
                         onChange={(e) => setSupportPhone(e.value)}
@@ -822,8 +826,8 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         id="support-email"
                         name="support_email"
-                        label="Customer Support Email"
-                        placeholder="Eg. mail@example.com"
+                        label={t("customer_support_email")}
+                        placeholder={t("eg_mail_example_com")}
                         value={support_email}
                         onChange={(e) => setSupportEmail(e.value)}
                         error={state.errors.support_email}
@@ -841,9 +845,9 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         id="vendor-name"
                         name="vendor_name"
-                        label="Vendor Name"
+                        label={t("vendor_name")}
                         value={vendor_name}
-                        placeholder="Eg. XYZ"
+                        placeholder={t("eg_xyz")}
                         onChange={(e) => setVendorName(e.value)}
                         error={state.errors.vendor_name}
                       />
@@ -858,7 +862,7 @@ const AssetCreate = (props: AssetProps) => {
                       <TextFormField
                         id="serial-number"
                         name="serial_number"
-                        label="Serial Number"
+                        label={t("serial_number")}
                         value={serial_number}
                         onChange={(e) => setSerialNumber(e.value)}
                         error={state.errors.serial_number}
@@ -874,25 +878,26 @@ const AssetCreate = (props: AssetProps) => {
                       ref={fieldRef["last_serviced_on"]}
                       data-testid="asset-last-serviced-on-input"
                     >
-                      <FieldLabel>Last Serviced On</FieldLabel>
-                      <DateInputV2
+                      <DateFormField
+                        label={t("last_serviced_on")}
                         name="last_serviced_on"
                         className="mt-2"
                         position="RIGHT"
                         value={last_serviced_on && new Date(last_serviced_on)}
                         onChange={(date) => {
                           if (
-                            dayjs(date).format("YYYY-MM-DD") >
+                            dayjs(date.value).format("YYYY-MM-DD") >
                             new Date().toLocaleDateString("en-ca")
                           ) {
                             Notification.Error({
                               msg: "Last Serviced date can't be in future",
                             });
                           } else {
-                            setLastServicedOn(dayjs(date).format("YYYY-MM-DD"));
+                            setLastServicedOn(
+                              dayjs(date.value).format("YYYY-MM-DD")
+                            );
                           }
                         }}
-                        max={new Date()}
                       />
                       <FieldErrorText
                         error={state.errors.last_serviced_on}
@@ -907,8 +912,10 @@ const AssetCreate = (props: AssetProps) => {
                     >
                       <TextAreaFormField
                         name="notes"
-                        label="Notes"
-                        placeholder="Eg. Details on functionality, service, etc."
+                        label={t("notes")}
+                        placeholder={t(
+                          "Eg. Details on functionality, service, etc."
+                        )}
                         value={notes}
                         onChange={(e) => setNotes(e.value)}
                         error={state.errors.notes}
@@ -928,13 +935,13 @@ const AssetCreate = (props: AssetProps) => {
                     />
                     <Submit
                       onClick={(e) => handleSubmit(e, false)}
-                      label={assetId ? "Update" : "Create Asset"}
+                      label={assetId ? t("update") : t("create_asset")}
                     />
                     {!assetId && (
                       <Submit
                         data-testid="create-asset-add-more-button"
                         onClick={(e) => handleSubmit(e, true)}
-                        label="Create & Add More"
+                        label={t("create_add_more")}
                       />
                     )}
                   </div>
diff --git a/src/Components/Facility/Consultations/LiveFeed.tsx b/src/Components/Facility/Consultations/LiveFeed.tsx
index c6ba749b471..aba473e958d 100644
--- a/src/Components/Facility/Consultations/LiveFeed.tsx
+++ b/src/Components/Facility/Consultations/LiveFeed.tsx
@@ -36,6 +36,7 @@ const LiveFeed = (props: any) => {
   const [streamStatus, setStreamStatus] = useState<StreamStatus>(
     StreamStatus.Offline
   );
+  const [videoStartTime, setVideoStartTime] = useState<Date | null>(null);
   const [bed, setBed] = useState<BedModel>({});
   const [preset, setNewPreset] = useState<string>("");
   const [loading, setLoading] = useState<string | undefined>();
@@ -100,6 +101,16 @@ const LiveFeed = (props: any) => {
       },
     });
 
+  const calculateVideoLiveDelay = () => {
+    const video = liveFeedPlayerRef.current as HTMLVideoElement;
+    if (!video || !videoStartTime) return 0;
+
+    const timeDifference =
+      (new Date().getTime() - videoStartTime.getTime()) / 1000;
+
+    return timeDifference - video.currentTime;
+  };
+
   const getBedPresets = async (id: any) => {
     const bedAssets = await dispatch(
       listAssetBeds({
@@ -223,6 +234,7 @@ const LiveFeed = (props: any) => {
     },
     reset: () => {
       setStreamStatus(StreamStatus.Loading);
+      setVideoStartTime(null);
       startStream({
         onSuccess: () => setStreamStatus(StreamStatus.Playing),
         onError: () => setStreamStatus(StreamStatus.Offline),
@@ -344,8 +356,25 @@ const LiveFeed = (props: any) => {
                 playsInline
                 className="z-10 h-full w-full"
                 ref={liveFeedPlayerRef}
+                onPlay={() => {
+                  setVideoStartTime(() => new Date());
+                }}
+                onWaiting={() => {
+                  const delay = calculateVideoLiveDelay();
+                  if (delay > 5) {
+                    setStreamStatus(StreamStatus.Loading);
+                  }
+                }}
               ></video>
 
+              {streamStatus === StreamStatus.Playing &&
+                calculateVideoLiveDelay() > 3 && (
+                  <div className="absolute left-8 top-12 z-10 flex items-center gap-2 rounded-3xl bg-red-400 px-3 py-1.5 text-xs font-semibold text-gray-100">
+                    <CareIcon className="care-l-wifi-slash h-4 w-4" />
+                    <span>Slow Network Detected</span>
+                  </div>
+                )}
+
               {loading && (
                 <div className="absolute bottom-0 right-0 rounded-tl bg-white/75 p-4">
                   <div className="flex items-center gap-2">
diff --git a/src/Components/Facility/UpdateFacilityMiddleware.tsx b/src/Components/Facility/FacilityConfigure.tsx
similarity index 98%
rename from src/Components/Facility/UpdateFacilityMiddleware.tsx
rename to src/Components/Facility/FacilityConfigure.tsx
index 211d8cf458a..6f0a8a9869c 100644
--- a/src/Components/Facility/UpdateFacilityMiddleware.tsx
+++ b/src/Components/Facility/FacilityConfigure.tsx
@@ -46,7 +46,7 @@ const FormReducer = (state = initialState, action: any) => {
   }
 };
 
-export const UpdateFacilityMiddleware = (props: any) => {
+export const FacilityConfigure = (props: any) => {
   const [state, dispatch] = useReducer(FormReducer, initialState);
   const { facilityId } = props;
   const dispatchAction: any = useDispatch();
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index 15317b1b56c..68990e64416 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -323,7 +323,7 @@ export const FacilityHome = (props: any) => {
       StaffUserTypeIndex;
 
   const editCoverImageTooltip = hasPermissionToEditCoverImage && (
-    <div className="absolute right-0 top-0 z-10 flex h-48 w-full flex-col items-center justify-center bg-black text-sm text-gray-300 opacity-0 transition-[opacity] hover:opacity-60 md:h-[88px]">
+    <div className="absolute right-0 top-0 z-10 flex h-full w-full flex-col items-center justify-center bg-black text-sm text-gray-300 opacity-0 transition-[opacity] hover:opacity-60 md:h-[88px]">
       <i className="fa-solid fa-pen" />
       <span className="mt-2">{`${hasCoverImage ? "Edit" : "Upload"}`}</span>
     </div>
@@ -541,9 +541,7 @@ export const FacilityHome = (props: any) => {
                 </DropdownItem>
                 <DropdownItem
                   id="configure-facility"
-                  onClick={() =>
-                    navigate(`/facility/${facilityId}/middleware/update`)
-                  }
+                  onClick={() => navigate(`/facility/${facilityId}/configure`)}
                   authorizeFor={NonReadOnlyUsers}
                   icon={<CareIcon className="care-l-setting text-lg" />}
                 >
diff --git a/src/Components/Form/Form.tsx b/src/Components/Form/Form.tsx
index 5b1cf018965..e934c4ffe0e 100644
--- a/src/Components/Form/Form.tsx
+++ b/src/Components/Form/Form.tsx
@@ -7,6 +7,7 @@ import { FormContextValue, createFormContext } from "./FormContext";
 import { FieldChangeEvent } from "./FormFields/Utils";
 import { FormDetails, FormErrors, FormState, formReducer } from "./Utils";
 import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave";
+import * as Notification from "../../Utils/Notifications";
 
 type Props<T extends FormDetails> = {
   className?: string;
@@ -51,6 +52,10 @@ const Form = <T extends FormDetails>({
 
       if (Object.keys(errors).length) {
         dispatch({ type: "set_errors", errors });
+
+        if (errors.$all) {
+          Notification.Error({ msg: errors.$all });
+        }
         return;
       }
     }
diff --git a/src/Components/Form/FormFields/NumericWithUnitsFormField.tsx b/src/Components/Form/FormFields/NumericWithUnitsFormField.tsx
index 31ac781e018..02aa03fdf71 100644
--- a/src/Components/Form/FormFields/NumericWithUnitsFormField.tsx
+++ b/src/Components/Form/FormFields/NumericWithUnitsFormField.tsx
@@ -34,6 +34,7 @@ export default function NumericWithUnitsFormField(props: Props) {
           max={props.max}
           autoComplete={props.autoComplete}
           required={field.required}
+          value={numValue}
           onChange={(e) => field.handleChange(e.target.value + " " + unitValue)}
         />
         <div className="absolute inset-y-0 right-0 flex items-center">
diff --git a/src/Components/Form/Utils.ts b/src/Components/Form/Utils.ts
index 2ec5d4b60e5..0592e81a06c 100644
--- a/src/Components/Form/Utils.ts
+++ b/src/Components/Form/Utils.ts
@@ -1,7 +1,9 @@
 import { FieldError } from "./FieldValidators";
 
 export type FormDetails = { [key: string]: any };
-export type FormErrors<T = FormDetails> = Partial<Record<keyof T, FieldError>>;
+export type FormErrors<T = FormDetails> = Partial<
+  Record<keyof T | "$all", FieldError>
+>;
 export type FormState<T = FormDetails> = { form: T; errors: FormErrors<T> };
 export type FormAction<T = FormDetails> =
   | { type: "set_form"; form: T }
diff --git a/src/Components/Medicine/CreatePrescriptionForm.tsx b/src/Components/Medicine/CreatePrescriptionForm.tsx
index fb7fec5f431..2a58c632d20 100644
--- a/src/Components/Medicine/CreatePrescriptionForm.tsx
+++ b/src/Components/Medicine/CreatePrescriptionForm.tsx
@@ -1,4 +1,4 @@
-import { FieldError, RequiredFieldValidator } from "../Form/FieldValidators";
+import { RequiredFieldValidator } from "../Form/FieldValidators";
 import Form from "../Form/Form";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
@@ -11,6 +11,7 @@ import NumericWithUnitsFormField from "../Form/FormFields/NumericWithUnitsFormFi
 import { useTranslation } from "react-i18next";
 import MedibaseAutocompleteFormField from "./MedibaseAutocompleteFormField";
 import dayjs from "../../Utils/dayjs";
+import { PrescriptionFormValidator } from "./validators";
 
 export default function CreatePrescriptionForm(props: {
   prescription: Prescription;
@@ -40,16 +41,7 @@ export default function CreatePrescriptionForm(props: {
         }
       }}
       noPadding
-      validate={(form) => {
-        const errors: Partial<Record<keyof Prescription, FieldError>> = {};
-        errors.medicine_object = RequiredFieldValidator()(form.medicine_object);
-        errors.dosage = RequiredFieldValidator()(form.dosage);
-        if (form.is_prn)
-          errors.indicator = RequiredFieldValidator()(form.indicator);
-        if (!form.is_prn)
-          errors.frequency = RequiredFieldValidator()(form.frequency);
-        return errors;
-      }}
+      validate={PrescriptionFormValidator()}
       className="max-w-3xl"
     >
       {(field) => (
diff --git a/src/Components/Medicine/EditPrescriptionForm.tsx b/src/Components/Medicine/EditPrescriptionForm.tsx
new file mode 100644
index 00000000000..d5261f70c7e
--- /dev/null
+++ b/src/Components/Medicine/EditPrescriptionForm.tsx
@@ -0,0 +1,158 @@
+import { useState } from "react";
+import Form from "../Form/Form";
+import { Prescription } from "./models";
+import request from "../../Utils/request/request";
+import routes from "../../Redux/api";
+import * as Notification from "../../Utils/Notifications";
+import useSlug from "../../Common/hooks/useSlug";
+import { RequiredFieldValidator } from "../Form/FieldValidators";
+import { useTranslation } from "react-i18next";
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import NumericWithUnitsFormField from "../Form/FormFields/NumericWithUnitsFormField";
+import {
+  PRESCRIPTION_FREQUENCIES,
+  PRESCRIPTION_ROUTES,
+} from "./CreatePrescriptionForm";
+import TextFormField from "../Form/FormFields/TextFormField";
+import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
+import { EditPrescriptionFormValidator } from "./validators";
+
+interface Props {
+  initial: Prescription;
+  onDone: (created: boolean) => void;
+}
+
+const handleSubmit = async (
+  consultation_external_id: string,
+  oldObj: Prescription,
+  { discontinued_reason, ...newObj }: Prescription
+) => {
+  const discontinue = await request(routes.discontinuePrescription, {
+    pathParams: { consultation_external_id, external_id: oldObj.id },
+    body: {
+      discontinued_reason: discontinued_reason
+        ? `Edit: ${discontinued_reason}`
+        : "Edited",
+    },
+  });
+
+  if (discontinue.res?.status !== 200) {
+    Notification.Error({
+      msg: "Failed to discontinue previous prescription",
+    });
+    return;
+  }
+
+  const { res } = await request(routes.createPrescription, {
+    pathParams: { consultation_external_id },
+    body: {
+      ...newObj,
+      // Forcing the medicine to be the same as the old one
+      medicine: oldObj.medicine_object?.id,
+      medicine_old: oldObj.medicine_old,
+    },
+  });
+
+  return res?.status === 201;
+};
+
+export default function EditPrescriptionForm(props: Props) {
+  const consultation = useSlug("consultation");
+  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation();
+
+  return (
+    <Form<Prescription>
+      disabled={isLoading}
+      defaults={props.initial}
+      onCancel={() => props.onDone(false)}
+      onSubmit={async (obj) => {
+        setIsLoading(true);
+        const success = await handleSubmit(consultation, props.initial, obj);
+        setIsLoading(false);
+
+        if (success) {
+          props.onDone(true);
+        }
+      }}
+      noPadding
+      validate={EditPrescriptionFormValidator(props.initial)}
+    >
+      {(field) => (
+        <>
+          <TextAreaFormField
+            label={t("reason_for_edit")}
+            {...field("discontinued_reason")}
+          />
+
+          <div className="flex items-center gap-4">
+            <SelectFormField
+              className="flex-1"
+              label={t("route")}
+              {...field("route")}
+              options={PRESCRIPTION_ROUTES}
+              optionLabel={(key) => t("PRESCRIPTION_ROUTE_" + key)}
+              optionValue={(key) => key}
+            />
+            <NumericWithUnitsFormField
+              className="flex-1"
+              label={t("dosage")}
+              {...field("dosage", RequiredFieldValidator())}
+              required
+              units={["mg", "g", "ml", "drop(s)", "ampule(s)", "tsp"]}
+              min={0}
+            />
+          </div>
+
+          {props.initial.is_prn ? (
+            <>
+              <TextFormField
+                label={t("indicator")}
+                {...field("indicator", RequiredFieldValidator())}
+                required
+              />
+              <TextFormField
+                label={t("max_dosage_24_hrs")}
+                type="number"
+                min={0}
+                {...field("max_dosage")}
+              />
+              <SelectFormField
+                label={t("min_time_bw_doses")}
+                {...field("min_hours_between_doses")}
+                options={[1, 2, 3, 6, 12, 24]}
+                optionLabel={(hours) => `${hours} hrs.`}
+                optionValue={(hours) => hours}
+                position="above"
+              />
+            </>
+          ) : (
+            <div className="flex items-center gap-4">
+              <SelectFormField
+                position="above"
+                className="flex-1"
+                label={t("frequency")}
+                {...field("frequency", RequiredFieldValidator())}
+                required
+                options={Object.entries(PRESCRIPTION_FREQUENCIES)}
+                optionLabel={([key]) =>
+                  t("PRESCRIPTION_FREQUENCY_" + key.toUpperCase())
+                }
+                optionValue={([key]) => key}
+              />
+              <TextFormField
+                className="flex-1"
+                label={t("days")}
+                type="number"
+                min={0}
+                {...field("days")}
+              />
+            </div>
+          )}
+
+          <TextAreaFormField label={t("notes")} {...field("notes")} />
+        </>
+      )}
+    </Form>
+  );
+}
diff --git a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
index 81282126d7c..c80b66f44c6 100644
--- a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
+++ b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx
@@ -20,6 +20,7 @@ import {
   formatTime,
 } from "../../Utils/utils";
 import useRangePagination from "../../Common/hooks/useRangePagination";
+import EditPrescriptionForm from "./EditPrescriptionForm";
 
 interface DateRange {
   start: Date;
@@ -47,6 +48,8 @@ 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(),
@@ -64,8 +67,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 +82,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 +156,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>
@@ -164,6 +184,8 @@ export default function PrescriptionAdministrationsTable({
                   variant="secondary"
                   disabled={!pagination.hasPrevious}
                   onClick={pagination.previous}
+                  tooltip="Previous 24 hours"
+                  tooltipClassName="tooltip-bottom -translate-x-1/2 text-xs"
                 >
                   <CareIcon icon="l-angle-left-b" className="text-base" />
                 </ButtonV2>
@@ -205,6 +227,8 @@ export default function PrescriptionAdministrationsTable({
                   variant="secondary"
                   disabled={!pagination.hasNext}
                   onClick={pagination.next}
+                  tooltip="Next 24 hours"
+                  tooltipClassName="tooltip-bottom -translate-x-1/2 text-xs"
                 >
                   <CareIcon icon="l-angle-right-b" className="text-base" />
                 </ButtonV2>
@@ -227,6 +251,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" />
@@ -254,6 +295,7 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
   const { t } = useTranslation();
   // const [showActions, setShowActions] = useState(false);
   const [showDetails, setShowDetails] = useState(false);
+  const [showEdit, setShowEdit] = useState(false);
   const [showAdminister, setShowAdminister] = useState(false);
   const [showDiscontinue, setShowDiscontinue] = useState(false);
   const [administrations, setAdministrations] =
@@ -285,8 +327,7 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
   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"
+        "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"
       )}
     >
       {showDiscontinue && (
@@ -342,6 +383,21 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
                 <CareIcon className="care-l-ban text-lg" />
                 {t("discontinue")}
               </Submit>
+              <Submit
+                disabled={
+                  prescription.discontinued ||
+                  prescription.prescription_type === "DISCHARGE"
+                }
+                variant="secondary"
+                border
+                onClick={() => {
+                  setShowDetails(false);
+                  setShowEdit(true);
+                }}
+              >
+                <CareIcon icon="l-pen" className="text-lg" />
+                {t("edit")}
+              </Submit>
               <Submit
                 disabled={
                   prescription.discontinued ||
@@ -356,43 +412,73 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => {
           </div>
         </DialogModal>
       )}
+      {showEdit && (
+        <DialogModal
+          onClose={() => setShowEdit(false)}
+          show={showEdit}
+          title={`${t("edit")} ${t(
+            prescription.is_prn ? "prn_prescription" : "prescription_medication"
+          )}: ${
+            prescription.medicine_object?.name ?? prescription.medicine_old
+          }`}
+          description={
+            <div className="mt-2 flex w-full justify-start gap-2 text-warning-500">
+              <CareIcon icon="l-info-circle" className="text-base" />
+              <span>{t("edit_caution_note")}</span>
+            </div>
+          }
+          className="w-full max-w-3xl lg:min-w-[600px]"
+        >
+          <EditPrescriptionForm
+            initial={prescription}
+            onDone={(success) => {
+              setShowEdit(false);
+              if (success) {
+                props.refetch();
+              }
+            }}
+          />
+        </DialogModal>
+      )}
       <td
-        className="cursor-pointer py-3 pl-4 text-left"
+        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 items-center gap-2">
-          <span
-            className={classNames(
-              "text-sm font-semibold",
-              prescription.discontinued ? "text-gray-700" : "text-gray-900"
+        <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="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.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.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>
 
-          {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 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 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) => (
diff --git a/src/Components/Medicine/PrescriptionDetailCard.tsx b/src/Components/Medicine/PrescriptionDetailCard.tsx
index 6da4fa7ae8d..bf27aa34068 100644
--- a/src/Components/Medicine/PrescriptionDetailCard.tsx
+++ b/src/Components/Medicine/PrescriptionDetailCard.tsx
@@ -5,6 +5,7 @@ import ReadMore from "../Common/components/Readmore";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { PrescriptionActions } from "../../Redux/actions";
 import { useTranslation } from "react-i18next";
+import RecordMeta from "../../CAREUI/display/RecordMeta";
 
 export default function PrescriptionDetailCard({
   prescription,
@@ -29,7 +30,7 @@ export default function PrescriptionDetailCard({
         prescription.discontinued && "bg-gray-200 opacity-80"
       )}
     >
-      <div className="flex flex-1 flex-col gap-2">
+      <div className="flex flex-1 flex-col">
         <div>
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-4">
@@ -83,7 +84,7 @@ export default function PrescriptionDetailCard({
           </div>
         </div>
 
-        <div className="mt-2 grid grid-cols-9 items-center gap-2">
+        <div className="mt-4 grid grid-cols-9 items-center gap-2">
           <Detail className="col-span-9 md:col-span-5" label={t("medicine")}>
             {prescription.medicine_object?.name ?? prescription.medicine_old}
           </Detail>
@@ -146,6 +147,23 @@ export default function PrescriptionDetailCard({
             </Detail>
           )}
         </div>
+
+        <div className="flex flex-col gap-1 text-xs text-gray-600 md:mt-3 md:flex-row md:items-center">
+          <span className="flex gap-1">
+            Prescribed
+            <RecordMeta
+              time={prescription.created_date}
+              user={prescription.prescribed_by}
+              inlineUser
+            />
+          </span>
+          {prescription.discontinued && (
+            <span className="flex gap-1">
+              and was discontinued
+              <RecordMeta time={prescription.discontinued_date} />
+            </span>
+          )}
+        </div>
       </div>
 
       {props.children}
diff --git a/src/Components/Medicine/models.ts b/src/Components/Medicine/models.ts
index 62aea46b6d2..0c49d199b21 100644
--- a/src/Components/Medicine/models.ts
+++ b/src/Components/Medicine/models.ts
@@ -1,7 +1,7 @@
 import { PerformedByModel } from "../HCX/misc";
 
 interface BasePrescription {
-  readonly id?: string;
+  readonly id: string;
   medicine?: string;
   medicine_object?: MedibaseMedicine;
   medicine_old?: string;
diff --git a/src/Components/Medicine/validators.ts b/src/Components/Medicine/validators.ts
new file mode 100644
index 00000000000..40261646d05
--- /dev/null
+++ b/src/Components/Medicine/validators.ts
@@ -0,0 +1,49 @@
+import { FieldError, RequiredFieldValidator } from "../Form/FieldValidators";
+import { FormErrors } from "../Form/Utils";
+import { Prescription } from "./models";
+
+export const PrescriptionFormValidator = () => {
+  return (form: Prescription): FormErrors<Prescription> => {
+    const errors: Partial<Record<keyof Prescription, FieldError>> = {};
+    errors.medicine_object = RequiredFieldValidator()(form.medicine_object);
+    errors.dosage = RequiredFieldValidator()(form.dosage);
+    if (form.is_prn)
+      errors.indicator = RequiredFieldValidator()(form.indicator);
+    if (!form.is_prn)
+      errors.frequency = RequiredFieldValidator()(form.frequency);
+    return errors;
+  };
+};
+
+export const EditPrescriptionFormValidator = (old: Prescription) => {
+  return (form: Prescription): FormErrors<Prescription> => {
+    const errors = PrescriptionFormValidator()(form);
+
+    if (comparePrescriptions(old, form)) {
+      errors.$all = "No changes made";
+    }
+
+    return errors;
+  };
+};
+
+const PRESCRIPTION_COMPARE_FIELDS: (keyof Prescription)[] = [
+  "medicine",
+  "days",
+  "discontinued",
+  "dosage",
+  "frequency",
+  "indicator",
+  "is_prn",
+  "max_dosage",
+  "min_hours_between_doses",
+  "prescription_type",
+  "route",
+];
+
+export const comparePrescriptions = (a: Prescription, b: Prescription) => {
+  return (
+    PRESCRIPTION_COMPARE_FIELDS.every((field) => a[field] === b[field]) &&
+    a.medicine_object?.id === b.medicine_object?.id
+  );
+};
diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
index f6afa6cccd8..5e3aa65b3ec 100644
--- a/src/Components/Notifications/NotificationsList.tsx
+++ b/src/Components/Notifications/NotificationsList.tsx
@@ -165,6 +165,7 @@ export default function NotificationsList({
   const [isMarkingAllAsRead, setIsMarkingAllAsRead] = useState(false);
   const [isSubscribed, setIsSubscribed] = useState("");
   const [isSubscribing, setIsSubscribing] = useState(false);
+  const [showUnread, setShowUnread] = useState(false);
   const { t } = useTranslation();
 
   useEffect(() => {
@@ -351,33 +352,37 @@ export default function NotificationsList({
   } else if (data?.length) {
     manageResults = (
       <>
-        {data.map((result: any) => (
-          <NotificationTile
-            key={result.id}
-            notification={result}
-            onClickCB={onClickCB}
-            setShowNotifications={setOpen}
-          />
-        ))}
+        {data
+              .filter((notification: any) => showUnread ? notification.read_at === null : true)
+              .map((result: any) => (
+                <NotificationTile
+                  key={result.id}
+                  notification={result}
+                  onClickCB={onClickCB}
+                  setShowNotifications={setOpen}
+                />
+              ))}
         {isLoading && (
           <div className="flex items-center justify-center">
             <CircularProgress />
           </div>
         )}
-        {totalCount > RESULT_LIMIT && offset < totalCount - RESULT_LIMIT && (
-          <div className="mt-4 flex w-full justify-center px-4 py-5 lg:px-8">
-            <ButtonV2
-              className="w-full"
-              disabled={isLoading}
-              variant="secondary"
-              shadow
-              border
-              onClick={() => setOffset((prev) => prev + RESULT_LIMIT)}
-            >
-              {isLoading ? t("loading") : t("load_more")}
-            </ButtonV2>
-          </div>
-        )}
+        {!showUnread &&
+          totalCount > RESULT_LIMIT &&
+          offset < totalCount - RESULT_LIMIT && (
+            <div className="mt-4 flex w-full justify-center px-4 py-5 lg:px-8">
+              <ButtonV2
+                className="w-full"
+                disabled={isLoading}
+                variant="secondary"
+                shadow
+                border
+                onClick={() => setOffset((prev) => prev + RESULT_LIMIT)}
+              >
+                {isLoading ? t("loading") : t("load_more")}
+              </ButtonV2>
+            </div>
+          )}
       </>
     );
   } else if (data && data.length === 0) {
@@ -448,6 +453,21 @@ export default function NotificationsList({
               />
               <span className="text-xs">{t("mark_all_as_read")}</span>
             </ButtonV2>
+            <ButtonV2
+              ghost
+              variant="secondary"
+              onClick={() => setShowUnread(!showUnread)}
+            >
+              <CareIcon
+                className={showUnread ? "care-l-filter-slash" : "care-l-filter"}
+              />
+
+              <span className="text-xs">
+                {showUnread
+                  ? t("show_all_notifications")
+                  : t("show_unread_notifications")}
+              </span>
+            </ButtonV2>
           </div>
 
           <SelectMenuV2
diff --git a/src/Components/Notifications/ShowPushNotification.tsx b/src/Components/Notifications/ShowPushNotification.tsx
index fe88c087d5e..09b62bb9333 100644
--- a/src/Components/Notifications/ShowPushNotification.tsx
+++ b/src/Components/Notifications/ShowPushNotification.tsx
@@ -1,13 +1,13 @@
 import { useDispatch } from "react-redux";
 import { getNotificationData } from "../../Redux/actions";
 import { useEffect } from "react";
+import { DetailRoute } from "../../Routers/types";
 
-export default function ShowPushNotification({ external_id }: any) {
+export default function ShowPushNotification({ id }: DetailRoute) {
   const dispatch: any = useDispatch();
 
   const resultUrl = async () => {
-    console.log("ID:", external_id.id);
-    const res = await dispatch(getNotificationData({ id: external_id.id }));
+    const res = await dispatch(getNotificationData({ id }));
     const data = res.data.caused_objects;
     switch (res.data.event) {
       case "PATIENT_CREATED":
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index fe0881e6994..2b0b068b0ef 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -100,7 +100,7 @@ interface FileUploadProps {
   hideBack: boolean;
   audio?: boolean;
   unspecified: boolean;
-  sampleId?: number;
+  sampleId?: string;
   claimId?: string;
 }
 
diff --git a/src/Components/Patient/SampleDetails.tsx b/src/Components/Patient/SampleDetails.tsx
index 7814109978b..e29df92f47f 100644
--- a/src/Components/Patient/SampleDetails.tsx
+++ b/src/Components/Patient/SampleDetails.tsx
@@ -13,14 +13,11 @@ import { getTestSample } from "../../Redux/actions";
 
 import { navigate } from "raviger";
 import { useDispatch } from "react-redux";
+import { DetailRoute } from "../../Routers/types";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
-interface SampleDetailsProps {
-  id: number;
-}
-
-export const SampleDetails = ({ id }: SampleDetailsProps) => {
+export const SampleDetails = ({ id }: DetailRoute) => {
   const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [sampleDetails, setSampleDetails] = useState<SampleTestModel>({});
diff --git a/src/Components/Resource/ListView.tsx b/src/Components/Resource/ListView.tsx
index b368c9bf3ea..24b4e263039 100644
--- a/src/Components/Resource/ListView.tsx
+++ b/src/Components/Resource/ListView.tsx
@@ -31,7 +31,7 @@ export default function ListView() {
   const { t } = useTranslation();
 
   const onBoardViewBtnClick = () =>
-    navigate("/resource/board-view", { query: qParams });
+    navigate("/resource/board", { query: qParams });
   const appliedFilters = formatFilter(qParams);
 
   const refreshList = () => {
diff --git a/src/Components/Resource/ResourceBoardView.tsx b/src/Components/Resource/ResourceBoardView.tsx
index de3058f9406..d3b2b202649 100644
--- a/src/Components/Resource/ResourceBoardView.tsx
+++ b/src/Components/Resource/ResourceBoardView.tsx
@@ -32,7 +32,7 @@ export default function BoardView() {
   const { t } = useTranslation();
 
   const onListViewBtnClick = () => {
-    navigate("/resource/list-view", { query: qParams });
+    navigate("/resource/list", { query: qParams });
     localStorage.setItem("defaultResourceView", "list");
   };
 
diff --git a/src/Components/Resource/ResourceDetails.tsx b/src/Components/Resource/ResourceDetails.tsx
index 591f6b48bdb..67adc7edd82 100644
--- a/src/Components/Resource/ResourceDetails.tsx
+++ b/src/Components/Resource/ResourceDetails.tsx
@@ -231,7 +231,7 @@ export default function ResourceDetails(props: { id: string }) {
     <Page
       title={"Resource details"}
       crumbsReplacements={{ [props.id]: { name: data.title } }}
-      backUrl={"/resource/board-view"}
+      backUrl={"/resource/board"}
     >
       {isPrintMode ? (
         <div className="my-4">
diff --git a/src/Components/Shifting/BoardView.tsx b/src/Components/Shifting/BoardView.tsx
index 0eddfddf745..85815770acf 100644
--- a/src/Components/Shifting/BoardView.tsx
+++ b/src/Components/Shifting/BoardView.tsx
@@ -95,9 +95,7 @@ export default function BoardView() {
           <div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
             <ButtonV2
               className="py-[11px]"
-              onClick={() =>
-                navigate("/shifting/list-view", { query: qParams })
-              }
+              onClick={() => navigate("/shifting/list", { query: qParams })}
             >
               <CareIcon className="care-l-list-ul" />
               {t("list_view")}
diff --git a/src/Components/Shifting/ListView.tsx b/src/Components/Shifting/ListView.tsx
index 6d55122ea11..f3fb14a4c0a 100644
--- a/src/Components/Shifting/ListView.tsx
+++ b/src/Components/Shifting/ListView.tsx
@@ -312,9 +312,7 @@ export default function ListView() {
           <div className="flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
             <ButtonV2
               className="py-[11px]"
-              onClick={() =>
-                navigate("/shifting/board-view", { query: qParams })
-              }
+              onClick={() => navigate("/shifting/board", { query: qParams })}
             >
               <CareIcon className="care-l-list-ul rotate-90" />
               {t("board_view")}
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx
index 03e09702aac..7bffe429960 100644
--- a/src/Components/Shifting/ShiftDetails.tsx
+++ b/src/Components/Shifting/ShiftDetails.tsx
@@ -557,7 +557,7 @@ export default function ShiftDetails(props: { id: string }) {
       ) : (
         <Page
           title={t("shifting_details")}
-          backUrl="/shifting/board-view"
+          backUrl="/shifting/board"
           options={
             <div className="flex gap-2">
               <ButtonV2
diff --git a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
index 1b45fd80ddc..44cadd8263c 100644
--- a/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
+++ b/src/Components/VitalsMonitor/HL7PatientVitalsMonitor.tsx
@@ -8,6 +8,15 @@ import { classNames } from "../../Utils/utils";
 import { IVitalsComponentProps, VitalsValueBase } from "./types";
 import { triggerGoal } from "../../Integrations/Plausible";
 import useAuthUser from "../../Common/hooks/useAuthUser";
+import dayjs from "dayjs";
+
+const minutesAgo = (timestamp: string) => {
+  return `${dayjs().diff(dayjs(timestamp), "minute")}m ago`;
+};
+
+const isWithinMinutes = (timestamp: string, minutes: number) => {
+  return dayjs().diff(dayjs(timestamp), "minute") < minutes;
+};
 
 export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
   const { connect, waveformCanvas, data, isOnline } = useHL7VitalsMonitor(
@@ -30,6 +39,10 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
     connect(props.socketUrl);
   }, [props.socketUrl]);
 
+  const bpWithinMaxPersistence = !!(
+    (data.bp?.["date-time"] && isWithinMinutes(data.bp?.["date-time"], 30)) // Max blood pressure persistence is 30 minutes
+  );
+
   return (
     <div className="flex flex-col gap-1 rounded bg-[#020617] p-2">
       {props.patientAssetBed && (
@@ -97,24 +110,37 @@ export default function HL7PatientVitalsMonitor(props: IVitalsComponentProps) {
 
           {/* Blood Pressure */}
           <div className="flex flex-col p-1">
-            <div className="flex w-full gap-2 font-bold text-orange-500">
+            <div className="flex w-full justify-between gap-2 font-bold text-orange-500">
               <span className="text-sm">NIBP</span>
-              <span className="text-xs">{data.bp?.systolic.unit ?? "--"}</span>
+              <span className="text-xs">
+                {bpWithinMaxPersistence ? data.bp?.systolic.unit ?? "--" : "--"}
+              </span>
+              <span className="text-xs">
+                {data.bp?.["date-time"] && minutesAgo(data.bp?.["date-time"])}
+              </span>
             </div>
             <div className="flex w-full justify-center text-sm font-medium text-orange-500">
               Sys / Dia
             </div>
             <div className="flex w-full justify-center text-2xl font-black text-orange-300 md:text-4xl">
-              <span>{data.bp?.systolic.value ?? "--"}</span>
+              <span>
+                {bpWithinMaxPersistence
+                  ? data.bp?.systolic.value ?? "--"
+                  : "--"}
+              </span>
               <span>/</span>
-              <span>{data.bp?.diastolic.value ?? "--"}</span>
+              <span>
+                {bpWithinMaxPersistence
+                  ? data.bp?.diastolic.value ?? "--"
+                  : "--"}
+              </span>
             </div>
             <div className="flex items-end">
               <span className="flex-1 text-sm font-bold text-orange-500">
                 Mean
               </span>
               <span className="flex-1 text-xl font-bold text-gray-300">
-                {data.bp?.map.value ?? "--"}
+                {bpWithinMaxPersistence ? data.bp?.map.value ?? "--" : "--"}
               </span>
             </div>
           </div>
diff --git a/src/Components/VitalsMonitor/types.ts b/src/Components/VitalsMonitor/types.ts
index 066b7a7cc78..60979a6f9b0 100644
--- a/src/Components/VitalsMonitor/types.ts
+++ b/src/Components/VitalsMonitor/types.ts
@@ -8,7 +8,7 @@ export interface VitalsDataBase {
   "patient-name": string;
 }
 
-export interface VitalsValueBase {
+export interface VitalsValueBase extends VitalsDataBase {
   value: number;
   unit: string;
   interpretation: string;
diff --git a/src/Components/VitalsMonitor/useHL7VitalsMonitor.ts b/src/Components/VitalsMonitor/useHL7VitalsMonitor.ts
index 8b74a2d05d2..ed16cc2edfd 100644
--- a/src/Components/VitalsMonitor/useHL7VitalsMonitor.ts
+++ b/src/Components/VitalsMonitor/useHL7VitalsMonitor.ts
@@ -8,11 +8,12 @@ import useCanvas from "../../Common/hooks/useCanvas";
 import {
   ChannelOptions,
   IVitalsComponentProps,
+  VitalsDataBase,
   VitalsValueBase as VitalsValue,
 } from "./types";
 import { getChannel, getVitalsCanvasSizeAndDuration } from "./utils";
 
-interface VitalsBPValue {
+interface VitalsBPValue extends VitalsDataBase {
   systolic: VitalsValue;
   diastolic: VitalsValue;
   map: VitalsValue;
diff --git a/src/Locale/en/Asset.json b/src/Locale/en/Asset.json
index cf13de5cd47..f24549ee0b6 100644
--- a/src/Locale/en/Asset.json
+++ b/src/Locale/en/Asset.json
@@ -1,3 +1,15 @@
 {
-  "create_asset": "Create Asset"
+  "create_asset": "Create Asset",
+  "edit_history": "Edit History",
+  "update_record_for_asset": "Update record for asset",
+  "edited_on": "Edited On",
+  "edited_by": "Edited By",
+  "serviced_on": "Serviced On",
+  "notes": "Notes",
+  "back": "Back",
+  "close": "Close",
+  "update_asset_service_record": "Update Asset Service Record",
+  "eg_details_on_functionality_service_etc": "Eg. Details on functionality, service, etc.",
+  "updating": "Updating",
+  "update": "Update"
 }
diff --git a/src/Locale/en/Facility.json b/src/Locale/en/Facility.json
index aa44d86dda5..5e69f8108af 100644
--- a/src/Locale/en/Facility.json
+++ b/src/Locale/en/Facility.json
@@ -20,5 +20,37 @@
   "type_b_cylinders": "B Type Cylinders",
   "type_c_cylinders": "C Type Cylinders",
   "type_d_cylinders": "D Type Cylinders",
-  "select_local_body": "Select Local Body"
+  "select_local_body": "Select Local Body",
+  "update_asset": "Update Asset",
+  "create_new_asset": "Create New Asset",
+  "you_need_at_least_a_location_to_create_an_assest": "You need at least a location to create an assest.",
+  "add_location": "Add Location",
+  "close_scanner": "Close Scanner",
+  "scan_asset_qr": "Scan Asset QR!",
+  "update": "Update",
+  "create": "Create",
+  "asset_name": "Asset Name",
+  "asset_location": "Asset Location",
+  "asset_type": "Asset Type",
+  "asset_class": "Asset Class",
+  "description": "Description",
+  "details_about_the_equipment": "Details about the equipment",
+  "working_status": "Working Status",
+  "why_the_asset_is_not_working": "Why the asset is not working?",
+  "describe_why_the_asset_is_not_working": "Describe why the asset is not working",
+  "asset_qr_id": "Asset QR ID",
+  "manufacturer": "Manufacturer",
+  "eg_xyz": "Eg. XYZ",
+  "eg_abc": "Eg. ABC",
+  "warranty_amc_expiry": "Warranty / AMC Expiry",
+  "customer_support_name": "Customer Support Name",
+  "customer_support_number": "Customer support number",
+  "customer_support_email": "Customer Support Email",
+  "eg_mail_example_com": "Eg. mail@example.com",
+  "vendor_name": "Vendor Name",
+  "serial_number": "Serial Number",
+  "last_serviced_on": "Last Serviced On",
+  "notes": "Notes",
+  "create_asset": "Create Asset",
+  "create_add_more": "Create & Add More"
 }
diff --git a/src/Locale/en/Medicine.json b/src/Locale/en/Medicine.json
index 8cc80234b74..d32015e7618 100644
--- a/src/Locale/en/Medicine.json
+++ b/src/Locale/en/Medicine.json
@@ -33,7 +33,9 @@
   "last_administered": "Last administered",
   "modification_caution_note": "No modifications possible once added",
   "discontinue_caution_note": "Are you sure you want to discontinue this prescription?",
+  "edit_caution_note": "A new prescription will be added to the consultation with the edited details and the current prescription will be discontinued.",
   "reason_for_discontinuation": "Reason for discontinuation",
+  "reason_for_edit": "Reason for edit",
   "PRESCRIPTION_ROUTE_ORAL": "Oral",
   "PRESCRIPTION_ROUTE_IV": "IV",
   "PRESCRIPTION_ROUTE_IM": "IM",
@@ -47,4 +49,4 @@
   "PRESCRIPTION_FREQUENCY_Q4H": "4th hourly",
   "PRESCRIPTION_FREQUENCY_QOD": "Alternate day",
   "PRESCRIPTION_FREQUENCY_QWK": "Once a week"
-}
+}
\ No newline at end of file
diff --git a/src/Locale/en/Notifications.json b/src/Locale/en/Notifications.json
index a4770af5618..8c6255ca850 100644
--- a/src/Locale/en/Notifications.json
+++ b/src/Locale/en/Notifications.json
@@ -3,6 +3,8 @@
   "mark_as_read": "Mark as Read",
   "subscribe": "Subscribe",
   "subscribe_on_this_device": "Subscribe on this device",
+  "show_unread_notifications": "Show Unread",
+  "show_all_notifications": "Show All",
   "filter_by_category": "Filter by category",
   "mark_all_as_read": "Mark all as Read",
   "reload": "Reload",
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index 6e0d91fc59d..26e006f4cea 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -501,7 +501,7 @@ export const sampleReport = (id: string, sampleId: string) => {
 export const getTestList = (params: object) => {
   return fireRequest("getTestSampleList", [], params);
 };
-export const getTestSample = (id: number) => {
+export const getTestSample = (id: string) => {
   return fireRequest("getTestSample", [id], {});
 };
 export const patchSample = (params: object, pathParam: object) => {
@@ -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, any>) => {
       let altKey;
       if (query?.is_prn !== undefined) {
         altKey = query?.is_prn
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 1aa06c7e1bc..8a4ca5cf1df 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -1,6 +1,7 @@
 import { IConfig } from "../Common/hooks/useConfig";
 import { AssetData } from "../Components/Assets/AssetTypes";
 import { LocationModel } from "../Components/Facility/models";
+import { Prescription } from "../Components/Medicine/models";
 import { UserModel } from "../Components/Users/models";
 import { PaginatedResponse } from "../Utils/request/types";
 
@@ -17,6 +18,11 @@ interface JwtTokenObtainPair {
   refresh: string;
 }
 
+interface LoginInput {
+  username: string;
+  password: string;
+}
+
 const routes = {
   config: {
     path: import.meta.env.REACT_APP_CONFIG ?? "/config.json",
@@ -30,6 +36,8 @@ const routes = {
     path: "/api/v1/auth/login/",
     method: "POST",
     noAuth: true,
+    TRes: Type<JwtTokenObtainPair>(),
+    TBody: Type<LoginInput>(),
   },
 
   token_refresh: {
@@ -47,16 +55,25 @@ const routes = {
   checkResetToken: {
     path: "/api/v1/password_reset/check/",
     method: "POST",
+    noAuth: true,
+    TRes: Type<Record<string, never>>(),
+    TBody: Type<{ token: string }>(),
   },
 
   resetPassword: {
     path: "/api/v1/password_reset/confirm/",
     method: "POST",
+    noAuth: true,
+    TRes: Type<Record<string, never>>(),
+    TBody: Type<{ password: string; confirm: string }>(),
   },
 
   forgotPassword: {
     path: "/api/v1/password_reset/",
     method: "POST",
+    noAuth: true,
+    TRes: Type<Record<string, never>>(),
+    TBody: Type<{ username: string }>(),
   },
 
   updatePassword: {
@@ -972,6 +989,8 @@ const routes = {
   createPrescription: {
     path: "/api/v1/consultation/{consultation_external_id}/prescriptions/",
     method: "POST",
+    TBody: Type<Prescription>(),
+    TRes: Type<Prescription>(),
   },
 
   listAdministrations: {
@@ -997,6 +1016,8 @@ const routes = {
   discontinuePrescription: {
     path: "/api/v1/consultation/{consultation_external_id}/prescriptions/{external_id}/discontinue/",
     method: "POST",
+    TBody: Type<{ discontinued_reason: string }>(),
+    TRes: Type<Record<string, never>>(),
   },
 
   // HCX Endpoints
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index f1449f13bc2..0f6108b00e3 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -1,64 +1,9 @@
 import { useRedirect, useRoutes, usePath, Redirect } from "raviger";
 import { useState, useEffect } from "react";
-import { ConsultationDetails } from "../Components/Facility/ConsultationDetails";
-import TreatmentSummary from "../Components/Facility/TreatmentSummary";
-import { ConsultationForm } from "../Components/Facility/ConsultationForm";
-import { FacilityCreate } from "../Components/Facility/FacilityCreate";
-import { FacilityHome } from "../Components/Facility/FacilityHome";
-import { HospitalList } from "../Components/Facility/HospitalList";
-import { TriageForm } from "../Components/Facility/TriageForm";
-import { DailyRounds } from "../Components/Patient/DailyRounds";
-import { PatientManager } from "../Components/Patient/ManagePatients";
-import PatientNotes from "../Components/Patient/PatientNotes";
-import { PatientHome } from "../Components/Patient/PatientHome";
-import { PatientRegister } from "../Components/Patient/PatientRegister";
-import { SampleDetails } from "../Components/Patient/SampleDetails";
-import SampleReport from "../Components/Patient/SamplePreview";
-import { SampleTest } from "../Components/Patient/SampleTest";
-import SampleViewAdmin from "../Components/Patient/SampleViewAdmin";
-import ManageUsers from "../Components/Users/ManageUsers";
-import { UserAdd } from "../Components/Users/UserAdd";
-import InventoryList from "../Components/Facility/InventoryList";
-import InventoryLog from "../Components/Facility/InventoryLog";
-import { AddInventoryForm } from "../Components/Facility/AddInventoryForm";
-import { SetInventoryForm } from "../Components/Facility/SetInventoryForm";
-import MinQuantityList from "../Components/Facility/MinQuantityList";
-import { ShiftCreate } from "../Components/Patient/ShiftCreate";
-import UserProfile from "../Components/Users/UserProfile";
-import ShiftBoardView from "../Components/Shifting/BoardView";
-import ShiftListView from "../Components/Shifting/ListView";
-import ShiftDetails from "../Components/Shifting/ShiftDetails";
-import { ShiftDetailsUpdate } from "../Components/Shifting/ShiftDetailsUpdate";
-import ResourceCreate from "../Components/Resource/ResourceCreate";
-import ResourceBoardView from "../Components/Resource/ResourceBoardView";
-import ResourceListView from "../Components/Resource/ListView";
-import ResourceDetails from "../Components/Resource/ResourceDetails";
-import { ResourceDetailsUpdate } from "../Components/Resource/ResourceDetailsUpdate";
-import ResultList from "../Components/ExternalResult/ResultList";
-import ResultItem from "../Components/ExternalResult/ResultItem";
-import ExternalResultUpload from "../Components/ExternalResult/ExternalResultUpload";
-import ResultUpdate from "../Components/ExternalResult/ResultUpdate";
-import { FileUpload } from "../Components/Patient/FileUpload";
-import Investigation from "../Components/Facility/Investigations";
-import ShowInvestigation from "../Components/Facility/Investigations/ShowInvestigation";
-import InvestigationReports from "../Components/Facility/Investigations/Reports";
-import AssetCreate from "../Components/Facility/AssetCreate";
-import DeathReport from "../Components/DeathReport/DeathReport";
-import { make as CriticalCareRecording } from "../Components/CriticalCareRecording/CriticalCareRecording.bs";
+
 import ShowPushNotification from "../Components/Notifications/ShowPushNotification";
 import { NoticeBoard } from "../Components/Notifications/NoticeBoard";
-import { AddLocationForm } from "../Components/Facility/AddLocationForm";
-import { AddBedForm } from "../Components/Facility/AddBedForm";
-import LocationManagement from "../Components/Facility/LocationManagement";
-import { BedManagement } from "../Components/Facility/BedManagement";
-import AssetsList from "../Components/Assets/AssetsList";
-import AssetManage from "../Components/Assets/AssetManage";
-import AssetConfigure from "../Components/Assets/AssetConfigure";
-import { DailyRoundListDetails } from "../Components/Patient/DailyRoundListDetails";
 import Error404 from "../Components/ErrorPages/404";
-import { DndProvider } from "react-dnd";
-import { HTML5Backend } from "react-dnd-html5-backend";
-import FacilityUsers from "../Components/Facility/FacilityUsers";
 import {
   DesktopSidebar,
   MobileSidebar,
@@ -66,349 +11,55 @@ import {
   SidebarShrinkContext,
 } from "../Components/Common/Sidebar/Sidebar";
 import { BLACKLISTED_PATHS, LocalStorageKeys } from "../Common/constants";
-import { UpdateFacilityMiddleware } from "../Components/Facility/UpdateFacilityMiddleware";
 import useConfig from "../Common/hooks/useConfig";
-import ConsultationClaims from "../Components/Facility/ConsultationClaims";
 import { handleSignOut } from "../Utils/utils";
 import SessionExpired from "../Components/ErrorPages/SessionExpired";
-import ManagePrescriptions from "../Components/Medicine/ManagePrescriptions";
-import CentralNursingStation from "../Components/Facility/CentralNursingStation";
 
-export default function AppRouter() {
-  const { main_logo, enable_hcx } = useConfig();
+import UserRoutes from "./routes/UserRoutes";
+import PatientRoutes from "./routes/PatientRoutes";
+import SampleRoutes from "./routes/SampleRoutes";
+import FacilityRoutes from "./routes/FacilityRoutes";
+import ConsultationRoutes from "./routes/ConsultationRoutes";
+import HCXRoutes from "./routes/HCXRoutes";
+import ShiftingRoutes from "./routes/ShiftingRoutes";
+import AssetRoutes from "./routes/AssetRoutes";
+import ResourceRoutes from "./routes/ResourceRoutes";
+import ExternalResultRoutes from "./routes/ExternalResultRoutes";
+import { DetailRoute } from "./types";
+
+const Routes = {
+  "/": () => <Redirect to="/facility" />,
 
-  const routes = {
-    "/": () => <HospitalList />,
-    "/users": () => <ManageUsers />,
-    "/users/add": () => <UserAdd />,
-    "/user/profile": () => <UserProfile />,
-    "/patients": () => <PatientManager />,
-    "/patient/:id": ({ id }: any) => <PatientHome id={id} />,
-    "/patient/:id/investigation_reports": ({ id }: any) => (
-      <InvestigationReports id={id} />
-    ),
-    "/sample": () => <SampleViewAdmin />,
-    "/sample/:id": ({ id }: any) => <SampleDetails id={id} />,
-    "/patient/:patientId/test_sample/:sampleId/icmr_sample": ({
-      patientId,
-      sampleId,
-    }: any) => <SampleReport id={patientId} sampleId={sampleId} />,
-    "/facility": () => <HospitalList />,
-    "/facility/create": () => <FacilityCreate />,
-    "/facility/:facilityId/update": ({ facilityId }: any) => (
-      <FacilityCreate facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/middleware/update": ({ facilityId }: any) => (
-      <UpdateFacilityMiddleware facilityId={facilityId} />
-    ),
-    "/facility/:facilityId": ({ facilityId }: any) => (
-      <FacilityHome facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/users": ({ facilityId }: any) => (
-      <FacilityUsers facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/resource/new": ({ facilityId }: any) => (
-      <ResourceCreate facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/triage": ({ facilityId }: any) => (
-      <TriageForm facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/patient": ({ facilityId }: any) => (
-      <PatientRegister facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/patient/:id": ({ facilityId, id }: any) => (
-      <PatientHome facilityId={facilityId} id={id} />
-    ),
-    "/facility/:facilityId/patient/:id/update": ({ facilityId, id }: any) => (
-      <PatientRegister facilityId={facilityId} id={id} />
-    ),
-    "/facility/:facilityId/patient/:patientId/sample-test": ({
-      facilityId,
-      patientId,
-    }: any) => <SampleTest facilityId={facilityId} patientId={patientId} />,
-    "/facility/:facilityId/patient/:patientId/sample/:id": ({ id }: any) => (
-      <SampleDetails id={id} />
-    ),
-    "/facility/:facilityId/patient/:patientId/notes": ({
-      facilityId,
-      patientId,
-    }: any) => <PatientNotes patientId={patientId} facilityId={facilityId} />,
-    "/facility/:facilityId/patient/:patientId/files": ({
-      facilityId,
-      patientId,
-    }: any) => (
-      <FileUpload
-        patientId={patientId}
-        facilityId={facilityId}
-        consultationId=""
-        type="PATIENT"
-        hideBack={false}
-        audio={true}
-        unspecified={true}
-      />
-    ),
-    "/facility/:facilityId/triage/:id": ({ facilityId, id }: any) => (
-      <TriageForm facilityId={facilityId} id={id} />
-    ),
-    "/facility/:facilityId/patient/:patientId/consultation": ({
-      facilityId,
-      patientId,
-    }: any) => (
-      <ConsultationForm facilityId={facilityId} patientId={patientId} />
-    ),
-    "/facility/:facilityId/patient/:patientId/consultation/:id/update": ({
-      facilityId,
-      patientId,
-      id,
-    }: any) => (
-      <ConsultationForm facilityId={facilityId} patientId={patientId} id={id} />
-    ),
-    "/facility/:facilityId/patient/:patientId/consultation/:id/files/": ({
-      facilityId,
-      patientId,
-      id,
-    }: any) => (
-      <FileUpload
-        facilityId={facilityId}
-        patientId={patientId}
-        consultationId={id}
-        type="CONSULTATION"
-        hideBack={false}
-        audio={true}
-        unspecified={true}
-      />
-    ),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/prescriptions":
-      (path: any) => <ManagePrescriptions {...path} />,
-    "/facility/:facilityId/patient/:patientId/consultation/:id/investigation":
-      ({ facilityId, patientId, id }: any) => (
-        <Investigation
-          consultationId={id}
-          facilityId={facilityId}
-          patientId={patientId}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/consultation/:id/investigation/:sessionId":
-      ({ facilityId, patientId, id, sessionId }: any) => (
-        <ShowInvestigation
-          consultationId={id}
-          facilityId={facilityId}
-          patientId={patientId}
-          sessionId={sessionId}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/consultation/:id/daily-rounds": ({
-      facilityId,
-      patientId,
-      id,
-    }: any) => (
-      <DailyRounds
-        facilityId={facilityId}
-        patientId={patientId}
-        consultationId={id}
-      />
-    ),
-    ...(enable_hcx
-      ? {
-          "/facility/:facilityId/patient/:patientId/consultation/:consultationId/claims":
-            (pathParams: any) => <ConsultationClaims {...pathParams} />,
-        }
-      : {}),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily-rounds/:id/update":
-      ({ facilityId, patientId, consultationId, id }: any) => (
-        <DailyRounds
-          facilityId={facilityId}
-          patientId={patientId}
-          consultationId={consultationId}
-          id={id}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily-rounds/:id":
-      ({ facilityId, patientId, consultationId, id }: any) => (
-        <DailyRoundListDetails
-          facilityId={facilityId}
-          patientId={patientId}
-          consultationId={consultationId}
-          id={id}
-        />
-      ),
+  ...AssetRoutes,
+  ...ConsultationRoutes,
+  ...ExternalResultRoutes,
+  ...FacilityRoutes,
+  ...PatientRoutes,
+  ...ResourceRoutes,
+  ...SampleRoutes,
+  ...ShiftingRoutes,
+  ...UserRoutes,
 
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id":
-      ({ facilityId, patientId, consultationId, id }: any) => (
-        <CriticalCareRecording
-          facilityId={facilityId}
-          patientId={patientId}
-          consultationId={consultationId}
-          id={id}
-          preview={true}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id/update":
-      ({ facilityId, patientId, consultationId, id }: any) => (
-        <CriticalCareRecording
-          facilityId={facilityId}
-          patientId={patientId}
-          consultationId={consultationId}
-          id={id}
-          preview={false}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/shift/new": ({
-      facilityId,
-      patientId,
-    }: any) => <ShiftCreate facilityId={facilityId} patientId={patientId} />,
-    "/facility/:facilityId/inventory": ({ facilityId }: any) => (
-      <InventoryList facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/location": ({ facilityId }: any) => (
-      <LocationManagement facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/location/:locationId/beds": ({
-      facilityId,
-      locationId,
-    }: any) => (
-      <BedManagement facilityId={facilityId} locationId={locationId} />
-    ),
-    "/facility/:facilityId/inventory/add": ({ facilityId }: any) => (
-      <AddInventoryForm facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/location/add": ({ facilityId }: any) => (
-      <AddLocationForm facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/location/:locationId/update": ({
-      facilityId,
-      locationId,
-    }: any) => (
-      <AddLocationForm facilityId={facilityId} locationId={locationId} />
-    ),
-    "/facility/:facilityId/location/:locationId/beds/add": ({
-      facilityId,
-      locationId,
-    }: any) => <AddBedForm facilityId={facilityId} locationId={locationId} />,
-    "/facility/:facilityId/location/:locationId/beds/:bedId/update": ({
-      facilityId,
-      locationId,
-      bedId,
-    }: any) => (
-      <AddBedForm
-        facilityId={facilityId}
-        locationId={locationId}
-        bedId={bedId}
-      />
-    ),
-    "/facility/:facilityId/inventory/min_quantity/set": ({
-      facilityId,
-    }: any) => <SetInventoryForm facilityId={facilityId} />,
-    "/facility/:facilityId/inventory/min_quantity/list": ({
-      facilityId,
-    }: any) => <MinQuantityList facilityId={facilityId} />,
-    "/facility/:facilityId/inventory/min_quantity": ({ facilityId }: any) => (
-      <Redirect to={`/facility/${facilityId}/inventory/min_quantity/list`} />
-    ),
-    "/facility/:facilityId/inventory/:inventoryId": ({
-      facilityId,
-      inventoryId,
-    }: any) => (
-      <InventoryLog facilityId={facilityId} inventoryId={inventoryId} />
-    ),
-    "/facility/:facilityId/assets/new": ({ facilityId }: any) => (
-      <AssetCreate facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/assets/:assetId/update": ({
-      facilityId,
-      assetId,
-    }: any) => <AssetCreate facilityId={facilityId} assetId={assetId} />,
-    "/assets": () => <AssetsList />,
-    "/facility/:facilityId/assets/:assetId": ({ assetId, facilityId }: any) => (
-      <AssetManage assetId={assetId} facilityId={facilityId} />
-    ),
-    "/facility/:facilityId/assets/:assetId/configure": ({
-      assetId,
-      facilityId,
-    }: any) => <AssetConfigure assetId={assetId} facilityId={facilityId} />,
-    "/facility/:facilityId/cns": ({ facilityId }: any) => (
-      <CentralNursingStation facilityId={facilityId} />
-    ),
+  "/notifications/:id": ({ id }: DetailRoute) => (
+    <ShowPushNotification id={id} />
+  ),
+  "/notice_board": () => <NoticeBoard />,
+
+  "/session-expired": () => <SessionExpired />,
+  "/not-found": () => <Error404 />,
+};
+
+export default function AppRouter() {
+  const { main_logo, enable_hcx } = useConfig();
 
-    "/shifting": () =>
-      localStorage.getItem("defaultShiftView") === "list" ? (
-        <ShiftListView />
-      ) : (
-        <DndProvider backend={HTML5Backend}>
-          <ShiftBoardView />
-        </DndProvider>
-      ),
-    "/shifting/board-view": () => (
-      <DndProvider backend={HTML5Backend}>
-        <ShiftBoardView />
-      </DndProvider>
-    ),
-    "/shifting/list-view": () => <ShiftListView />,
-    "/shifting/:id": ({ id }: any) => <ShiftDetails id={id} />,
-    "/shifting/:id/update": ({ id }: any) => <ShiftDetailsUpdate id={id} />,
-    "/resource": () =>
-      localStorage.getItem("defaultResourceView") === "list" ? (
-        <ResourceListView />
-      ) : (
-        <DndProvider backend={HTML5Backend}>
-          <ResourceBoardView />
-        </DndProvider>
-      ),
+  let routes = Routes;
 
-    "/resource/board-view": () => (
-      <DndProvider backend={HTML5Backend}>
-        <ResourceBoardView />
-      </DndProvider>
-    ),
-    "/resource/list-view": () => <ResourceListView />,
-    "/resource/:id": ({ id }: any) => <ResourceDetails id={id} />,
-    "/resource/:id/update": ({ id }: any) => <ResourceDetailsUpdate id={id} />,
-    "/external_results": () => <ResultList />,
-    "/external_results/upload": () => <ExternalResultUpload />,
-    "/external_results/:id": ({ id }: any) => <ResultItem id={id} />,
-    "/external_results/:id/update": ({ id }: any) => <ResultUpdate id={id} />,
-    "/death_report/:id": ({ id }: any) => <DeathReport id={id} />,
-    "/notifications/:id": (id: any) => (
-      <ShowPushNotification external_id={id} />
-    ),
-    "/notice_board": () => <NoticeBoard />,
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId": ({
-      facilityId,
-      patientId,
-      consultationId,
-    }: any) => (
-      <ConsultationDetails
-        facilityId={facilityId}
-        patientId={patientId}
-        consultationId={consultationId}
-        tab={"updates"}
-      />
-    ),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/treatment-summary":
-      ({ facilityId, patientId, consultationId }: any) => (
-        <TreatmentSummary
-          facilityId={facilityId}
-          consultationId={consultationId}
-          patientId={patientId}
-          dailyRoundsListData={[]}
-        />
-      ),
-    "/facility/:facilityId/patient/:patientId/consultation/:consultationId/:tab":
-      ({ facilityId, patientId, consultationId, tab }: any) => (
-        <ConsultationDetails
-          facilityId={facilityId}
-          patientId={patientId}
-          consultationId={consultationId}
-          tab={tab}
-        />
-      ),
-    "/session-expired": () => <SessionExpired />,
-    "/not-found": () => <Error404 />,
-  };
+  if (enable_hcx) {
+    routes = { ...routes, ...HCXRoutes };
+  }
 
-  useRedirect("/", "/facility");
   useRedirect("/user", "/users");
-  const pages = useRoutes(routes as any) || <Error404 />;
+  const pages = useRoutes(routes) || <Error404 />;
   const path = usePath();
   const [sidebarOpen, setSidebarOpen] = useState(false);
 
diff --git a/src/Routers/routes/AssetRoutes.tsx b/src/Routers/routes/AssetRoutes.tsx
new file mode 100644
index 00000000000..d3bd96ca437
--- /dev/null
+++ b/src/Routers/routes/AssetRoutes.tsx
@@ -0,0 +1,21 @@
+import AssetConfigure from "../../Components/Assets/AssetConfigure";
+import AssetManage from "../../Components/Assets/AssetManage";
+import AssetsList from "../../Components/Assets/AssetsList";
+import AssetCreate from "../../Components/Facility/AssetCreate";
+
+export default {
+  "/assets": () => <AssetsList />,
+
+  "/facility/:facilityId/assets/new": (params: any) => (
+    <AssetCreate {...params} />
+  ),
+  "/facility/:facilityId/assets/:assetId/update": (params: any) => (
+    <AssetCreate {...params} />
+  ),
+  "/facility/:facilityId/assets/:assetId": (params: any) => (
+    <AssetManage {...params} />
+  ),
+  "/facility/:facilityId/assets/:assetId/configure": (params: any) => (
+    <AssetConfigure {...params} />
+  ),
+};
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
new file mode 100644
index 00000000000..4f1d6e7d75d
--- /dev/null
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -0,0 +1,141 @@
+import { ConsultationForm } from "../../Components/Facility/ConsultationForm";
+import Investigation from "../../Components/Facility/Investigations";
+import ShowInvestigation from "../../Components/Facility/Investigations/ShowInvestigation";
+import ManagePrescriptions from "../../Components/Medicine/ManagePrescriptions";
+import { DailyRoundListDetails } from "../../Components/Patient/DailyRoundListDetails";
+import { DailyRounds } from "../../Components/Patient/DailyRounds";
+import { FileUpload } from "../../Components/Patient/FileUpload";
+import { make as CriticalCareRecording } from "../../Components/CriticalCareRecording/CriticalCareRecording.bs";
+import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
+import TreatmentSummary from "../../Components/Facility/TreatmentSummary";
+
+export default {
+  "/facility/:facilityId/patient/:patientId/consultation": ({
+    facilityId,
+    patientId,
+  }: any) => <ConsultationForm facilityId={facilityId} patientId={patientId} />,
+  "/facility/:facilityId/patient/:patientId/consultation/:id/update": ({
+    facilityId,
+    patientId,
+    id,
+  }: any) => (
+    <ConsultationForm facilityId={facilityId} patientId={patientId} id={id} />
+  ),
+  "/facility/:facilityId/patient/:patientId/consultation/:id/files/": ({
+    facilityId,
+    patientId,
+    id,
+  }: any) => (
+    <FileUpload
+      facilityId={facilityId}
+      patientId={patientId}
+      consultationId={id}
+      type="CONSULTATION"
+      hideBack={false}
+      audio={true}
+      unspecified={true}
+    />
+  ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/prescriptions":
+    (path: any) => <ManagePrescriptions {...path} />,
+  "/facility/:facilityId/patient/:patientId/consultation/:id/investigation": ({
+    facilityId,
+    patientId,
+    id,
+  }: any) => (
+    <Investigation
+      consultationId={id}
+      facilityId={facilityId}
+      patientId={patientId}
+    />
+  ),
+  "/facility/:facilityId/patient/:patientId/consultation/:id/investigation/:sessionId":
+    ({ facilityId, patientId, id, sessionId }: any) => (
+      <ShowInvestigation
+        consultationId={id}
+        facilityId={facilityId}
+        patientId={patientId}
+        sessionId={sessionId}
+      />
+    ),
+  "/facility/:facilityId/patient/:patientId/consultation/:id/daily-rounds": ({
+    facilityId,
+    patientId,
+    id,
+  }: any) => (
+    <DailyRounds
+      facilityId={facilityId}
+      patientId={patientId}
+      consultationId={id}
+    />
+  ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily-rounds/:id/update":
+    ({ facilityId, patientId, consultationId, id }: any) => (
+      <DailyRounds
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={consultationId}
+        id={id}
+      />
+    ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily-rounds/:id":
+    ({ facilityId, patientId, consultationId, id }: any) => (
+      <DailyRoundListDetails
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={consultationId}
+        id={id}
+      />
+    ),
+
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id":
+    ({ facilityId, patientId, consultationId, id }: any) => (
+      <CriticalCareRecording
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={consultationId}
+        id={id}
+        preview={true}
+      />
+    ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/daily_rounds/:id/update":
+    ({ facilityId, patientId, consultationId, id }: any) => (
+      <CriticalCareRecording
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={consultationId}
+        id={id}
+        preview={false}
+      />
+    ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId": ({
+    facilityId,
+    patientId,
+    consultationId,
+  }: any) => (
+    <ConsultationDetails
+      facilityId={facilityId}
+      patientId={patientId}
+      consultationId={consultationId}
+      tab={"updates"}
+    />
+  ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/treatment-summary":
+    ({ facilityId, patientId, consultationId }: any) => (
+      <TreatmentSummary
+        facilityId={facilityId}
+        consultationId={consultationId}
+        patientId={patientId}
+        dailyRoundsListData={[]}
+      />
+    ),
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/:tab":
+    ({ facilityId, patientId, consultationId, tab }: any) => (
+      <ConsultationDetails
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={consultationId}
+        tab={tab}
+      />
+    ),
+};
diff --git a/src/Routers/routes/ExternalResultRoutes.tsx b/src/Routers/routes/ExternalResultRoutes.tsx
new file mode 100644
index 00000000000..af4bf090d78
--- /dev/null
+++ b/src/Routers/routes/ExternalResultRoutes.tsx
@@ -0,0 +1,14 @@
+import ExternalResultUpload from "../../Components/ExternalResult/ExternalResultUpload";
+import ResultItem from "../../Components/ExternalResult/ResultItem";
+import ResultList from "../../Components/ExternalResult/ResultList";
+import ResultUpdate from "../../Components/ExternalResult/ResultUpdate";
+import { DetailRoute } from "../types";
+
+export default {
+  "/external_results": () => <ResultList />,
+  "/external_results/upload": () => <ExternalResultUpload />,
+  "/external_results/:id": ({ id }: DetailRoute) => <ResultItem id={id} />,
+  "/external_results/:id/update": ({ id }: DetailRoute) => (
+    <ResultUpdate id={id} />
+  ),
+};
diff --git a/src/Routers/routes/FacilityInventoryRoutes.tsx b/src/Routers/routes/FacilityInventoryRoutes.tsx
new file mode 100644
index 00000000000..17e93b2bc60
--- /dev/null
+++ b/src/Routers/routes/FacilityInventoryRoutes.tsx
@@ -0,0 +1,24 @@
+import { Redirect } from "raviger";
+import InventoryList from "../../Components/Facility/InventoryList";
+import InventoryLog from "../../Components/Facility/InventoryLog";
+import MinQuantityList from "../../Components/Facility/MinQuantityList";
+import { SetInventoryForm } from "../../Components/Facility/SetInventoryForm";
+
+export default {
+  "/facility/:facilityId/inventory": ({ facilityId }: any) => (
+    <InventoryList facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/inventory/min_quantity/set": ({ facilityId }: any) => (
+    <SetInventoryForm facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/inventory/min_quantity/list": ({
+    facilityId,
+  }: any) => <MinQuantityList facilityId={facilityId} />,
+  "/facility/:facilityId/inventory/min_quantity": ({ facilityId }: any) => (
+    <Redirect to={`/facility/${facilityId}/inventory/min_quantity/list`} />
+  ),
+  "/facility/:facilityId/inventory/:inventoryId": ({
+    facilityId,
+    inventoryId,
+  }: any) => <InventoryLog facilityId={facilityId} inventoryId={inventoryId} />,
+};
diff --git a/src/Routers/routes/FacilityLocationRoutes.tsx b/src/Routers/routes/FacilityLocationRoutes.tsx
new file mode 100644
index 00000000000..c43673b60f5
--- /dev/null
+++ b/src/Routers/routes/FacilityLocationRoutes.tsx
@@ -0,0 +1,38 @@
+import { AddBedForm } from "../../Components/Facility/AddBedForm";
+import { AddInventoryForm } from "../../Components/Facility/AddInventoryForm";
+import { AddLocationForm } from "../../Components/Facility/AddLocationForm";
+import { BedManagement } from "../../Components/Facility/BedManagement";
+import LocationManagement from "../../Components/Facility/LocationManagement";
+
+export default {
+  "/facility/:facilityId/location": ({ facilityId }: any) => (
+    <LocationManagement facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/location/:locationId/beds": ({
+    facilityId,
+    locationId,
+  }: any) => <BedManagement facilityId={facilityId} locationId={locationId} />,
+  "/facility/:facilityId/inventory/add": ({ facilityId }: any) => (
+    <AddInventoryForm facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/location/add": ({ facilityId }: any) => (
+    <AddLocationForm facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/location/:locationId/update": ({
+    facilityId,
+    locationId,
+  }: any) => (
+    <AddLocationForm facilityId={facilityId} locationId={locationId} />
+  ),
+  "/facility/:facilityId/location/:locationId/beds/add": ({
+    facilityId,
+    locationId,
+  }: any) => <AddBedForm facilityId={facilityId} locationId={locationId} />,
+  "/facility/:facilityId/location/:locationId/beds/:bedId/update": ({
+    facilityId,
+    locationId,
+    bedId,
+  }: any) => (
+    <AddBedForm facilityId={facilityId} locationId={locationId} bedId={bedId} />
+  ),
+};
diff --git a/src/Routers/routes/FacilityRoutes.tsx b/src/Routers/routes/FacilityRoutes.tsx
new file mode 100644
index 00000000000..77247df9189
--- /dev/null
+++ b/src/Routers/routes/FacilityRoutes.tsx
@@ -0,0 +1,45 @@
+import { FacilityConfigure } from "../../Components/Facility/FacilityConfigure";
+import { FacilityCreate } from "../../Components/Facility/FacilityCreate";
+import { FacilityHome } from "../../Components/Facility/FacilityHome";
+import FacilityUsers from "../../Components/Facility/FacilityUsers";
+import { HospitalList } from "../../Components/Facility/HospitalList";
+import { TriageForm } from "../../Components/Facility/TriageForm";
+import ResourceCreate from "../../Components/Resource/ResourceCreate";
+import CentralNursingStation from "../../Components/Facility/CentralNursingStation";
+import FacilityLocationRoutes from "./FacilityLocationRoutes";
+import FacilityInventoryRoutes from "./FacilityInventoryRoutes";
+
+export default {
+  "/facility": () => <HospitalList />,
+  "/facility/create": () => <FacilityCreate />,
+  "/facility/:facilityId/update": ({ facilityId }: any) => (
+    <FacilityCreate facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/configure": ({ facilityId }: any) => (
+    <FacilityConfigure facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/cns": ({ facilityId }: any) => (
+    <CentralNursingStation facilityId={facilityId} />
+  ),
+  "/facility/:facilityId": ({ facilityId }: any) => (
+    <FacilityHome facilityId={facilityId} />
+  ),
+
+  "/facility/:facilityId/users": ({ facilityId }: any) => (
+    <FacilityUsers facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/resource/new": ({ facilityId }: any) => (
+    <ResourceCreate facilityId={facilityId} />
+  ),
+
+  // Triage related routes
+  "/facility/:facilityId/triage": ({ facilityId }: any) => (
+    <TriageForm facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/triage/:id": ({ facilityId, id }: any) => (
+    <TriageForm facilityId={facilityId} id={id} />
+  ),
+
+  ...FacilityLocationRoutes,
+  ...FacilityInventoryRoutes,
+};
diff --git a/src/Routers/routes/HCXRoutes.tsx b/src/Routers/routes/HCXRoutes.tsx
new file mode 100644
index 00000000000..8a36e033c15
--- /dev/null
+++ b/src/Routers/routes/HCXRoutes.tsx
@@ -0,0 +1,6 @@
+import ConsultationClaims from "../../Components/Facility/ConsultationClaims";
+
+export default {
+  "/facility/:facilityId/patient/:patientId/consultation/:consultationId/claims":
+    (pathParams: any) => <ConsultationClaims {...pathParams} />,
+};
diff --git a/src/Routers/routes/PatientRoutes.tsx b/src/Routers/routes/PatientRoutes.tsx
new file mode 100644
index 00000000000..ae594d767ec
--- /dev/null
+++ b/src/Routers/routes/PatientRoutes.tsx
@@ -0,0 +1,46 @@
+import InvestigationReports from "../../Components/Facility/Investigations/Reports";
+import { FileUpload } from "../../Components/Patient/FileUpload";
+import { PatientManager } from "../../Components/Patient/ManagePatients";
+import { PatientHome } from "../../Components/Patient/PatientHome";
+import PatientNotes from "../../Components/Patient/PatientNotes";
+import { PatientRegister } from "../../Components/Patient/PatientRegister";
+import { DetailRoute } from "../types";
+import DeathReport from "../../Components/DeathReport/DeathReport";
+
+export default {
+  "/patients": () => <PatientManager />,
+  "/patient/:id": ({ id }: DetailRoute) => <PatientHome id={id} />,
+  "/patient/:id/investigation_reports": ({ id }: DetailRoute) => (
+    <InvestigationReports id={id} />
+  ),
+
+  // Facility Scoped Routes
+  "/facility/:facilityId/patient": ({ facilityId }: any) => (
+    <PatientRegister facilityId={facilityId} />
+  ),
+  "/facility/:facilityId/patient/:id": ({ facilityId, id }: any) => (
+    <PatientHome facilityId={facilityId} id={id} />
+  ),
+  "/facility/:facilityId/patient/:id/update": ({ facilityId, id }: any) => (
+    <PatientRegister facilityId={facilityId} id={id} />
+  ),
+  "/facility/:facilityId/patient/:patientId/notes": ({
+    facilityId,
+    patientId,
+  }: any) => <PatientNotes patientId={patientId} facilityId={facilityId} />,
+  "/facility/:facilityId/patient/:patientId/files": ({
+    facilityId,
+    patientId,
+  }: any) => (
+    <FileUpload
+      patientId={patientId}
+      facilityId={facilityId}
+      consultationId=""
+      type="PATIENT"
+      hideBack={false}
+      audio={true}
+      unspecified={true}
+    />
+  ),
+  "/death_report/:id": ({ id }: any) => <DeathReport id={id} />,
+};
diff --git a/src/Routers/routes/ResourceRoutes.tsx b/src/Routers/routes/ResourceRoutes.tsx
new file mode 100644
index 00000000000..8408ab4d79d
--- /dev/null
+++ b/src/Routers/routes/ResourceRoutes.tsx
@@ -0,0 +1,25 @@
+import { DndProvider } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
+import ResourceDetails from "../../Components/Resource/ResourceDetails";
+import { ResourceDetailsUpdate } from "../../Components/Resource/ResourceDetailsUpdate";
+import ListView from "../../Components/Resource/ListView";
+import BoardView from "../../Components/Resource/ResourceBoardView";
+import { Redirect } from "raviger";
+import { DetailRoute } from "../types";
+
+const getDefaultView = () =>
+  localStorage.getItem("defaultResourceView") === "list" ? "list" : "board";
+
+export default {
+  "/resource": () => <Redirect to={`/resource/${getDefaultView()}`} />,
+  "/resource/board": () => (
+    <DndProvider backend={HTML5Backend}>
+      <BoardView />
+    </DndProvider>
+  ),
+  "/resource/list": () => <ListView />,
+  "/resource/:id": ({ id }: DetailRoute) => <ResourceDetails id={id} />,
+  "/resource/:id/update": ({ id }: DetailRoute) => (
+    <ResourceDetailsUpdate id={id} />
+  ),
+};
diff --git a/src/Routers/routes/SampleRoutes.tsx b/src/Routers/routes/SampleRoutes.tsx
new file mode 100644
index 00000000000..290a34fd4eb
--- /dev/null
+++ b/src/Routers/routes/SampleRoutes.tsx
@@ -0,0 +1,25 @@
+import { SampleDetails } from "../../Components/Patient/SampleDetails";
+import SampleReport from "../../Components/Patient/SamplePreview";
+import { SampleTest } from "../../Components/Patient/SampleTest";
+import SampleViewAdmin from "../../Components/Patient/SampleViewAdmin";
+import { DetailRoute, RouteParams } from "../types";
+
+export default {
+  "/sample": () => <SampleViewAdmin />,
+  "/sample/:id": ({ id }: DetailRoute) => <SampleDetails id={id} />,
+  "/patient/:patientId/test_sample/:sampleId/icmr_sample": ({
+    patientId,
+    sampleId,
+  }: RouteParams<"patientId" | "sampleId">) => (
+    <SampleReport id={patientId} sampleId={sampleId} />
+  ),
+  "/facility/:facilityId/patient/:patientId/sample-test": ({
+    facilityId,
+    patientId,
+  }: RouteParams<"facilityId" | "patientId">) => (
+    <SampleTest facilityId={facilityId} patientId={patientId} />
+  ),
+  "/facility/:facilityId/patient/:patientId/sample/:id": ({
+    id,
+  }: DetailRoute) => <SampleDetails id={id} />,
+};
diff --git a/src/Routers/routes/ShiftingRoutes.tsx b/src/Routers/routes/ShiftingRoutes.tsx
new file mode 100644
index 00000000000..9b20b4a1a0b
--- /dev/null
+++ b/src/Routers/routes/ShiftingRoutes.tsx
@@ -0,0 +1,27 @@
+import { DndProvider } from "react-dnd";
+import { HTML5Backend } from "react-dnd-html5-backend";
+import { ShiftCreate } from "../../Components/Patient/ShiftCreate";
+import ShiftDetails from "../../Components/Shifting/ShiftDetails";
+import { ShiftDetailsUpdate } from "../../Components/Shifting/ShiftDetailsUpdate";
+import ListView from "../../Components/Shifting/ListView";
+import BoardView from "../../Components/Shifting/BoardView";
+import { Redirect } from "raviger";
+
+const getDefaultView = () =>
+  localStorage.getItem("defaultShiftView") === "list" ? "list" : "board";
+
+export default {
+  "/shifting": () => <Redirect to={`/shifting/${getDefaultView()}`} />,
+  "/shifting/board": () => (
+    <DndProvider backend={HTML5Backend}>
+      <BoardView />
+    </DndProvider>
+  ),
+  "/shifting/list": () => <ListView />,
+  "/shifting/:id": ({ id }: any) => <ShiftDetails id={id} />,
+  "/shifting/:id/update": ({ id }: any) => <ShiftDetailsUpdate id={id} />,
+  "/facility/:facilityId/patient/:patientId/shift/new": ({
+    facilityId,
+    patientId,
+  }: any) => <ShiftCreate facilityId={facilityId} patientId={patientId} />,
+};
diff --git a/src/Routers/routes/UserRoutes.tsx b/src/Routers/routes/UserRoutes.tsx
new file mode 100644
index 00000000000..56877ca4c78
--- /dev/null
+++ b/src/Routers/routes/UserRoutes.tsx
@@ -0,0 +1,9 @@
+import ManageUsers from "../../Components/Users/ManageUsers";
+import { UserAdd } from "../../Components/Users/UserAdd";
+import UserProfile from "../../Components/Users/UserProfile";
+
+export default {
+  "/users": () => <ManageUsers />,
+  "/users/add": () => <UserAdd />,
+  "/user/profile": () => <UserProfile />,
+};
diff --git a/src/Routers/types.ts b/src/Routers/types.ts
new file mode 100644
index 00000000000..dc7138b8df7
--- /dev/null
+++ b/src/Routers/types.ts
@@ -0,0 +1,5 @@
+export type RouteParams<T extends string> = Record<T, string>;
+
+export interface DetailRoute {
+  id: string;
+}