diff --git a/cypress/e2e/users_spec/user_homepage.cy.ts b/cypress/e2e/users_spec/user_homepage.cy.ts
index a006fe77569..3ac07dd9d9c 100644
--- a/cypress/e2e/users_spec/user_homepage.cy.ts
+++ b/cypress/e2e/users_spec/user_homepage.cy.ts
@@ -32,6 +32,7 @@ describe("User Homepage", () => {
     userPage.selectDistrict("Ernakulam");
     userPage.typeInPhoneNumber(phone_number);
     userPage.typeInAltPhoneNumber(alt_phone_number);
+    userPage.selectHomeFacility("Dummy Facility 40");
     userPage.applyFilter();
     userPage.verifyUrlafteradvancefilter();
     userPage.checkUsernameText(usernameToTest);
@@ -46,6 +47,10 @@ describe("User Homepage", () => {
       "WhatsApp no.: +919876543219",
     );
     userPage.verifyDataTestIdText("Role", "Role: Doctor");
+    userPage.verifyDataTestIdText(
+      "Home Facility",
+      "Home Facility: Dummy Facility 40",
+    );
     userPage.verifyDataTestIdText("District", "District: Ernakulam");
     userPage.clearFilters();
     userPage.verifyDataTestIdNotVisible("First Name");
@@ -53,6 +58,7 @@ describe("User Homepage", () => {
     userPage.verifyDataTestIdNotVisible("Phone Number");
     userPage.verifyDataTestIdNotVisible("WhatsApp no.");
     userPage.verifyDataTestIdNotVisible("Role");
+    userPage.verifyDataTestIdNotVisible("Home Facility");
     userPage.verifyDataTestIdNotVisible("District");
   });
 
diff --git a/cypress/pageobject/Users/UserSearch.ts b/cypress/pageobject/Users/UserSearch.ts
index 7d85563d62c..56d1a81395d 100644
--- a/cypress/pageobject/Users/UserSearch.ts
+++ b/cypress/pageobject/Users/UserSearch.ts
@@ -78,6 +78,10 @@ export class UserPage {
     cy.get("#alt_phone_number").click().type(altPhone);
   }
 
+  selectHomeFacility(facility: string) {
+    cy.searchAndSelectOption("input[name='home_facility']", facility);
+  }
+
   applyFilter() {
     cy.get("#apply-filter").click();
   }
diff --git a/src/CAREUI/misc/AuthorizedChild.tsx b/src/CAREUI/misc/AuthorizedChild.tsx
index ce9ec69d546..935f0c51f3c 100644
--- a/src/CAREUI/misc/AuthorizedChild.tsx
+++ b/src/CAREUI/misc/AuthorizedChild.tsx
@@ -1,4 +1,7 @@
+import { ReactNode } from "react";
+import useAuthUser from "../../Common/hooks/useAuthUser";
 import { useIsAuthorized } from "../../Common/hooks/useIsAuthorized";
+import useSlug from "../../Common/hooks/useSlug";
 import { AuthorizedForCB } from "../../Utils/AuthorizeFor";
 
 interface Props {
@@ -12,3 +15,20 @@ const AuthorizedChild = (props: Props) => {
 };
 
 export default AuthorizedChild;
+
+export const AuthorizedForConsultationRelatedActions = (props: {
+  children: ReactNode;
+}) => {
+  const me = useAuthUser();
+  const facilityId = useSlug("facility");
+
+  if (
+    me.home_facility_object?.id === facilityId ||
+    me.user_type === "DistrictAdmin" ||
+    me.user_type === "StateAdmin"
+  ) {
+    return props.children;
+  }
+
+  return null;
+};
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index de0ab305f48..4eb3b51d012 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -318,42 +318,6 @@ export const REVIEW_AT_CHOICES: Array<OptionsType> = [
   { id: 30 * 24 * 60, text: "1 month" },
 ];
 
-export const SYMPTOM_CHOICES = [
-  { id: 1, text: "ASYMPTOMATIC", isSingleSelect: true },
-  { id: 2, text: "FEVER" },
-  { id: 3, text: "SORE THROAT" },
-  { id: 4, text: "COUGH" },
-  { id: 5, text: "BREATHLESSNESS" },
-  { id: 6, text: "MYALGIA" },
-  { id: 7, text: "ABDOMINAL DISCOMFORT" },
-  { id: 8, text: "VOMITING" },
-  { id: 11, text: "SPUTUM" },
-  { id: 12, text: "NAUSEA" },
-  { id: 13, text: "CHEST PAIN" },
-  { id: 14, text: "HEMOPTYSIS" },
-  { id: 15, text: "NASAL DISCHARGE" },
-  { id: 16, text: "BODY ACHE" },
-  { id: 17, text: "DIARRHOEA" },
-  { id: 18, text: "PAIN" },
-  { id: 19, text: "PEDAL EDEMA" },
-  { id: 20, text: "WOUND" },
-  { id: 21, text: "CONSTIPATION" },
-  { id: 22, text: "HEAD ACHE" },
-  { id: 23, text: "BLEEDING" },
-  { id: 24, text: "DIZZINESS" },
-  { id: 25, text: "CHILLS" },
-  { id: 26, text: "GENERAL WEAKNESS" },
-  { id: 27, text: "IRRITABILITY" },
-  { id: 28, text: "CONFUSION" },
-  { id: 29, text: "ABDOMINAL PAIN" },
-  { id: 30, text: "JOINT PAIN" },
-  { id: 31, text: "REDNESS OF EYES" },
-  { id: 32, text: "ANOREXIA" },
-  { id: 33, text: "NEW LOSS OF TASTE" },
-  { id: 34, text: "NEW LOSS OF SMELL" },
-  { id: 9, text: "OTHERS" },
-];
-
 export const DISCHARGE_REASONS = [
   { id: 1, text: "Recovered" },
   { id: 2, text: "Referred" },
@@ -1308,7 +1272,7 @@ export const CONSENT_PATIENT_CODE_STATUS_CHOICES = [
   { id: 1, text: "Do Not Hospitalise (DNH)" },
   { id: 2, text: "Do Not Resuscitate (DNR)" },
   { id: 3, text: "Comfort Care Only" },
-  { id: 4, text: "Active treatment (Default)" },
+  { id: 4, text: "Active treatment" },
 ];
 export const OCCUPATION_TYPES = [
   {
@@ -1404,3 +1368,5 @@ export const PATIENT_NOTES_THREADS = {
   Doctors: 10,
   Nurses: 20,
 } as const;
+
+export const RATION_CARD_CATEGORY = ["BPL", "APL", "NO_CARD"] as const;
diff --git a/src/Common/hooks/useMSEplayer.ts b/src/Common/hooks/useMSEplayer.ts
index 482f991bc25..39e4d356910 100644
--- a/src/Common/hooks/useMSEplayer.ts
+++ b/src/Common/hooks/useMSEplayer.ts
@@ -149,7 +149,6 @@ export const useMSEMediaPlayer = ({
             const ws = wsRef.current;
             ws.binaryType = "arraybuffer";
             ws.onopen = function (_event) {
-              console.log("Connected to ws");
               onSuccess && onSuccess(undefined);
             };
             ws.onmessage = function (event) {
diff --git a/src/Components/CameraFeed/AssetBedSelect.tsx b/src/Components/CameraFeed/AssetBedSelect.tsx
index 17701dccbde..715c326c35d 100644
--- a/src/Components/CameraFeed/AssetBedSelect.tsx
+++ b/src/Components/CameraFeed/AssetBedSelect.tsx
@@ -1,39 +1,67 @@
 import { Fragment } from "react";
-import useSlug from "../../Common/hooks/useSlug";
-import routes from "../../Redux/api";
-import useQuery from "../../Utils/request/useQuery";
-import { AssetBedModel, AssetData } from "../Assets/AssetTypes";
-import { BedModel } from "../Facility/models";
+import { AssetBedModel } from "../Assets/AssetTypes";
 import { Listbox, Transition } from "@headlessui/react";
 import CareIcon from "../../CAREUI/icons/CareIcon";
+import { classNames } from "../../Utils/utils";
 
 interface Props {
-  asset?: AssetData;
-  bed?: BedModel;
+  options: AssetBedModel[];
   value?: AssetBedModel;
+  label?: (value: AssetBedModel) => string;
   onChange?: (value: AssetBedModel) => void;
 }
 
-export default function AssetBedSelect(props: Props) {
-  const facility = useSlug("facility");
-
-  const { data, loading } = useQuery(routes.listAssetBeds, {
-    query: {
-      limit: 100,
-      facility,
-      asset: props.asset?.id,
-      bed: props.bed?.id,
-    },
-  });
+export default function CameraPresetSelect(props: Props) {
+  const label = props.label ?? defaultLabel;
+  return (
+    <>
+      <div className="hidden gap-2 whitespace-nowrap pr-2 md:flex">
+        {/* Desktop View */}
+        {props.options
+          .slice(0, props.options.length > 5 ? 4 : 5)
+          .map((option) => (
+            <button
+              className={classNames(
+                "rounded-xl border px-2 py-0.5 text-xs transition-all duration-200 ease-in-out hover:bg-zinc-600",
+                props.value?.id === option.id
+                  ? "border-white bg-zinc-100 font-bold text-black"
+                  : "border-white/50 text-zinc-100",
+              )}
+              onClick={() => props.onChange?.(option)}
+            >
+              {label(option)}
+            </button>
+          ))}
+        {props.options.length > 5 && (
+          <CameraPresetDropdown {...props} options={props.options.slice(4)} />
+        )}
+      </div>
+      <div className="md:hidden">
+        {/* Mobile View */}
+        <CameraPresetDropdown {...props} />
+      </div>
+    </>
+  );
+}
 
+export const CameraPresetDropdown = (props: Props) => {
   const selected = props.value;
 
+  const options = props.options.filter(({ meta }) => meta.type !== "boundary");
+
+  const label = props.label ?? defaultLabel;
+
   return (
-    <Listbox value={selected} onChange={props.onChange} disabled={loading}>
-      <div className="relative">
-        <Listbox.Button className="relative w-full cursor-default pr-6 text-right text-xs text-zinc-400 focus:outline-none disabled:cursor-not-allowed disabled:bg-transparent disabled:text-zinc-700 sm:text-sm">
-          <span className="block truncate">
-            {selected?.bed_object.name ?? "No Preset"}
+    <Listbox value={selected} onChange={props.onChange}>
+      <div className="relative flex-1">
+        <Listbox.Button className="relative w-full cursor-default pr-6 text-left text-xs text-white focus:outline-none disabled:cursor-not-allowed disabled:bg-transparent disabled:text-zinc-700 sm:text-sm md:pl-2">
+          <span
+            className={classNames(
+              "block truncate",
+              !selected && "text-gray-500",
+            )}
+          >
+            {selected ? label(selected) : "Select preset"}
           </span>
           <span className="pointer-events-none absolute inset-y-0 right-0 mt-1 flex items-center">
             <CareIcon icon="l-angle-down" className="text-lg text-zinc-500" />
@@ -46,7 +74,7 @@ export default function AssetBedSelect(props: Props) {
           leaveTo="opacity-0"
         >
           <Listbox.Options className="absolute z-20 mt-1 max-h-48 w-full overflow-auto rounded-b-lg bg-zinc-900/75 py-1 text-base shadow-lg ring-1 ring-white/5 backdrop-blur-sm focus:outline-none sm:text-sm md:max-h-60">
-            {data?.results.map((obj) => (
+            {options?.map((obj) => (
               <Listbox.Option
                 key={obj.id}
                 className={({ active }) =>
@@ -63,7 +91,7 @@ export default function AssetBedSelect(props: Props) {
                         selected ? "font-bold text-white" : "font-normal"
                       }`}
                     >
-                      {obj.bed_object.name}: {obj.meta.preset_name}
+                      {label(obj)}
                     </span>
                   </>
                 )}
@@ -74,4 +102,8 @@ export default function AssetBedSelect(props: Props) {
       </div>
     </Listbox>
   );
-}
+};
+
+const defaultLabel = ({ bed_object, meta }: AssetBedModel) => {
+  return `${bed_object.name}: ${meta.preset_name}`;
+};
diff --git a/src/Components/CameraFeed/CameraFeed.tsx b/src/Components/CameraFeed/CameraFeed.tsx
index d5ea120e126..81b526363b9 100644
--- a/src/Components/CameraFeed/CameraFeed.tsx
+++ b/src/Components/CameraFeed/CameraFeed.tsx
@@ -10,6 +10,8 @@ import FeedNetworkSignal from "./FeedNetworkSignal";
 import NoFeedAvailable from "./NoFeedAvailable";
 import FeedControls from "./FeedControls";
 import Fullscreen from "../../CAREUI/misc/Fullscreen";
+import FeedWatermark from "./FeedWatermark";
+import CareIcon from "../../CAREUI/icons/CareIcon";
 
 interface Props {
   children?: React.ReactNode;
@@ -24,6 +26,7 @@ interface Props {
   // Controls
   constrolsDisabled?: boolean;
   shortcutsDisabled?: boolean;
+  onMove?: () => void;
 }
 
 export default function CameraFeed(props: Props) {
@@ -76,7 +79,7 @@ export default function CameraFeed(props: Props) {
       },
       onError: props.onStreamError,
     });
-  }, [player.initializeStream, props.onStreamSuccess, props.onStreamError]);
+  }, [player.initializeStream]);
 
   // Start stream on mount
   useEffect(() => initializeStream(), [initializeStream]);
@@ -85,18 +88,22 @@ export default function CameraFeed(props: Props) {
     setState("loading");
     initializeStream();
   };
-
   return (
     <Fullscreen fullscreen={isFullscreen} onExit={() => setFullscreen(false)}>
       <div
         className={classNames(
-          "flex flex-col overflow-clip rounded-xl bg-black",
+          "flex max-h-screen flex-col overflow-clip rounded-xl bg-black",
           props.className,
         )}
       >
         <div className="flex items-center justify-between bg-zinc-900 px-4 py-0.5">
-          <div className="flex items-center gap-1 md:gap-2">
+          {props.children}
+          <div className="flex w-full items-center justify-end gap-1 md:gap-4">
             <span className="text-xs font-semibold text-white md:text-sm">
+              <CareIcon
+                icon="l-video"
+                className="hidden pr-2 text-base text-zinc-400 md:inline-block"
+              />
               {props.asset.name}
             </span>
             <div className={state === "loading" ? "animate-pulse" : ""}>
@@ -108,12 +115,12 @@ export default function CameraFeed(props: Props) {
               />
             </div>
           </div>
-          {props.children}
         </div>
 
         <div className="group relative aspect-video">
           {/* Notifications */}
           <FeedAlert state={state} />
+          {player.status === "playing" && <FeedWatermark />}
 
           {/* No Feed informations */}
           {state === "host_unreachable" && (
@@ -144,6 +151,7 @@ export default function CameraFeed(props: Props) {
                 url={streamUrl}
                 ref={playerRef.current as LegacyRef<ReactPlayer>}
                 controls={false}
+                pip={false}
                 playsinline
                 playing
                 muted
@@ -161,10 +169,12 @@ export default function CameraFeed(props: Props) {
             </div>
           ) : (
             <video
+              onContextMenu={(e) => e.preventDefault()}
               className="absolute inset-0 w-full"
               id="mse-video"
               autoPlay
               muted
+              disablePictureInPicture
               playsInline
               onPlay={player.onPlayCB}
               onEnded={() => player.setStatus("stop")}
@@ -180,6 +190,7 @@ export default function CameraFeed(props: Props) {
               setFullscreen={setFullscreen}
               onReset={resetStream}
               onMove={async (data) => {
+                props.onMove?.();
                 setState("moving");
                 const { res } = await operate({ type: "relative_move", data });
                 setTimeout(() => {
diff --git a/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx b/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx
index 386b93325b0..e3fc2ab2129 100644
--- a/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx
+++ b/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx
@@ -1,15 +1,23 @@
 import { useState } from "react";
 import { AssetBedModel, AssetData } from "../Assets/AssetTypes";
 import CameraFeed from "./CameraFeed";
-import AssetBedSelect from "./AssetBedSelect";
+import useQuery from "../../Utils/request/useQuery";
+import routes from "../../Redux/api";
+import useSlug from "../../Common/hooks/useSlug";
+import { CameraPresetDropdown } from "./AssetBedSelect";
 
 interface Props {
   asset: AssetData;
 }
 
 export default function LocationFeedTile(props: Props) {
+  const facility = useSlug("facility");
   const [preset, setPreset] = useState<AssetBedModel>();
 
+  const { data, loading } = useQuery(routes.listAssetBeds, {
+    query: { limit: 100, facility, asset: props.asset?.id },
+  });
+
   return (
     <CameraFeed
       asset={props.asset}
@@ -18,11 +26,15 @@ export default function LocationFeedTile(props: Props) {
       shortcutsDisabled
     >
       <div className="w-64">
-        <AssetBedSelect
-          asset={props.asset}
-          value={preset}
-          onChange={setPreset}
-        />
+        {loading ? (
+          <span>loading presets...</span>
+        ) : (
+          <CameraPresetDropdown
+            options={data?.results ?? []}
+            value={preset}
+            onChange={setPreset}
+          />
+        )}
       </div>
     </CameraFeed>
   );
diff --git a/src/Components/CameraFeed/FeedControls.tsx b/src/Components/CameraFeed/FeedControls.tsx
index 3a5afb76209..46258114fc0 100644
--- a/src/Components/CameraFeed/FeedControls.tsx
+++ b/src/Components/CameraFeed/FeedControls.tsx
@@ -87,6 +87,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
               helpText="Up"
               shortcut={Shortcuts.MoveUp}
               shortcutsDisabled={shortcutsDisabled}
+              tooltipClassName="-translate-y-20 md:translate-y-0"
             >
               <CareIcon icon="l-triangle" className="rotate-0" />
             </FeedButton>
@@ -102,6 +103,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
               helpText="Left"
               shortcut={Shortcuts.MoveLeft}
               shortcutsDisabled={shortcutsDisabled}
+              tooltipClassName="-translate-y-20 -translate-x-1 md:translate-x-0 md:translate-y-0"
             >
               <CareIcon icon="l-triangle" className="-rotate-90" />
             </FeedButton>
@@ -114,6 +116,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
               shortcut={Shortcuts.TogglePrecision}
               className="font-bold"
               shortcutsDisabled={shortcutsDisabled}
+              tooltipClassName="-translate-y-20 -translate-x-20 md:translate-x-0 md:translate-y-0"
             >
               {precision}x
             </FeedButton>
@@ -125,6 +128,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
               helpText="Right"
               shortcut={Shortcuts.MoveRight}
               shortcutsDisabled={shortcutsDisabled}
+              tooltipClassName="-translate-y-20 -translate-x-2 md:translate-x-0 md:translate-y-0"
             >
               <CareIcon icon="l-triangle" className="rotate-90" />
             </FeedButton>
@@ -142,7 +146,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
               helpText="Down"
               shortcut={Shortcuts.MoveDown}
               shortcutsDisabled={shortcutsDisabled}
-              tooltipClassName="tooltip-top"
+              tooltipClassName="-translate-y-20 -translate-x-2 md:-translate-x-14"
             >
               <CareIcon icon="l-triangle" className="rotate-180" />
             </FeedButton>
@@ -185,16 +189,6 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) {
           >
             <CareIcon icon="l-redo" />
           </FeedButton>
-          {/* TODO: implement this when this is used in where presets can be saved. */}
-          {/* <FeedButton
-                shortcut={Shortcuts.SavePreset}
-                tooltipClassName="tooltip-left translate-y-2 translate-x-1"
-                helpText="Save current view to preset"
-                onTrigger={() => console.error("Not implemented")}
-                shortcutsDisabled={shortcutsDisabled}
-              >
-                <CareIcon icon="l-save" />
-              </FeedButton> */}
           <FeedButton
             shortcut={Shortcuts.Fullscreen}
             tooltipClassName="tooltip-left translate-y-2 translate-x-1"
diff --git a/src/Components/CameraFeed/FeedNetworkSignal.tsx b/src/Components/CameraFeed/FeedNetworkSignal.tsx
index 55b62ba8620..502c61843e8 100644
--- a/src/Components/CameraFeed/FeedNetworkSignal.tsx
+++ b/src/Components/CameraFeed/FeedNetworkSignal.tsx
@@ -25,7 +25,7 @@ export default function FeedNetworkSignal(props: Props) {
       if (-5 > delay || delay > 5) {
         props.onReset();
       }
-    }, 500);
+    }, 1000);
 
     return () => {
       clearInterval(interval);
diff --git a/src/Components/CameraFeed/FeedWatermark.tsx b/src/Components/CameraFeed/FeedWatermark.tsx
new file mode 100644
index 00000000000..e80c756ba3f
--- /dev/null
+++ b/src/Components/CameraFeed/FeedWatermark.tsx
@@ -0,0 +1,55 @@
+import { useEffect, useRef } from "react";
+import useAuthUser from "../../Common/hooks/useAuthUser";
+
+export default function FeedWatermark() {
+  const me = useAuthUser();
+  return (
+    <>
+      <Watermark className="left-1/3 top-1/3 -translate-x-1/2 -translate-y-1/2">
+        {me.username}
+      </Watermark>
+      <Watermark className="right-1/3 top-1/3 -translate-y-1/2 translate-x-1/2">
+        {me.username}
+      </Watermark>
+      <Watermark className="bottom-1/3 left-1/3 -translate-x-1/2 translate-y-1/2">
+        {me.username}
+      </Watermark>
+      <Watermark className="bottom-1/3 right-1/3 translate-x-1/2 translate-y-1/2">
+        {me.username}
+      </Watermark>
+    </>
+  );
+}
+
+const Watermark = (props: { children: string; className: string }) => {
+  const ref = useRef<HTMLSpanElement>(null);
+  const parentRef = useRef<HTMLElement | null>(null);
+
+  // This adds the element back if the element was removed from the DOM
+  useEffect(() => {
+    parentRef.current = ref.current?.parentElement || null;
+    let animationFrameId: number;
+
+    const checkWatermark = () => {
+      const watermark = ref.current;
+      const parent = parentRef.current;
+      if (watermark && parent && !parent.contains(watermark)) {
+        parent.appendChild(watermark);
+      }
+      animationFrameId = requestAnimationFrame(checkWatermark);
+    };
+
+    animationFrameId = requestAnimationFrame(checkWatermark);
+
+    return () => cancelAnimationFrame(animationFrameId);
+  }, []);
+
+  return (
+    <span
+      ref={ref}
+      className={`absolute z-10 text-2xl font-bold text-white/30 ${props.className}`}
+    >
+      {props.children}
+    </span>
+  );
+};
diff --git a/src/Components/Common/DialogModal.res b/src/Components/Common/DialogModal.res
new file mode 100644
index 00000000000..ae03ad8139c
--- /dev/null
+++ b/src/Components/Common/DialogModal.res
@@ -0,0 +1,20 @@
+type reactClass
+module DialogModal = {
+  @module("./Dialog.tsx") @react.component
+  external make: (
+    ~title: React.element,
+    ~show: bool,
+    ~onClose: unit => unit,
+    ~className: string,
+    ~children: React.element,
+  ) => React.element = "default"
+}
+
+@react.component
+let make = (
+  ~title: React.element,
+  ~show: bool,
+  ~onClose: unit => unit,
+  ~className: string,
+  ~children: React.element,
+) => <DialogModal title show onClose className> {children} </DialogModal>
diff --git a/src/Components/Common/PageTitle.tsx b/src/Components/Common/PageTitle.tsx
index 6fb38a36f08..990dc7b72cc 100644
--- a/src/Components/Common/PageTitle.tsx
+++ b/src/Components/Common/PageTitle.tsx
@@ -47,7 +47,7 @@ export default function PageTitle({
 
   useEffect(() => {
     if (divRef.current && focusOnLoad) {
-      divRef.current.scrollIntoView();
+      divRef.current.scrollIntoView({ behavior: "smooth" });
     }
   }, [divRef, focusOnLoad]);
 
diff --git a/src/Components/Common/SkillSelect.tsx b/src/Components/Common/SkillSelect.tsx
index 2d50a92d063..117df4f536d 100644
--- a/src/Components/Common/SkillSelect.tsx
+++ b/src/Components/Common/SkillSelect.tsx
@@ -44,7 +44,10 @@ export const SkillSelect = (props: SkillSelectProps) => {
 
       const { data } = await request(routes.getAllSkills, { query });
       return data?.results.filter(
-        (skill) => !userSkills?.some((userSkill) => userSkill.id === skill.id),
+        (skill) =>
+          !userSkills?.some(
+            (userSkill) => userSkill.skill_object.id === skill.id,
+          ),
       );
     },
     [searchAll, userSkills],
diff --git a/src/Components/Common/SymptomsSelect.tsx b/src/Components/Common/SymptomsSelect.tsx
deleted file mode 100644
index cdca3fe60dc..00000000000
--- a/src/Components/Common/SymptomsSelect.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import CareIcon from "../../CAREUI/icons/CareIcon";
-import { SYMPTOM_CHOICES } from "../../Common/constants";
-import { AutocompleteMutliSelect } from "../Form/FormFields/AutocompleteMultiselect";
-import FormField from "../Form/FormFields/FormField";
-import {
-  FormFieldBaseProps,
-  useFormFieldPropsResolver,
-} from "../Form/FormFields/Utils";
-
-const ASYMPTOMATIC_ID = 1;
-
-/**
- * A `FormField` component to select symptoms.
- *
- * - If "Asymptomatic" is selected, every other selections are unselected.
- * - If any non "Asymptomatic" value is selected, ensures "Asymptomatic" is
- * unselected.
- * - For other scenarios, this simply works like a `MultiSelect`.
- */
-export const SymptomsSelect = (props: FormFieldBaseProps<number[]>) => {
-  const field = useFormFieldPropsResolver(props);
-
-  const updateSelection = (value: number[]) => {
-    // Skip the complexities if no initial value was present
-    if (!props.value?.length) return field.handleChange(value);
-
-    const initialValue = props.value || [];
-
-    if (initialValue.includes(ASYMPTOMATIC_ID) && value.length > 1) {
-      // If asym. already selected, and new selections have more than one value
-      const asymptomaticIndex = value.indexOf(1);
-      if (asymptomaticIndex > -1) {
-        // unselect asym.
-        value.splice(asymptomaticIndex, 1);
-        return field.handleChange(value);
-      }
-    }
-
-    if (!initialValue.includes(ASYMPTOMATIC_ID) && value.includes(1)) {
-      // If new selections have asym., unselect everything else
-      return field.handleChange([ASYMPTOMATIC_ID]);
-    }
-
-    field.handleChange(value);
-  };
-
-  const getDescription = ({ id }: { id: number }) => {
-    const value = props.value || [];
-    if (!value.length) return;
-
-    if (value.includes(ASYMPTOMATIC_ID) && id !== ASYMPTOMATIC_ID)
-      return (
-        <div className="items-center">
-          <CareIcon icon="l-exclamation-triangle" className="mr-2" />
-          <span>
-            also unselects <b className="font-medium">Asymptomatic</b>
-          </span>
-        </div>
-      );
-
-    if (!value.includes(ASYMPTOMATIC_ID) && id === ASYMPTOMATIC_ID)
-      return (
-        <span>
-          <CareIcon icon="l-exclamation-triangle" className="mr-2" />
-          {`also unselects the other ${value.length} option(s)`}
-        </span>
-      );
-  };
-
-  return (
-    <FormField field={field}>
-      <AutocompleteMutliSelect
-        id={field.id}
-        options={SYMPTOM_CHOICES}
-        disabled={props.disabled}
-        placeholder="Select symptoms"
-        optionLabel={(option) => option.text}
-        optionValue={(option) => option.id}
-        value={props.value || []}
-        optionDescription={getDescription}
-        onChange={updateSelection}
-      />
-    </FormField>
-  );
-};
diff --git a/src/Components/CriticalCareRecording/CriticalCare__API.tsx b/src/Components/CriticalCareRecording/CriticalCare__API.tsx
index 108acfda05e..7bddbf9eaee 100644
--- a/src/Components/CriticalCareRecording/CriticalCare__API.tsx
+++ b/src/Components/CriticalCareRecording/CriticalCare__API.tsx
@@ -1,4 +1,6 @@
 import { fireRequestV2 } from "../../Redux/fireRequest";
+import routes from "../../Redux/api";
+import request from "../../Utils/request/request";
 
 export const loadDailyRound = (
   consultationId: string,
@@ -24,3 +26,18 @@ export const updateDailyRound = (
     id,
   });
 };
+
+export const getAsset = (
+  consultationId: string,
+  setAsset: React.Dispatch<React.SetStateAction<number>>,
+) => {
+  request(routes.listConsultationBeds, {
+    query: { consultation: consultationId, limit: 1 },
+  }).then(({ data }) => {
+    // here its fetching the ventilator type assets
+    const assets = data?.results[0].assets_objects?.filter(
+      (asset) => asset.asset_class == "VENTILATOR",
+    );
+    setAsset(assets?.length || 0);
+  });
+};
diff --git a/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res b/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
index 2903ab3e406..e8bfb91e21c 100644
--- a/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
+++ b/src/Components/CriticalCareRecording/Recording/CriticalCare__Recording.res
@@ -164,6 +164,8 @@ let make = (~id, ~facilityId, ~patientId, ~consultationId, ~dailyRound) => {
                 updateCB={updateDailyRound(send, VentilatorParametersEditor)}
                 id
                 consultationId
+                patientId
+                facilityId
               />
             | ArterialBloodGasAnalysisEditor =>
               <CriticalCare__ABGAnalysisEditor
diff --git a/src/Components/CriticalCareRecording/VentilatorParametersEditor/CriticalCare__VentilatorParametersEditor.res b/src/Components/CriticalCareRecording/VentilatorParametersEditor/CriticalCare__VentilatorParametersEditor.res
index 0e928e57f38..c06780aad75 100644
--- a/src/Components/CriticalCareRecording/VentilatorParametersEditor/CriticalCare__VentilatorParametersEditor.res
+++ b/src/Components/CriticalCareRecording/VentilatorParametersEditor/CriticalCare__VentilatorParametersEditor.res
@@ -5,6 +5,9 @@ open CriticalCare__Types
 external updateDailyRound: (string, string, Js.Json.t, _ => unit, _ => unit) => unit =
   "updateDailyRound"
 
+@module("../CriticalCare__API")
+external getAsset: (string, (int => int) => unit) => option<unit => unit> = "getAsset"
+
 open VentilatorParameters
 
 let string_of_int = data => Belt.Option.mapWithDefault(data, "", Js.Int.toString)
@@ -14,19 +17,19 @@ let reducer = (state: VentilatorParameters.state, action: VentilatorParameters.a
   switch action {
   | SetBilateralAirEntry(bilateral_air_entry) => {
       ...state,
-      bilateral_air_entry: bilateral_air_entry,
+      bilateral_air_entry,
     }
   | SetETCO2(etco2) => {
       ...state,
-      etco2: etco2,
+      etco2,
     }
   | SetVentilatorInterface(ventilator_interface) => {
       ...state,
-      ventilator_interface: ventilator_interface,
+      ventilator_interface,
     }
   | SetVentilatorMode(ventilator_mode) => {
       ...state,
-      ventilator_mode: ventilator_mode,
+      ventilator_mode,
     }
 
   | SetOxygenModality(oxygen_modality) => {
@@ -59,7 +62,7 @@ let reducer = (state: VentilatorParameters.state, action: VentilatorParameters.a
     }
   | SetOxygenModalityOxygenRate(ventilator_oxygen_modality_oxygen_rate) => {
       ...state,
-      ventilator_oxygen_modality_oxygen_rate: ventilator_oxygen_modality_oxygen_rate,
+      ventilator_oxygen_modality_oxygen_rate,
     }
   | SetOxygenModalityFlowRate(oxygen_modality_flow_rate) => {
       ...state,
@@ -204,8 +207,22 @@ let initialState: VentilatorParameters.t => VentilatorParameters.state = ventila
 }
 
 @react.component
-let make = (~ventilatorParameters: VentilatorParameters.t, ~id, ~consultationId, ~updateCB) => {
+let make = (
+  ~ventilatorParameters: VentilatorParameters.t,
+  ~id,
+  ~consultationId,
+  ~updateCB,
+  ~facilityId,
+  ~patientId,
+) => {
   let (state, send) = React.useReducer(reducer, initialState(ventilatorParameters))
+  let (isOpen, setIsOpen) = React.useState(() => false)
+  let toggleOpen = () => setIsOpen(prevState => !prevState)
+  let (asset, setAsset) = React.useState(() => 0)
+
+  React.useEffect1(() => {
+    getAsset(consultationId, setAsset)
+  }, [isOpen])
 
   let editor = switch state.ventilator_interface {
   | INVASIVE => <CriticalCare__VentilatorParametersEditor__Invasive state send />
@@ -216,7 +233,7 @@ let make = (~ventilatorParameters: VentilatorParameters.t, ~id, ~consultationId,
 
   <div>
     <CriticalCare__PageTitle title="Respiratory Support" />
-     <div>
+    <div>
       <div className="px-5 my-10">
         <div className=" text-xl font-bold my-2"> {str("Bilateral Air Entry")} </div>
         <div className="flex md:flex-row flex-col md:space-y-0 space-y-2 space-x-0 md:space-x-4">
@@ -225,19 +242,18 @@ let make = (~ventilatorParameters: VentilatorParameters.t, ~id, ~consultationId,
             id="bilateral-air-entry-yes"
             label="Yes"
             checked={switch state.bilateral_air_entry {
-              | Some(bae) => bae
-              | None => false
+            | Some(bae) => bae
+            | None => false
             }}
             onChange={_ => send(SetBilateralAirEntry(Some(true)))}
           />
-          
           <Radio
             key="bilateral-air-entry-no"
             id="bilateral-air-entry-no"
             label="No"
             checked={switch state.bilateral_air_entry {
-              | Some(bae) => !bae
-              | None => false
+            | Some(bae) => !bae
+            | None => false
             }}
             onChange={_ => send(SetBilateralAirEntry(Some(false)))}
           />
@@ -255,7 +271,6 @@ let make = (~ventilatorParameters: VentilatorParameters.t, ~id, ~consultationId,
         hasError={ValidationUtils.isInputInRangeInt(0, 200, state.etco2)}
       />
     </div>
-
     <div className="py-6">
       <div className="mb-6">
         <h4> {str("Respiratory Support")} </h4>
@@ -282,10 +297,43 @@ let make = (~ventilatorParameters: VentilatorParameters.t, ~id, ~consultationId,
       </div>
       <button
         disabled={state.saving}
-        onClick={_ => saveData(id, consultationId, state, send, updateCB)}
+        onClick={_ => {
+          // here checking if any asset linked or not before proceeding
+          if (
+            asset == 0 &&
+              (state.ventilator_interface !=
+                CriticalCare__VentilatorParameters.decodeVentilatorInterfaceType(
+                  ventilatorInterfaceOptions[0].value,
+                ) ||
+              switch state.bilateral_air_entry {
+              | Some(true) => true
+              | _ => false
+              } ||
+              switch (state.etco2) {
+              | Some(intValue) => true
+              | None => false
+              })
+          ) {
+            toggleOpen()
+          } else {
+            saveData(id, consultationId, state, send, updateCB)
+          }
+        }}
         className="btn btn-primary btn-large w-full">
         {str("Update Details")}
       </button>
+      <DialogModal
+        title={str("Link an asset to proceed")}
+        show={isOpen}
+        onClose={_ => toggleOpen()}
+        className="md:max-w-3xl">
+        <Beds
+          facilityId={facilityId}
+          patientId={patientId}
+          consultationId={consultationId}
+          setState={_ => toggleOpen()}
+        />
+      </DialogModal>
     </div>
   </div>
 }
diff --git a/src/Components/CriticalCareRecording/components/Slider.res b/src/Components/CriticalCareRecording/components/Slider.res
index d3ab996683e..9dc8dfd2d2c 100644
--- a/src/Components/CriticalCareRecording/components/Slider.res
+++ b/src/Components/CriticalCareRecording/components/Slider.res
@@ -47,6 +47,9 @@ let make = (
   let (text, setText) = React.useState(() => "Normal")
   let (precision, setPrecision) = React.useState(() => 1)
   let (displayValue, setDisplayValue) = React.useState(() => value)
+  let justifyContentClassName = title != "" ? "justify-between" : "justify-center"
+  let alignItemClassName = title != "" ? "items-end" : "items-center"
+  let boxWidthClassName = title != "" ? "" : "w-16"
 
   React.useEffect1(() => {
     let (text, color) = getLabel(value->Belt.Float.fromString->Belt.Option.getWithDefault(0.0))
@@ -76,11 +79,11 @@ let make = (
 
   <>
     <section className={"slider-box " ++ className}>
-      <div className="slider-head flex justify-between flex-col sm:flex-row sm:items-center">
+      <div className={"slider-head flex flex-col sm:flex-row sm:items-center " ++ justifyContentClassName}>
         <div className="flex items-center">
           <h1 className="m-2"> {title->str} </h1> titleNeighbour
         </div>
-        <div className="flex flex-col items-end mt-2 sm:mt-0">
+        <div className={"flex flex-col mt-2 sm:mt-0 " ++ alignItemClassName}>
           <label htmlFor="measure" style={ReactDOM.Style.make(~color=textColor, ())}>
             {switch value->Belt.Float.fromString {
             | Some(_) => text->str
@@ -93,7 +96,7 @@ let make = (
               step={step}
               max={end}
               min={start}
-              className="focus:outline-none focus:bg-white focus:ring-primary-500"
+              className={"focus:outline-none focus:bg-white focus:ring-primary-500 " ++ boxWidthClassName}
               value={displayValue}
               onChange={event =>
                 setValue(
diff --git a/src/Components/Diagnosis/utils.ts b/src/Components/Diagnosis/utils.ts
index c53f9b81bc1..1cac3cecbca 100644
--- a/src/Components/Diagnosis/utils.ts
+++ b/src/Components/Diagnosis/utils.ts
@@ -2,8 +2,6 @@ import routes from "../../Redux/api";
 import request from "../../Utils/request/request";
 import { ICD11DiagnosisModel } from "./types";
 
-// TODO: cache ICD11 responses and hit the cache if present instead of making an API call.
-
 export const getDiagnosisById = async (id: ICD11DiagnosisModel["id"]) => {
   return (await request(routes.getICD11Diagnosis, { pathParams: { id } })).data;
 };
diff --git a/src/Components/Facility/CentralNursingStation.tsx b/src/Components/Facility/CentralNursingStation.tsx
index 30005be0be6..2f31b619776 100644
--- a/src/Components/Facility/CentralNursingStation.tsx
+++ b/src/Components/Facility/CentralNursingStation.tsx
@@ -48,7 +48,8 @@ export default function CentralNursingStation({ facilityId }: Props) {
       asset_class: "HL7MONITOR",
       ordering: qParams.ordering || "bed__name",
       bed_is_occupied:
-        (qParams.hide_monitors_without_patient ?? "true") === "true",
+        (qParams.hide_monitors_without_patient ?? "true") === "true" ||
+        undefined,
     },
   });
 
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
index f4fbc08331c..40e5ffdc610 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
@@ -1,22 +1,179 @@
-import { lazy } from "react";
-import { Feed } from "../Consultations/Feed";
+import { useEffect, useRef, useState } from "react";
 import { ConsultationTabProps } from "./index";
-
-const PageTitle = lazy(() => import("../../Common/PageTitle"));
+import { AssetBedModel, AssetData } from "../../Assets/AssetTypes";
+import routes from "../../../Redux/api";
+import useQuery from "../../../Utils/request/useQuery";
+import CameraFeed from "../../CameraFeed/CameraFeed";
+import Loading from "../../Common/Loading";
+import AssetBedSelect from "../../CameraFeed/AssetBedSelect";
+import { triggerGoal } from "../../../Integrations/Plausible";
+import useAuthUser from "../../../Common/hooks/useAuthUser";
+import PageTitle from "../../Common/PageTitle";
+import useSlug from "../../../Common/hooks/useSlug";
+import CareIcon from "../../../CAREUI/icons/CareIcon";
+import ButtonV2 from "../../Common/components/ButtonV2";
+import useOperateCamera, {
+  PTZPayload,
+} from "../../CameraFeed/useOperateCamera";
+import request from "../../../Utils/request/request";
+import { classNames } from "../../../Utils/utils";
 
 export const ConsultationFeedTab = (props: ConsultationTabProps) => {
+  const authUser = useAuthUser();
+  const facility = useSlug("facility");
+  const bed = props.consultationData.current_bed?.bed_object;
+
+  const [asset, setAsset] = useState<AssetData>();
+  const [preset, setPreset] = useState<AssetBedModel>();
+  const [isUpdatingPreset, setIsUpdatingPreset] = useState(false);
+  const [hasMoved, setHasMoved] = useState(false);
+  const divRef = useRef<any>();
+
+  const operate = useOperateCamera(asset?.id ?? "", true);
+
+  const { data, loading, refetch } = useQuery(routes.listAssetBeds, {
+    query: { limit: 100, facility, bed: bed?.id, asset: asset?.id },
+    prefetch: !!bed,
+    onResponse: ({ data }) => {
+      if (!data) {
+        return;
+      }
+
+      const preset = data.results.find(
+        (obj) =>
+          obj.asset_object.meta?.asset_type === "CAMERA" &&
+          obj.meta.type !== "boundary",
+      );
+
+      if (preset) {
+        setPreset(preset);
+        setAsset(preset.asset_object);
+      }
+    },
+  });
+
+  const presets = data?.results;
+
+  const handleUpdatePreset = async () => {
+    if (!preset) return;
+
+    setIsUpdatingPreset(true);
+
+    const { data } = await operate({ type: "get_status" });
+    const { position } = (data as { result: { position: PTZPayload } }).result;
+
+    const { data: updated } = await request(routes.partialUpdateAssetBed, {
+      pathParams: { external_id: preset.id },
+      body: {
+        asset: preset.asset_object.id,
+        bed: preset.bed_object.id,
+        meta: { ...preset.meta, position },
+      },
+    });
+
+    await refetch();
+
+    setPreset(updated);
+    setHasMoved(false);
+    setIsUpdatingPreset(false);
+  };
+
+  useEffect(() => {
+    if (divRef.current) {
+      divRef.current.scrollIntoView({ behavior: "smooth" });
+    }
+  }, [!!bed, loading, !!asset, divRef.current]);
+
+  if (loading) {
+    return <Loading />;
+  }
+
+  if (!bed || !asset) {
+    return <span>No bed/asset linked allocated</span>;
+  }
+
   return (
     <div>
       <PageTitle
         title="Camera Feed"
         breadcrumbs={false}
         hideBack={true}
-        focusOnLoad={true}
-      />
-      <Feed
-        facilityId={props.facilityId}
-        consultationId={props.consultationId}
+        focusOnLoad={false}
       />
+      <div ref={divRef}>
+        <CameraFeed
+          asset={asset}
+          preset={preset?.meta.position}
+          onMove={() => setHasMoved(true)}
+          onStreamError={() => {
+            triggerGoal("Camera Feed Viewed", {
+              consultationId: props.consultationId,
+              userId: authUser.id,
+              result: "error",
+            });
+          }}
+          onStreamSuccess={() => {
+            triggerGoal("Camera Feed Viewed", {
+              consultationId: props.consultationId,
+              userId: authUser.id,
+              result: "success",
+            });
+          }}
+        >
+          <div className="flex items-center">
+            {presets ? (
+              <>
+                <AssetBedSelect
+                  options={presets}
+                  label={(obj) => obj.meta.preset_name}
+                  value={preset}
+                  onChange={(value) => {
+                    triggerGoal("Camera Preset Clicked", {
+                      presetName: preset?.meta?.preset_name,
+                      consultationId: props.consultationId,
+                      userId: authUser.id,
+                      result: "success",
+                    });
+                    setHasMoved(false);
+                    setPreset(value);
+                  }}
+                />
+                {isUpdatingPreset ? (
+                  <CareIcon
+                    icon="l-spinner"
+                    className="animate-spin text-base text-zinc-300 md:mx-2"
+                  />
+                ) : (
+                  <ButtonV2
+                    size="small"
+                    variant="secondary"
+                    disabled={!hasMoved}
+                    className="hover:bg-zinc-700 disabled:bg-transparent"
+                    ghost
+                    tooltip={
+                      hasMoved
+                        ? "Save current position to selected preset"
+                        : "Change camera position to update preset"
+                    }
+                    tooltipClassName="translate-y-8 text-xs"
+                    onClick={handleUpdatePreset}
+                  >
+                    <CareIcon
+                      icon="l-save"
+                      className={classNames(
+                        "text-base",
+                        hasMoved ? "text-gray-200" : "text-gray-500",
+                      )}
+                    />
+                  </ButtonV2>
+                )}
+              </>
+            ) : (
+              <span>loading presets...</span>
+            )}
+          </div>
+        </CameraFeed>
+      </div>
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx
index e1e72c2f936..27af4bb6480 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationMedicinesTab.tsx
@@ -1,6 +1,7 @@
 import { ConsultationTabProps } from "./index";
 import PageTitle from "../../Common/PageHeadTitle";
 import MedicineAdministrationSheet from "../../Medicine/MedicineAdministrationSheet";
+import { MedicinePrescriptionSummary } from "../../Medicine/MedicinePrescriptionSummary";
 
 export const ConsultationMedicinesTab = (props: ConsultationTabProps) => {
   return (
@@ -15,6 +16,7 @@ export const ConsultationMedicinesTab = (props: ConsultationTabProps) => {
         is_prn={true}
         readonly={!!props.consultationData.discharge_date}
       />
+      <MedicinePrescriptionSummary consultation={props.consultationId} />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
index e9e658cee4f..be2751f0033 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -5,12 +5,7 @@ import { BedModel } from "../models";
 import HL7PatientVitalsMonitor from "../../VitalsMonitor/HL7PatientVitalsMonitor";
 import VentilatorPatientVitalsMonitor from "../../VitalsMonitor/VentilatorPatientVitalsMonitor";
 import useVitalsAspectRatioConfig from "../../VitalsMonitor/useVitalsAspectRatioConfig";
-import {
-  CONSENT_PATIENT_CODE_STATUS_CHOICES,
-  CONSENT_TYPE_CHOICES,
-  DISCHARGE_REASONS,
-  SYMPTOM_CHOICES,
-} from "../../../Common/constants";
+import { DISCHARGE_REASONS } from "../../../Common/constants";
 import PrescriptionsTable from "../../Medicine/PrescriptionsTable";
 import Chip from "../../../CAREUI/display/Chip";
 import {
@@ -25,10 +20,10 @@ import DailyRoundsList from "../Consultations/DailyRoundsList";
 import EventsList from "./Events/EventsList";
 import SwitchTabs from "../../Common/components/SwitchTabs";
 import { getVitalsMonitorSocketUrl } from "../../VitalsMonitor/utils";
-import { FileUpload } from "../../Patient/FileUpload";
 import useQuery from "../../../Utils/request/useQuery";
 import routes from "../../../Redux/api";
 import CareIcon from "../../../CAREUI/icons/CareIcon";
+import EncounterSymptomsCard from "../../Symptoms/SymptomsCard";
 
 const PageTitle = lazy(() => import("../../Common/PageTitle"));
 
@@ -249,7 +244,6 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         <div className="overflow-x-auto overflow-y-hidden">
                           <PrescriptionsTable
                             is_prn={false}
-                            readonly
                             prescription_type="DISCHARGE"
                           />
                         </div>
@@ -257,7 +251,6 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         <div className="overflow-x-auto overflow-y-hidden">
                           <PrescriptionsTable
                             is_prn
-                            readonly
                             prescription_type="DISCHARGE"
                           />
                         </div>
@@ -371,91 +364,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                 )}
               </div>
             )}
-            {props.consultationData.symptoms_text && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6">
-                  <h3 className="mb-4 text-lg font-semibold leading-relaxed text-gray-900">
-                    Symptoms
-                  </h3>
-                  <div className="">
-                    <div className="text-sm font-semibold uppercase">
-                      Last Daily Update
-                    </div>
-                    {props.consultationData.last_daily_round
-                      ?.additional_symptoms && (
-                      <>
-                        <div className="my-4 flex flex-wrap items-center gap-2">
-                          {props.consultationData.last_daily_round?.additional_symptoms.map(
-                            (symptom: any, index: number) => (
-                              <Chip
-                                key={index}
-                                text={
-                                  SYMPTOM_CHOICES.find(
-                                    (choice) => choice.id === symptom,
-                                  )?.text ?? "Err. Unknown"
-                                }
-                                size="small"
-                              />
-                            ),
-                          )}
-                        </div>
-                        {props.consultationData.last_daily_round
-                          ?.other_symptoms && (
-                          <div className="capitalize">
-                            <div className="text-xs font-semibold">
-                              Other Symptoms:
-                            </div>
-                            {
-                              props.consultationData.last_daily_round
-                                ?.other_symptoms
-                            }
-                          </div>
-                        )}
-                        <span className="text-xs font-semibold leading-relaxed text-gray-800">
-                          from{" "}
-                          {formatDate(
-                            props.consultationData.last_daily_round.taken_at,
-                          )}
-                        </span>
-                      </>
-                    )}
-                    <hr className="my-4 border border-gray-300" />
-                    <div className="text-sm font-semibold uppercase">
-                      Consultation Update
-                    </div>
-                    <div className="my-4 flex flex-wrap items-center gap-2">
-                      {props.consultationData.symptoms?.map(
-                        (symptom, index) => (
-                          <Chip
-                            key={index}
-                            text={
-                              SYMPTOM_CHOICES.find(
-                                (choice) => choice.id === symptom,
-                              )?.text ?? "Err. Unknown"
-                            }
-                            size="small"
-                          />
-                        ),
-                      )}
-                    </div>
-                    {props.consultationData.other_symptoms && (
-                      <div className="capitalize">
-                        <div className="text-xs font-semibold">
-                          Other Symptoms:
-                        </div>
-                        {props.consultationData.other_symptoms}
-                      </div>
-                    )}
-                    <span className="text-xs font-semibold leading-relaxed text-gray-800">
-                      from{" "}
-                      {props.consultationData.symptoms_onset_date
-                        ? formatDate(props.consultationData.symptoms_onset_date)
-                        : "--/--/----"}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            )}
+
+            <div className="rounded-lg bg-white px-4 py-5 shadow sm:p-6 md:col-span-2">
+              <EncounterSymptomsCard />
+            </div>
 
             {props.consultationData.history_of_present_illness && (
               <div className="overflow-hidden rounded-lg bg-white shadow">
@@ -725,47 +637,6 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                 </div>
               </div>
             </div>
-            {(
-              props.consultationData.consent_records?.filter(
-                (record) => record.deleted !== true,
-              ) || []
-            ).length > 0 && (
-              <>
-                <div className="col-span-1 overflow-hidden rounded-lg bg-white p-4 shadow md:col-span-2">
-                  <h3 className="text-lg font-semibold leading-relaxed text-gray-900">
-                    Consent Records
-                  </h3>
-                  {props.consultationData.consent_records
-                    ?.filter((record) => record.deleted !== true)
-                    ?.map((record, i) => (
-                      <div className="mt-4 border-b" key={i}>
-                        <div className="font-bold">
-                          {
-                            CONSENT_TYPE_CHOICES.find(
-                              (c) => c.id === record.type,
-                            )?.text
-                          }{" "}
-                          {record.patient_code_status &&
-                            `( ${
-                              CONSENT_PATIENT_CODE_STATUS_CHOICES.find(
-                                (c) => c.id === record.patient_code_status,
-                              )?.text
-                            } )`}
-                        </div>
-                        <FileUpload
-                          changePageMetadata={false}
-                          type="CONSENT_RECORD"
-                          hideBack
-                          unspecified
-                          className="w-full"
-                          consentId={record.id}
-                          hideUpload
-                        />
-                      </div>
-                    ))}
-                </div>
-              </>
-            )}
           </div>
         </div>
         <div className="w-full pl-0 md:pl-4 xl:w-1/3">
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 4d393752888..ee1f7bda7ff 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -1,8 +1,4 @@
-import {
-  CONSULTATION_TABS,
-  GENDER_TYPES,
-  SYMPTOM_CHOICES,
-} from "../../../Common/constants";
+import { CONSULTATION_TABS, GENDER_TYPES } from "../../../Common/constants";
 import { ConsultationModel } from "../models";
 import {
   getConsultation,
@@ -44,7 +40,6 @@ import { CameraFeedPermittedUserTypes } from "../../../Utils/permissions";
 
 const Loading = lazy(() => import("../../Common/Loading"));
 const PageTitle = lazy(() => import("../../Common/PageTitle"));
-const symptomChoices = [...SYMPTOM_CHOICES];
 
 export interface ConsultationTabProps {
   consultationId: string;
@@ -114,15 +109,15 @@ export const ConsultationDetails = (props: any) => {
             ...res.data,
             symptoms_text: "",
           };
-          if (res.data.symptoms?.length) {
-            const symptoms = res.data.symptoms
-              .filter((symptom: number) => symptom !== 9)
-              .map((symptom: number) => {
-                const option = symptomChoices.find((i) => i.id === symptom);
-                return option ? option.text.toLowerCase() : symptom;
-              });
-            data.symptoms_text = symptoms.join(", ");
-          }
+          // if (res.data.symptoms?.length) {
+          //   const symptoms = res.data.symptoms
+          //     .filter((symptom: number) => symptom !== 9)
+          //     .map((symptom: number) => {
+          //       const option = symptomChoices.find((i) => i.id === symptom);
+          //       return option ? option.text.toLowerCase() : symptom;
+          //     });
+          //   data.symptoms_text = symptoms.join(", ");
+          // }
           if (facilityId != data.facility || patientId != data.patient) {
             navigate(
               `/facility/${data.facility}/patient/${data.patient}/consultation/${data?.id}`,
@@ -210,57 +205,6 @@ export const ConsultationDetails = (props: any) => {
       selected === true ? "border-primary-500 text-primary-600 border-b-2" : ""
     }`;
 
-  // const ShowDiagnosis = ({
-  //   diagnoses = [],
-  //   label = "Diagnosis",
-  //   nshow = 2,
-  // }: {
-  //   diagnoses: ICD11DiagnosisModel[] | undefined;
-  //   label: string;
-  //   nshow?: number;
-  // }) => {
-  //   const [showMore, setShowMore] = useState(false);
-
-  //   return diagnoses.length ? (
-  //     <div className="w-full text-sm">
-  //       <p className="font-semibold leading-relaxed">{label}</p>
-  //       {diagnoses.slice(0, !showMore ? nshow : undefined).map((diagnosis) =>
-  //         diagnosis.id === consultationData.icd11_principal_diagnosis ? (
-  //           <div className="relative flex items-center gap-2">
-  //             <p>{diagnosis.label}</p>
-  //             <div>
-  //               <ToolTip text="Principal Diagnosis" position="BOTTOM">
-  //                 <CareIcon icon="l-stethoscope" className="rounded-lg bg-primary-500 p-1 text-2xl text-white"/>
-  //               </ToolTip>
-  //             </div>
-  //           </div>
-  //         ) : (
-  //           <p>{diagnosis.label}</p>
-  //         )
-  //       )}
-  //       {diagnoses.length > nshow && (
-  //         <>
-  //           {!showMore ? (
-  //             <a
-  //               onClick={() => setShowMore(true)}
-  //               className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
-  //             >
-  //               show more
-  //             </a>
-  //           ) : (
-  //             <a
-  //               onClick={() => setShowMore(false)}
-  //               className="cursor-pointer text-sm text-blue-600 hover:text-blue-300"
-  //             >
-  //               show less
-  //             </a>
-  //           )}
-  //         </>
-  //       )}
-  //     </div>
-  //   ) : null;
-  // };
-
   return (
     <div>
       <div className="px-2 pb-2">
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 7e6fe345f7c..594769ec1c4 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -1,6 +1,6 @@
 import * as Notification from "../../Utils/Notifications.js";
 
-import { BedModel, FacilityModel } from "./models";
+import { BedModel, ConsentRecord, FacilityModel } from "./models";
 import {
   CONSULTATION_SUGGESTION,
   DISCHARGE_REASONS,
@@ -8,8 +8,6 @@ import {
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
   TELEMEDICINE_ACTIONS,
-  CONSENT_TYPE_CHOICES,
-  CONSENT_PATIENT_CODE_STATUS_CHOICES,
 } from "../../Common/constants";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import { DraftSection, useAutoSaveReducer } from "../../Utils/AutoSave";
@@ -25,7 +23,6 @@ import { BedSelect } from "../Common/BedSelect";
 import Beds from "./Consultations/Beds";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import CheckBoxFormField from "../Form/FormFields/CheckBoxFormField";
-import DateFormField from "../Form/FormFields/DateFormField";
 import { FacilitySelect } from "../Common/FacilitySelect";
 import {
   FieldChangeEvent,
@@ -34,7 +31,6 @@ import {
 import { FormAction } from "../Form/Utils";
 import PatientCategorySelect from "../Patient/PatientCategorySelect";
 import { SelectFormField } from "../Form/FormFields/SelectFormField";
-import { SymptomsSelect } from "../Common/SymptomsSelect";
 import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
 import TextFormField from "../Form/FormFields/TextFormField";
 import UserAutocompleteFormField from "../Common/UserAutocompleteFormField";
@@ -59,29 +55,24 @@ import {
   CreateDiagnosesBuilder,
   EditDiagnosesBuilder,
 } from "../Diagnosis/ConsultationDiagnosisBuilder/ConsultationDiagnosisBuilder.js";
-import { FileUpload } from "../Patient/FileUpload.js";
-import ConfirmDialog from "../Common/ConfirmDialog.js";
 import request from "../../Utils/request/request.js";
 import routes from "../../Redux/api.js";
 import useQuery from "../../Utils/request/useQuery.js";
 import { t } from "i18next";
+import { Writable } from "../../Utils/types.js";
+import { EncounterSymptom } from "../Symptoms/types.js";
+import {
+  EncounterSymptomsBuilder,
+  CreateSymptomsBuilder,
+} from "../Symptoms/SymptomsBuilder.js";
 
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
 
 type BooleanStrings = "true" | "false";
 
-export type ConsentRecord = {
-  id: string;
-  type: (typeof CONSENT_TYPE_CHOICES)[number]["id"];
-  patient_code_status?: (typeof CONSENT_PATIENT_CODE_STATUS_CHOICES)[number]["id"];
-  deleted?: boolean;
-};
-
 type FormDetails = {
-  symptoms: number[];
-  other_symptoms: string;
-  symptoms_onset_date?: Date;
+  is_asymptomatic: boolean;
   suggestion: ConsultationSuggestionValue;
   route_to_facility?: RouteToFacility;
   patient: string;
@@ -102,6 +93,8 @@ type FormDetails = {
   treating_physician_object: UserModel | null;
   create_diagnoses: CreateDiagnosis[];
   diagnoses: ConsultationDiagnosis[];
+  symptoms: EncounterSymptom[];
+  create_symptoms: Writable<EncounterSymptom>[];
   is_kasp: BooleanStrings;
   kasp_enabled_date: null;
   examination_details: string;
@@ -125,13 +118,14 @@ type FormDetails = {
   death_datetime: string;
   death_confirmed_doctor: string;
   InvestigationAdvice: InvestigationType[];
+  procedures: ProcedureType[];
   consent_records: ConsentRecord[];
 };
 
 const initForm: FormDetails = {
+  is_asymptomatic: false,
+  create_symptoms: [],
   symptoms: [],
-  other_symptoms: "",
-  symptoms_onset_date: undefined,
   suggestion: "A",
   route_to_facility: undefined,
   patient: "",
@@ -175,6 +169,7 @@ const initForm: FormDetails = {
   death_datetime: "",
   death_confirmed_doctor: "",
   InvestigationAdvice: [],
+  procedures: [],
   consent_records: [],
 };
 
@@ -226,7 +221,6 @@ type ConsultationFormSection =
   | "Consultation Details"
   | "Diagnosis"
   | "Treatment Plan"
-  | "Consent Records"
   | "Bed Status";
 
 type Props = {
@@ -259,14 +253,8 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
   const [diagnosisVisible, diagnosisRef] = useVisibility(-300);
   const [treatmentPlanVisible, treatmentPlanRef] = useVisibility(-300);
   const [bedStatusVisible, bedStatusRef] = useVisibility(-300);
-  const [consentRecordsVisible, consentRecordsRef] = useVisibility(-300);
+
   const [disabledFields, setDisabledFields] = useState<string[]>([]);
-  const [collapsedConsentRecords, setCollapsedConsentRecords] = useState<
-    number[]
-  >([]);
-  const [showDeleteConsent, setShowDeleteConsent] = useState<string | null>(
-    null,
-  );
 
   const { min_encounter_date } = useConfig();
 
@@ -286,11 +274,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
       visible: treatmentPlanVisible,
       ref: treatmentPlanRef,
     },
-    "Consent Records": {
-      iconClass: "l-file-alt",
-      visible: consentRecordsVisible,
-      ref: consentRecordsRef,
-    },
     "Bed Status": {
       iconClass: "l-bed",
       visible: bedStatusVisible,
@@ -303,7 +286,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
       if (consultationDetailsVisible) return "Consultation Details";
       if (diagnosisVisible) return "Diagnosis";
       if (treatmentPlanVisible) return "Treatment Plan";
-      if (consentRecordsVisible) return "Consent Records";
       if (bedStatusVisible) return "Bed Status";
       return prev;
     });
@@ -311,7 +293,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
     consultationDetailsVisible,
     diagnosisVisible,
     treatmentPlanVisible,
-    consentRecordsVisible,
     bedStatusVisible,
   ]);
 
@@ -338,10 +319,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
     });
   }, []);
 
-  const hasSymptoms =
-    !!state.form.symptoms.length && !state.form.symptoms.includes(1);
-  const isOtherSymptomsSelected = state.form.symptoms.includes(9);
-
   const handleFormFieldChange: FieldChangeEventHandler<unknown> = (event) => {
     if (event.name === "suggestion" && event.value === "DD") {
       dispatch({
@@ -352,12 +329,21 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
           consultation_notes: "Patient declared dead",
         },
       });
-    } else {
+      return;
+    }
+
+    if (event.name === "is_asymptomatic" && event.value === true) {
       dispatch({
         type: "set_form",
-        form: { ...state.form, [event.name]: event.value },
+        form: { ...state.form, [event.name]: event.value, create_symptoms: [] },
       });
+      return;
     }
+
+    dispatch({
+      type: "set_form",
+      form: { ...state.form, [event.name]: event.value },
+    });
   };
 
   const { loading: consultationLoading, refetch } = useQuery(
@@ -395,9 +381,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         if (data) {
           const formData = {
             ...data,
-            symptoms_onset_date:
-              data.symptoms_onset_date &&
-              isoStringToDate(data.symptoms_onset_date),
             encounter_date: isoStringToDate(data.encounter_date),
             icu_admission_date:
               data.icu_admission_date &&
@@ -458,12 +441,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
 
     Object.keys(state.form).forEach((field) => {
       switch (field) {
-        case "symptoms":
-          if (!state.form[field] || !state.form[field].length) {
-            errors[field] = "Please select the symptoms";
-            invalidForm = true;
-          }
-          return;
         case "category":
           if (!state.form[field]) {
             errors[field] = "Please select a category";
@@ -492,18 +469,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
             invalidForm = true;
           }
           return;
-        case "other_symptoms":
-          if (isOtherSymptomsSelected && !state.form[field]) {
-            errors[field] = "Please enter the other symptom details";
-            invalidForm = true;
-          }
-          return;
-        case "symptoms_onset_date":
-          if (hasSymptoms && !state.form[field]) {
-            errors[field] = "Please enter date of onset of the above symptoms";
-            invalidForm = true;
-          }
-          return;
         case "encounter_date":
           if (!state.form[field]) {
             errors[field] = "Field is required";
@@ -524,6 +489,17 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
             invalidForm = true;
           }
           return;
+        case "create_symptoms":
+          if (
+            !isUpdate &&
+            !state.form.is_asymptomatic &&
+            state.form[field].length === 0
+          ) {
+            errors[field] =
+              "Symptoms needs to be added as the patient is symptomatic";
+            invalidForm = true;
+          }
+          return;
         case "death_datetime":
           if (state.form.suggestion === "DD" && !state.form[field]) {
             errors[field] = "Please enter the date & time of death";
@@ -702,13 +678,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
     if (validated) {
       setIsLoading(true);
       const data: any = {
-        symptoms: state.form.symptoms,
-        other_symptoms: isOtherSymptomsSelected
-          ? state.form.other_symptoms
-          : undefined,
-        symptoms_onset_date: hasSymptoms
-          ? state.form.symptoms_onset_date
-          : undefined,
         suggestion: state.form.suggestion,
         route_to_facility: state.form.route_to_facility,
         admitted: state.form.suggestion === "A",
@@ -721,6 +690,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         treatment_plan: state.form.treatment_plan,
         discharge_date: state.form.discharge_date,
         create_diagnoses: isUpdate ? undefined : state.form.create_diagnoses,
+        create_symptoms: isUpdate ? undefined : state.form.create_symptoms,
         treating_physician: state.form.treating_physician,
         investigation: state.form.InvestigationAdvice,
         procedure: state.form.procedure,
@@ -769,7 +739,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         height: Number(state.form.height),
         bed: bed && bed instanceof Array ? bed[0]?.id : bed?.id,
         patient_no: state.form.patient_no || null,
-        consent_records: state.form.consent_records || [],
       };
 
       const { data: obj } = await request(
@@ -917,64 +886,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
     };
   };
 
-  const handleConsentTypeChange: FieldChangeEventHandler<number> = async (
-    event,
-  ) => {
-    if (!id) return;
-    const consentRecords = [...state.form.consent_records];
-    if (
-      consentRecords
-        .filter((cr) => cr.deleted !== true)
-        .map((cr) => cr.type)
-        .includes(event.value)
-    ) {
-      return;
-    } else {
-      const randomId = "consent-" + new Date().getTime().toString();
-      const newRecords = [
-        ...consentRecords,
-        { id: randomId, type: event.value },
-      ];
-      await request(routes.partialUpdateConsultation, {
-        pathParams: { id },
-        body: { consent_records: newRecords },
-      });
-      dispatch({
-        type: "set_form",
-        form: { ...state.form, consent_records: newRecords },
-      });
-    }
-  };
-
-  const handleConsentPCSChange: FieldChangeEventHandler<number> = (event) => {
-    dispatch({
-      type: "set_form",
-      form: {
-        ...state.form,
-        consent_records: state.form.consent_records.map((cr) =>
-          cr.type === 2 ? { ...cr, patient_code_status: event.value } : cr,
-        ),
-      },
-    });
-  };
-
-  const handleDeleteConsent = async () => {
-    const consent_id = showDeleteConsent;
-    if (!consent_id || !id) return;
-    const newRecords = state.form.consent_records.map((cr) =>
-      cr.id === consent_id ? { ...cr, deleted: true } : cr,
-    );
-    await request(routes.partialUpdateConsultation, {
-      pathParams: { id },
-      body: { consent_records: newRecords },
-    });
-    dispatch({
-      type: "set_form",
-      form: { ...state.form, consent_records: newRecords },
-    });
-    setShowDeleteConsent(null);
-  };
-
   return (
     <div className="relative flex flex-col pb-2">
       <PageTitle
@@ -992,14 +903,16 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
       />
 
       <div className="top-0 mt-5 flex grow-0 sm:mx-12">
-        <div className="fixed hidden h-full w-72 flex-col xl:flex">
+        <div className="fixed hidden w-72 flex-col xl:flex">
           {Object.keys(sections).map((sectionTitle) => {
-            if (
-              !isUpdate &&
-              ["Bed Status", "Consent Records"].includes(sectionTitle)
-            ) {
+            if (!isUpdate && ["Bed Status"].includes(sectionTitle)) {
+              return null;
+            }
+
+            if (isUpdate && sectionTitle === "Bed Status") {
               return null;
             }
+
             const isCurrent = currentSection === sectionTitle;
             const section = sections[sectionTitle as ConsultationFormSection];
             return (
@@ -1105,41 +1018,48 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
                     </div>
                   )}
 
-                  <div className="col-span-6" ref={fieldRef["symptoms"]}>
-                    <SymptomsSelect
-                      required
-                      label="Symptoms"
-                      {...field("symptoms")}
-                    />
-                  </div>
-                  {isOtherSymptomsSelected && (
-                    <div
-                      className="col-span-6"
-                      ref={fieldRef["other_symptoms"]}
-                    >
-                      <TextAreaFormField
-                        {...field("other_symptoms")}
-                        label="Other symptom details"
-                        required
-                        placeholder="Enter details of other symptoms here"
-                      />
-                    </div>
-                  )}
+                  <div
+                    className="col-span-6"
+                    id="symptoms"
+                    ref={fieldRef["create_symptoms"]}
+                  >
+                    <div className="mb-4 flex flex-col gap-4">
+                      <FieldLabel required>Symptoms</FieldLabel>
 
-                  {hasSymptoms && (
-                    <div
-                      className="col-span-6"
-                      ref={fieldRef["symptoms_onset_date"]}
-                    >
-                      <DateFormField
-                        {...field("symptoms_onset_date")}
-                        disableFuture
-                        required
-                        label="Date of onset of the symptoms"
-                        position="LEFT"
-                      />
+                      {!isUpdate && (
+                        <CheckBoxFormField
+                          className="-mt-2 ml-1"
+                          {...field("is_asymptomatic")}
+                          value={state.form.is_asymptomatic}
+                          label="Is the patient Asymptomatic?"
+                          errorClassName="hidden"
+                        />
+                      )}
+
+                      <div
+                        className={classNames(
+                          state.form.is_asymptomatic &&
+                            "pointer-events-none opacity-50",
+                        )}
+                      >
+                        {isUpdate ? (
+                          <EncounterSymptomsBuilder />
+                        ) : (
+                          <CreateSymptomsBuilder
+                            value={state.form.create_symptoms}
+                            onChange={(symptoms) => {
+                              handleFormFieldChange({
+                                name: "create_symptoms",
+                                value: symptoms,
+                              });
+                            }}
+                          />
+                        )}
+                        <FieldErrorText error={state.errors.create_symptoms} />
+                      </div>
                     </div>
-                  )}
+                  </div>
+
                   <div
                     className="col-span-6"
                     ref={fieldRef["history_of_present_illness"]}
@@ -1350,7 +1270,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
                     </div>
                   )}
 
-                  {["A", "DC"].includes(state.form.suggestion) && !isUpdate && (
+                  {state.form.suggestion === "A" && !isUpdate && (
                     <div className="col-span-6 mb-6" ref={fieldRef["bed"]}>
                       <FieldLabel>Bed</FieldLabel>
                       <BedSelect
@@ -1551,118 +1471,6 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
                     </>
                   )}
                 </div>
-                {id && (
-                  <>
-                    <div className="flex flex-col gap-4 pb-4">
-                      {sectionTitle("Consent Records", true)}
-                    </div>
-                    <ConfirmDialog
-                      show={showDeleteConsent !== null}
-                      onClose={() => setShowDeleteConsent(null)}
-                      onConfirm={handleDeleteConsent}
-                      action="Delete"
-                      variant="danger"
-                      description={
-                        "Are you sure you want to delete this consent record?"
-                      }
-                      title="Delete Consent"
-                      className="w-auto"
-                    />
-                    <SelectFormField
-                      {...selectField("consent_type")}
-                      onChange={handleConsentTypeChange}
-                      label="Add Consent Type"
-                      options={CONSENT_TYPE_CHOICES.filter(
-                        (c) =>
-                          !state.form.consent_records
-                            .filter((r) => r.deleted !== true)
-                            .map((record) => record.type)
-                            .includes(c.id),
-                      )}
-                    />
-                    <div className="flex flex-col gap-4">
-                      {state.form.consent_records
-                        .filter((record) => record.deleted !== true)
-                        .map((record, index) => (
-                          <div
-                            className="overflow-hidden rounded-xl border border-gray-300 bg-gray-100"
-                            key={index}
-                          >
-                            <div className="flex items-center justify-between bg-gray-200 p-4">
-                              <button
-                                type="button"
-                                className="font-bold"
-                                onClick={() =>
-                                  setCollapsedConsentRecords((prev) =>
-                                    prev.includes(record.type)
-                                      ? prev.filter((r) => r !== record.type)
-                                      : [...prev, record.type],
-                                  )
-                                }
-                              >
-                                <CareIcon
-                                  icon={
-                                    collapsedConsentRecords.includes(
-                                      record.type,
-                                    )
-                                      ? "l-arrow-down"
-                                      : "l-arrow-up"
-                                  }
-                                  className="mr-2"
-                                />
-                                {
-                                  CONSENT_TYPE_CHOICES.find(
-                                    (c) => c.id === record.type,
-                                  )?.text
-                                }
-                              </button>
-                              <button
-                                className="text-red-400"
-                                type="button"
-                                onClick={() => {
-                                  setShowDeleteConsent(record.id);
-                                }}
-                              >
-                                <CareIcon
-                                  icon="l-trash-alt"
-                                  className="h-4 w-4"
-                                />
-                              </button>
-                            </div>
-                            <div
-                              className={`${
-                                collapsedConsentRecords.includes(record.type)
-                                  ? "hidden"
-                                  : ""
-                              }`}
-                            >
-                              <div className="px-4 pt-4">
-                                {record.type === 2 && (
-                                  <SelectFormField
-                                    {...selectField("consent_type")}
-                                    onChange={handleConsentPCSChange}
-                                    label="Patient Code Status"
-                                    value={record.patient_code_status}
-                                    options={
-                                      CONSENT_PATIENT_CODE_STATUS_CHOICES
-                                    }
-                                  />
-                                )}
-                              </div>
-                              <FileUpload
-                                changePageMetadata={false}
-                                type="CONSENT_RECORD"
-                                hideBack
-                                unspecified
-                                className="w-full"
-                                consentId={record.id}
-                              />
-                            </div>
-                          </div>
-                        ))}
-                    </div>
-                  </>
-                )}
                 <div className="mt-6 flex flex-col justify-end gap-3 sm:flex-row">
                   <Cancel
                     onClick={() =>
@@ -1678,7 +1486,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
                 </div>
               </div>
             </form>
-            {isUpdate && (
+            {state.form.suggestion === "A" && isUpdate && (
               <>
                 <div className="mx-auto mt-4 max-w-4xl rounded bg-white px-11 py-8">
                   {sectionTitle("Bed Status")}
diff --git a/src/Components/Facility/Consultations/Beds.res b/src/Components/Facility/Consultations/Beds.res
new file mode 100644
index 00000000000..6e356172147
--- /dev/null
+++ b/src/Components/Facility/Consultations/Beds.res
@@ -0,0 +1,18 @@
+type reactClass
+module Beds = {
+  @module("./Beds.tsx") @react.component
+  external make: (
+    ~facilityId: string,
+    ~patientId: string,
+    ~consultationId: string,
+    ~setState: unit => unit,
+  ) => React.element = "default"
+}
+
+@react.component
+let make = (
+  ~facilityId: string,
+  ~patientId: string,
+  ~consultationId: string,
+  ~setState: unit => unit,
+) => <Beds facilityId patientId consultationId setState />
diff --git a/src/Components/Facility/Consultations/Beds.tsx b/src/Components/Facility/Consultations/Beds.tsx
index 9803be81e76..f4363411ef9 100644
--- a/src/Components/Facility/Consultations/Beds.tsx
+++ b/src/Components/Facility/Consultations/Beds.tsx
@@ -251,8 +251,10 @@ const Beds = (props: BedsProps) => {
             loading={loading}
           />
         ) : (
-          <div className="bg-primary-100 py-2 text-center">
-            No beds allocated yet
+          <div className="flex w-full justify-center border-2 border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
+            <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700">
+              No beds allocated yet
+            </span>
           </div>
         )}
       </div>
diff --git a/src/Components/Facility/PatientConsultationNotesList.tsx b/src/Components/Facility/PatientConsultationNotesList.tsx
index e7e0bb25504..f81ef122f6c 100644
--- a/src/Components/Facility/PatientConsultationNotesList.tsx
+++ b/src/Components/Facility/PatientConsultationNotesList.tsx
@@ -26,6 +26,7 @@ const PatientConsultationNotesList = (props: PatientNotesProps) => {
 
   const fetchNotes = async () => {
     setIsLoading(true);
+
     const { data } = await request(routes.getPatientNotes, {
       pathParams: {
         patientId: props.state.patientId || "",
@@ -80,7 +81,7 @@ const PatientConsultationNotesList = (props: PatientNotesProps) => {
     }
   };
 
-  if (isLoading && !state.notes.length) {
+  if (isLoading) {
     return (
       <div className="flex h-full w-full items-center justify-center bg-white">
         <CircularProgress />
diff --git a/src/Components/Facility/PatientNotesList.tsx b/src/Components/Facility/PatientNotesList.tsx
index 9585ace5db7..4e1d0a5a7a6 100644
--- a/src/Components/Facility/PatientNotesList.tsx
+++ b/src/Components/Facility/PatientNotesList.tsx
@@ -74,7 +74,7 @@ const PatientNotesList = (props: PatientNotesProps) => {
     }
   };
 
-  if (isLoading && !state.notes.length) {
+  if (isLoading) {
     return (
       <div className="flex h-full w-full items-center justify-center bg-white">
         <CircularProgress />
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 49a2f1346af..8e54f0896bc 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -1,4 +1,6 @@
 import {
+  CONSENT_PATIENT_CODE_STATUS_CHOICES,
+  CONSENT_TYPE_CHOICES,
   ConsultationSuggestionValue,
   DISCHARGE_REASONS,
   PATIENT_NOTES_THREADS,
@@ -11,8 +13,8 @@ import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types";
 import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import { AssignedToObjectModel, DailyRoundsModel } from "../Patient/models";
+import { EncounterSymptom } from "../Symptoms/types";
 import { UserBareMinimum } from "../Users/models";
-import { ConsentRecord } from "./ConsultationForm";
 
 export interface LocalBodyModel {
   id: number;
@@ -97,6 +99,13 @@ export interface OptionsType {
 
 export type PatientCategory = "Comfort Care" | "Mild" | "Moderate" | "Critical";
 
+export type ConsentRecord = {
+  id: string;
+  type: (typeof CONSENT_TYPE_CHOICES)[number]["id"];
+  patient_code_status?: (typeof CONSENT_PATIENT_CODE_STATUS_CHOICES)[number]["id"];
+  deleted?: boolean;
+};
+
 export interface ConsultationModel {
   encounter_date: string;
   icu_admission_date?: string;
@@ -116,7 +125,6 @@ export interface ConsultationModel {
   facility_name?: string;
   id: string;
   modified_date?: string;
-  other_symptoms?: string;
   patient: string;
   treatment_plan?: string;
   referred_to?: FacilityModel["id"];
@@ -135,13 +143,12 @@ export interface ConsultationModel {
   kasp_enabled_date?: string;
   readonly diagnoses?: ConsultationDiagnosis[];
   create_diagnoses?: CreateDiagnosis[]; // Used for bulk creating diagnoses upon consultation creation
+  readonly symptoms?: EncounterSymptom[];
+  create_symptoms?: CreateDiagnosis[]; // Used for bulk creating symptoms upon consultation creation
   deprecated_verified_by?: string;
-  treating_physician?: UserBareMinimum["id"];
+  readonly treating_physician?: UserBareMinimum["id"];
   treating_physician_object?: UserBareMinimum;
   suggestion_text?: string;
-  symptoms?: Array<number>;
-  symptoms_text?: string;
-  symptoms_onset_date?: string;
   consultation_notes?: string;
   is_telemedicine?: boolean;
   procedure?: ProcedureType[];
diff --git a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
index bed6a41f3c0..3bdbffdc6cb 100644
--- a/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
+++ b/src/Components/Form/FormFields/AutocompleteMultiselect.tsx
@@ -84,7 +84,7 @@ export const AutocompleteMutliSelect = <T, V>(
     return {
       option,
       label,
-      description: props.optionDescription && props.optionDescription(option),
+      description: props.optionDescription?.(option),
       search: label.toLowerCase(),
       value: (props.optionValue ? props.optionValue(option) : option) as V,
     };
diff --git a/src/Components/Form/SearchInput.tsx b/src/Components/Form/SearchInput.tsx
index e64aad207d1..2d146837ebf 100644
--- a/src/Components/Form/SearchInput.tsx
+++ b/src/Components/Form/SearchInput.tsx
@@ -80,7 +80,7 @@ const SearchInput = ({
         props.trailing ||
         (!props.secondary && (
           <div className="absolute inset-y-0 right-0 hidden py-1.5 pr-1.5 md:flex">
-            <kbd className="inline-flex items-center rounded border border-gray-200 px-2 font-sans text-sm font-medium text-gray-500">
+            <kbd className="inline-flex items-center rounded border border-gray-200 bg-white px-2 font-sans text-sm font-medium text-gray-500 focus:opacity-0">
               {shortcutKeyIcon}
             </kbd>
           </div>
@@ -88,7 +88,7 @@ const SearchInput = ({
       }
       trailingFocused={
         <div className="absolute inset-y-0 right-0 hidden gap-1 py-1.5 pr-1.5 md:flex">
-          <kbd className="inline-flex items-center rounded border border-gray-200 px-2 font-sans text-sm font-medium text-gray-500">
+          <kbd className="inline-flex items-center rounded border border-gray-200 bg-white px-2 font-sans text-sm font-medium text-gray-500">
             Esc
           </kbd>
         </div>
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
index 4fc7a97f56b..13f5191f429 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -14,6 +14,7 @@ import CareIcon from "../../../CAREUI/icons/CareIcon";
 import EditPrescriptionForm from "../EditPrescriptionForm";
 import AdministrationEventSeperator from "./AdministrationEventSeperator";
 import AdministrationEventCell from "./AdministrationEventCell";
+import { AuthorizedForConsultationRelatedActions } from "../../../CAREUI/misc/AuthorizedChild";
 
 interface Props {
   prescription: Prescription;
@@ -93,46 +94,48 @@ export default function MedicineAdministrationTableRow({
                 onClick={() => setShowDetails(false)}
                 label={t("close")}
               />
-              {!props.readonly && (
-                <>
-                  <Submit
-                    disabled={
-                      prescription.discontinued ||
-                      prescription.prescription_type === "DISCHARGE"
-                    }
-                    variant="danger"
-                    onClick={() => setShowDiscontinue(true)}
-                  >
-                    <CareIcon icon="l-ban" className="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 ||
-                      prescription.prescription_type === "DISCHARGE"
-                    }
-                    onClick={() => setShowAdminister(true)}
-                  >
-                    <CareIcon icon="l-syringe" className="text-lg" />
-                    {t("administer")}
-                  </Submit>
-                </>
-              )}
+              <AuthorizedForConsultationRelatedActions>
+                {!props.readonly && (
+                  <>
+                    <Submit
+                      disabled={
+                        prescription.discontinued ||
+                        prescription.prescription_type === "DISCHARGE"
+                      }
+                      variant="danger"
+                      onClick={() => setShowDiscontinue(true)}
+                    >
+                      <CareIcon icon="l-ban" className="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 ||
+                        prescription.prescription_type === "DISCHARGE"
+                      }
+                      onClick={() => setShowAdminister(true)}
+                    >
+                      <CareIcon icon="l-syringe" className="text-lg" />
+                      {t("administer")}
+                    </Submit>
+                  </>
+                )}
+              </AuthorizedForConsultationRelatedActions>
             </div>
           </div>
         </DialogModal>
@@ -252,18 +255,20 @@ export default function MedicineAdministrationTableRow({
 
         {/* Action Buttons */}
         <td className="space-x-1 pr-2 text-right">
-          {!props.readonly && (
-            <ButtonV2
-              type="button"
-              size="small"
-              disabled={prescription.discontinued}
-              ghost
-              border
-              onClick={() => setShowAdminister(true)}
-            >
-              {t("administer")}
-            </ButtonV2>
-          )}
+          <AuthorizedForConsultationRelatedActions>
+            {!props.readonly && (
+              <ButtonV2
+                type="button"
+                size="small"
+                disabled={prescription.discontinued}
+                ghost
+                border
+                onClick={() => setShowAdminister(true)}
+              >
+                {t("administer")}
+              </ButtonV2>
+            )}
+          </AuthorizedForConsultationRelatedActions>
         </td>
       </tr>
     </>
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index c1917cef41d..59d3976d763 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -13,6 +13,7 @@ import useRangePagination from "../../../Common/hooks/useRangePagination";
 import MedicineAdministrationTable from "./AdministrationTable";
 import Loading from "../../Common/Loading";
 import ScrollOverlay from "../../../CAREUI/interactive/ScrollOverlay";
+import { AuthorizedForConsultationRelatedActions } from "../../../CAREUI/misc/AuthorizedChild";
 
 interface Props {
   readonly?: boolean;
@@ -89,7 +90,7 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
         options={
           !readonly &&
           !!data?.results && (
-            <>
+            <AuthorizedForConsultationRelatedActions>
               <ButtonV2
                 id="edit-prescription"
                 variant="secondary"
@@ -107,7 +108,7 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
                 prescriptions={data.results}
                 onDone={() => refetch()}
               />
-            </>
+            </AuthorizedForConsultationRelatedActions>
           )
         }
       />
diff --git a/src/Components/Medicine/MedicinePrescriptionSummary.tsx b/src/Components/Medicine/MedicinePrescriptionSummary.tsx
new file mode 100644
index 00000000000..b77acc090c4
--- /dev/null
+++ b/src/Components/Medicine/MedicinePrescriptionSummary.tsx
@@ -0,0 +1,372 @@
+import MedicineRoutes from "../Medicine/routes";
+import useQuery from "../../Utils/request/useQuery";
+import DialogModal from "../Common/Dialog";
+import { useState } from "react";
+import { lazy } from "react";
+import Timeline, { TimelineNode } from "../../CAREUI/display/Timeline";
+import { MedibaseMedicine, Prescription } from "../Medicine/models";
+import { useTranslation } from "react-i18next";
+
+const Loading = lazy(() => import("../Common/Loading"));
+
+interface MedicinePrescriptionSummaryProps {
+  consultation: string;
+}
+
+export const MedicinePrescriptionSummary = ({
+  consultation,
+}: MedicinePrescriptionSummaryProps) => {
+  const { t } = useTranslation();
+  const [showMedicineModal, setShowMedicineModal] = useState({
+    open: false,
+    name: "",
+    medicineId: "",
+  });
+  const { data } = useQuery(MedicineRoutes.listPrescriptions, {
+    pathParams: { consultation },
+    query: { limit: 100 },
+  });
+
+  const closeMedicineModal = () => {
+    setShowMedicineModal({ ...showMedicineModal, open: false });
+  };
+
+  function extractUniqueMedicineObjects(
+    prescriptions: Prescription[],
+  ): MedibaseMedicine[] {
+    const uniqueMedicineObjects: Set<string> = new Set();
+    const uniqueMedicines: MedibaseMedicine[] = [];
+
+    prescriptions.forEach((prescription: Prescription) => {
+      if (prescription?.medicine_object) {
+        const medicineId = prescription?.medicine_object.id;
+
+        if (!uniqueMedicineObjects.has(medicineId)) {
+          uniqueMedicineObjects.add(medicineId);
+          uniqueMedicines.push(prescription?.medicine_object);
+        }
+      }
+    });
+
+    return uniqueMedicines;
+  }
+
+  const medicinesList: MedibaseMedicine[] = extractUniqueMedicineObjects(
+    data?.results ?? [],
+  );
+
+  return (
+    <div className="pt-6">
+      <p className="text-xl font-bold text-gray-700">{t("summary")}</p>
+      <div className="flex flex-col gap-2 pt-4">
+        {medicinesList && medicinesList.length > 0 ? (
+          medicinesList?.map((med: MedibaseMedicine) => (
+            <div
+              key={med.id}
+              className="flex cursor-pointer items-center justify-between rounded-lg border bg-white p-4 shadow hover:bg-gray-200"
+            >
+              <div>{med.name}</div>
+              <button
+                onClick={() =>
+                  setShowMedicineModal({
+                    open: true,
+                    name: med.name,
+                    medicineId: med.id,
+                  })
+                }
+                className="btn btn-default"
+              >
+                View
+              </button>
+            </div>
+          ))
+        ) : (
+          <div className="rounded-lg border shadow">
+            <div className="my-16 flex w-full flex-col items-center justify-center gap-4 text-gray-500">
+              <h3 className="text-lg font-medium">{"No Medicine Summary"}</h3>
+            </div>
+          </div>
+        )}
+      </div>
+
+      <DialogModal
+        title={
+          <p>
+            {showMedicineModal.name}: {t("prescription_logs")}
+          </p>
+        }
+        show={showMedicineModal.open}
+        onClose={closeMedicineModal}
+        fixedWidth={false}
+        className="md:w-3/4"
+      >
+        <ConsultationMedicineLogs
+          consultationId={consultation}
+          medicineId={showMedicineModal.medicineId}
+        />
+      </DialogModal>
+    </div>
+  );
+};
+
+interface ConsultationMedicineLogsProps {
+  consultationId: string;
+  medicineId: string;
+}
+
+export default function ConsultationMedicineLogs({
+  consultationId,
+  medicineId,
+}: ConsultationMedicineLogsProps) {
+  const { data, loading } = useQuery(MedicineRoutes.listPrescriptions, {
+    pathParams: { consultation: consultationId },
+    query: {
+      medicine: medicineId,
+    },
+  });
+
+  if (loading) {
+    return <Loading />;
+  }
+
+  const getDetailsMessage = (prescription: Prescription) => {
+    const message = `Details: ${
+      prescription.base_dosage != null
+        ? `${prescription.dosage_type === "TITRATED" ? "Start Dosage" : "Dosage"}: ${prescription.base_dosage}, `
+        : ""
+    }${prescription.route != null ? `Route: ${prescription.route}, ` : ""}${
+      prescription.target_dosage != null
+        ? `Target Dosage: ${prescription.target_dosage}, `
+        : ""
+    }${
+      prescription.instruction_on_titration != null
+        ? `Instruction on Titration: ${prescription.instruction_on_titration}, `
+        : ""
+    }${
+      prescription.frequency != null
+        ? `Frequency: ${prescription.frequency}, `
+        : ""
+    }${prescription.days != null ? `Days: ${prescription.days}, ` : ""}${
+      prescription.indicator != null
+        ? `Indicator: ${prescription.indicator}, `
+        : ""
+    }${
+      prescription.max_dosage != null
+        ? `Max Dosage: ${prescription.max_dosage}, `
+        : ""
+    }${
+      prescription.min_hours_between_doses != null
+        ? `Min Hours Between Doses: ${prescription.min_hours_between_doses}, `
+        : ""
+    }${prescription.discontinued ? "Discontinued: Yes, " : ""}${
+      prescription.dosage_type
+        ? `Prescription Type: ${prescription.dosage_type}, `
+        : ""
+    }`.replace(/, $/, "");
+
+    return message;
+  };
+
+  const calculateChanges = (prescriptions: Prescription[]) => {
+    prescriptions = prescriptions.reverse();
+    const changes = [];
+
+    const message = getDetailsMessage(prescriptions[0]);
+
+    changes.push({
+      prescriptionId: prescriptions[0].id,
+      changeMessage: message,
+      prescribed_by: prescriptions[0].prescribed_by,
+      created_date: prescriptions[0].created_date,
+    });
+
+    if (prescriptions[0].discontinued) {
+      changes.push({
+        prescriptionId: prescriptions[0].id,
+        changeMessage: "This prescription has been discontinued",
+        prescribed_by: prescriptions[0].prescribed_by,
+        created_date: prescriptions[0].discontinued_date,
+      });
+    }
+
+    for (let i = 1; i < prescriptions.length; i++) {
+      const prevPrescription = prescriptions[i - 1];
+      const currentPrescription = prescriptions[i];
+
+      const changesForPrescription: string[] = [];
+
+      // Check for changes in base dosage
+      if (prevPrescription.base_dosage !== currentPrescription.base_dosage) {
+        changesForPrescription.push(
+          `Base dosage changed to ${currentPrescription.base_dosage} from ${prevPrescription.base_dosage}`,
+        );
+      }
+
+      // Check for changes in route
+      if (prevPrescription.route !== currentPrescription.route) {
+        changesForPrescription.push(
+          `Route changed to ${
+            currentPrescription.route ?? "Not specified"
+          } from ${prevPrescription.route ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in dosage type
+      if (prevPrescription.dosage_type !== currentPrescription.dosage_type) {
+        changesForPrescription.push(
+          `Dosage type changed to ${
+            currentPrescription.dosage_type ?? "Not specified"
+          } from ${prevPrescription.dosage_type ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in target dosage
+      if (
+        prevPrescription.target_dosage !== currentPrescription.target_dosage
+      ) {
+        changesForPrescription.push(
+          `Target dosage changed to ${
+            currentPrescription.target_dosage ?? "Not specified"
+          } from ${prevPrescription.target_dosage ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in instruction on titration
+      if (
+        prevPrescription.instruction_on_titration !==
+        currentPrescription.instruction_on_titration
+      ) {
+        changesForPrescription.push(
+          `Instruction on titration changed to ${
+            currentPrescription.instruction_on_titration ?? "Not specified"
+          } from ${
+            prevPrescription.instruction_on_titration ?? "Not specified"
+          }`,
+        );
+      }
+
+      // Check for changes in frequency
+      if (prevPrescription.frequency !== currentPrescription.frequency) {
+        changesForPrescription.push(
+          `Frequency changed to ${
+            currentPrescription.frequency ?? "Not specified"
+          } from ${prevPrescription.frequency ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in days
+      if (prevPrescription.days !== currentPrescription.days) {
+        changesForPrescription.push(
+          `Days changed to ${
+            currentPrescription.days ?? "Not specified"
+          } from ${prevPrescription.days ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in indicator
+      if (prevPrescription.indicator !== currentPrescription.indicator) {
+        changesForPrescription.push(
+          `Indicator changed to ${
+            currentPrescription.indicator ?? "Not specified"
+          } from ${prevPrescription.indicator ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in max dosage
+      if (prevPrescription.max_dosage !== currentPrescription.max_dosage) {
+        changesForPrescription.push(
+          `Max dosage changed to ${
+            currentPrescription.max_dosage ?? "Not specified"
+          } from ${prevPrescription.max_dosage ?? "Not specified"}`,
+        );
+      }
+
+      // Check for changes in min hours between doses
+      if (
+        prevPrescription.min_hours_between_doses !==
+        currentPrescription.min_hours_between_doses
+      ) {
+        changesForPrescription.push(
+          `Min hours between doses changed to ${
+            currentPrescription.min_hours_between_doses ?? "Not specified"
+          } from ${prevPrescription.min_hours_between_doses ?? "Not specified"}`,
+        );
+      }
+
+      // Check if discontinued
+      if (currentPrescription.discontinued && !prevPrescription.discontinued) {
+        changesForPrescription.push("Prescription was discontinued");
+      }
+
+      // Check if prescription type is changed
+      if (
+        prevPrescription.prescription_type !==
+        currentPrescription.prescription_type
+      ) {
+        changesForPrescription.push(
+          `Prescription Type changed from ${prevPrescription.prescription_type} to ${currentPrescription.prescription_type}`,
+        );
+      }
+
+      // If there are changes, add them to the changes array
+      if (changesForPrescription.length > 0 && !prevPrescription.discontinued) {
+        const message = `Changes: ${changesForPrescription.join(", ")}`;
+        changes.push({
+          prescriptionId: currentPrescription.id,
+          changeMessage: message,
+          prescribed_by: currentPrescription.prescribed_by,
+          created_date: currentPrescription.created_date,
+        });
+      } else {
+        // If no changes, just list out the details of the prescription
+        const message = getDetailsMessage(currentPrescription);
+
+        changes.push({
+          prescriptionId: currentPrescription.id,
+          changeMessage: message,
+          prescribed_by: currentPrescription.prescribed_by,
+          created_date: currentPrescription.created_date,
+        });
+      }
+
+      if (currentPrescription.discontinued) {
+        changes.push({
+          prescriptionId: currentPrescription.id,
+          changeMessage: "This prescription has been discontinued",
+          prescribed_by: currentPrescription.prescribed_by,
+          created_date: currentPrescription.discontinued_date,
+        });
+      }
+    }
+
+    return changes.reverse();
+  };
+
+  return (
+    <div>
+      <Timeline
+        className="rounded-lg bg-white p-2 shadow"
+        name={data?.results[0].medicine_object?.name ?? ""}
+      >
+        {data?.results &&
+          (() => {
+            const changesArray = calculateChanges(data?.results);
+            return changesArray.map((changes, index) => (
+              <TimelineNode
+                key={changes.prescriptionId}
+                event={{
+                  type: "prescribed",
+                  timestamp: changes.created_date,
+                  by: changes.prescribed_by,
+                  icon: "l-syringe",
+                }}
+                isLast={index === changesArray.length - 1}
+              >
+                <p>{changes?.changeMessage}</p>
+              </TimelineNode>
+            ));
+          })()}
+      </Timeline>
+    </div>
+  );
+}
diff --git a/src/Components/Medicine/PrescriptionBuilder.tsx b/src/Components/Medicine/PrescriptionBuilder.tsx
index d5388dfa44a..7833245135c 100644
--- a/src/Components/Medicine/PrescriptionBuilder.tsx
+++ b/src/Components/Medicine/PrescriptionBuilder.tsx
@@ -11,6 +11,8 @@ import { useTranslation } from "react-i18next";
 import useQuery from "../../Utils/request/useQuery";
 import MedicineRoutes from "./routes";
 import useSlug from "../../Common/hooks/useSlug";
+import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
+import { compareBy } from "../../Utils/utils";
 
 interface Props {
   prescription_type?: Prescription["prescription_type"];
@@ -65,30 +67,40 @@ export default function PrescriptionBuilder({
         />
       )}
       <div className="flex flex-col gap-3">
-        {data?.results.map((obj, index) => (
-          <PrescriptionDetailCard
-            key={index}
-            prescription={obj}
-            onDiscontinueClick={() => setShowDiscontinueFor(obj)}
-            onAdministerClick={() => setShowAdministerFor(obj)}
-            readonly={disabled}
-          />
-        ))}
+        {data?.results
+          .sort(compareBy("discontinued"))
+          ?.map((obj) => (
+            <PrescriptionDetailCard
+              key={obj.id}
+              prescription={obj}
+              collapsible
+              onDiscontinueClick={() => setShowDiscontinueFor(obj)}
+              onAdministerClick={() => setShowAdministerFor(obj)}
+              readonly={disabled}
+            />
+          ))}
       </div>
-      <ButtonV2
-        type="button"
-        onClick={() => setShowCreate(true)}
-        variant="secondary"
-        className="mt-4 w-full bg-gray-200 text-gray-700 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900"
-        disabled={disabled}
-      >
-        <div className="flex w-full justify-start gap-2" id="add-prescription">
-          <CareIcon icon="l-plus" className="text-lg" />
-          <span className="font-bold">
-            {t(is_prn ? "add_prn_prescription" : "add_prescription_medication")}
-          </span>
-        </div>
-      </ButtonV2>
+      <AuthorizedForConsultationRelatedActions>
+        <ButtonV2
+          type="button"
+          onClick={() => setShowCreate(true)}
+          variant="secondary"
+          className="mt-4 w-full bg-gray-200 text-gray-700 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-100 focus:text-gray-900"
+          disabled={disabled}
+        >
+          <div
+            className="flex w-full justify-start gap-2"
+            id="add-prescription"
+          >
+            <CareIcon icon="l-plus" className="text-lg" />
+            <span className="font-bold">
+              {t(
+                is_prn ? "add_prn_prescription" : "add_prescription_medication",
+              )}
+            </span>
+          </div>
+        </ButtonV2>
+      </AuthorizedForConsultationRelatedActions>
       {showCreate && (
         <DialogModal
           onClose={() => setShowCreate(false)}
diff --git a/src/Components/Medicine/PrescriptionDetailCard.tsx b/src/Components/Medicine/PrescriptionDetailCard.tsx
index 166408e6292..e70acc9b87a 100644
--- a/src/Components/Medicine/PrescriptionDetailCard.tsx
+++ b/src/Components/Medicine/PrescriptionDetailCard.tsx
@@ -5,19 +5,29 @@ import ReadMore from "../Common/components/Readmore";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { useTranslation } from "react-i18next";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
+import { useState } from "react";
+import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
 
-export default function PrescriptionDetailCard({
-  prescription,
-  ...props
-}: {
+interface Props {
   prescription: Prescription;
   readonly?: boolean;
   children?: React.ReactNode;
   onDiscontinueClick?: () => void;
   onAdministerClick?: () => void;
   selected?: boolean;
-}) {
+  collapsible?: boolean;
+}
+
+export default function PrescriptionDetailCard({
+  prescription,
+  collapsible = false,
+  ...props
+}: Props) {
   const { t } = useTranslation();
+  const [isCollapsed, setIsCollapsed] = useState(
+    collapsible && prescription.discontinued,
+  );
+
   return (
     <div
       className={classNames(
@@ -26,9 +36,17 @@ export default function PrescriptionDetailCard({
           ? "border-primary-500"
           : "border-spacing-2 border-dashed border-gray-500",
         prescription.discontinued && "bg-gray-200 opacity-80",
+        collapsible && "cursor-pointer hover:border-gray-900",
       )}
     >
-      <div className="flex flex-1 flex-col">
+      <div
+        className="flex flex-1 flex-col"
+        onClick={() => {
+          if (collapsible) {
+            setIsCollapsed(!isCollapsed);
+          }
+        }}
+      >
         <div>
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-4">
@@ -38,14 +56,21 @@ export default function PrescriptionDetailCard({
                   props.selected ? "text-black" : "text-gray-700",
                 )}
               >
-                {prescription.prescription_type === "DISCHARGE" &&
-                  `${t("discharge")} `}
-                {t(
-                  prescription.dosage_type === "PRN"
-                    ? "prn_prescription"
-                    : "prescription",
+                {isCollapsed ? (
+                  prescription.medicine_object?.name ??
+                  prescription.medicine_old
+                ) : (
+                  <>
+                    {prescription.prescription_type === "DISCHARGE" &&
+                      `${t("discharge")} `}
+                    {t(
+                      prescription.dosage_type === "PRN"
+                        ? "prn_prescription"
+                        : "prescription",
+                    )}
+                    {` #${prescription.id?.slice(-5)}`}
+                  </>
                 )}
-                {` #${prescription.id?.slice(-5)}`}
               </h3>
               {prescription.discontinued && (
                 <span className="rounded-full bg-gray-700 px-2 py-1 text-xs font-semibold uppercase text-white">
@@ -56,144 +81,152 @@ export default function PrescriptionDetailCard({
 
             {!props.readonly &&
               prescription.prescription_type !== "DISCHARGE" && (
-                <div className="flex flex-col-reverse items-end gap-2 sm:flex-row">
-                  <ButtonV2
-                    id="administer-medicine"
-                    disabled={prescription.discontinued}
-                    onClick={props.onAdministerClick}
-                    type="button"
-                    size="small"
-                    variant="secondary"
-                    ghost
-                    border
-                  >
-                    <CareIcon icon="l-syringe" className="text-base" />
-                    {t("administer")}
-                  </ButtonV2>
-                  <ButtonV2
-                    disabled={prescription.discontinued}
-                    type="button"
-                    size="small"
-                    variant="danger"
-                    ghost
-                    border
-                    onClick={props.onDiscontinueClick}
-                  >
-                    <CareIcon icon="l-ban" className="text-base" />
-                    {t("discontinue")}
-                  </ButtonV2>
-                </div>
+                <AuthorizedForConsultationRelatedActions>
+                  <div className="flex flex-col-reverse items-end gap-2 sm:flex-row">
+                    <ButtonV2
+                      id="administer-medicine"
+                      disabled={prescription.discontinued}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        props.onAdministerClick?.();
+                      }}
+                      type="button"
+                      size="small"
+                      variant="secondary"
+                      ghost
+                      border
+                    >
+                      <CareIcon icon="l-syringe" className="text-base" />
+                      {t("administer")}
+                    </ButtonV2>
+                    <ButtonV2
+                      disabled={prescription.discontinued}
+                      type="button"
+                      size="small"
+                      variant="danger"
+                      ghost
+                      border
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        props.onDiscontinueClick?.();
+                      }}
+                    >
+                      <CareIcon icon="l-ban" className="text-base" />
+                      {t("discontinue")}
+                    </ButtonV2>
+                  </div>
+                </AuthorizedForConsultationRelatedActions>
               )}
           </div>
         </div>
-
-        <div className="mt-4 grid grid-cols-10 items-center gap-2">
-          <Detail
-            className={
-              prescription.dosage_type === "TITRATED"
-                ? "col-span-10"
-                : "col-span-10 md:col-span-4"
-            }
-            label={t("medicine")}
-          >
-            {prescription.medicine_object?.name ?? prescription.medicine_old}
-          </Detail>
-          <Detail
-            className="col-span-10 break-all sm:col-span-4"
-            label={t("route")}
-          >
-            {prescription.route &&
-              t("PRESCRIPTION_ROUTE_" + prescription.route)}
-          </Detail>
-          {prescription.dosage_type === "TITRATED" ? (
-            <>
-              <Detail
-                className="col-span-5 sm:col-span-3"
-                label={t("start_dosage")}
-              >
-                {prescription.base_dosage}
-              </Detail>
-              <Detail
-                className="col-span-5 sm:col-span-3"
-                label={t("target_dosage")}
-              >
-                {prescription.target_dosage}
-              </Detail>
-            </>
-          ) : (
+        {!isCollapsed && (
+          <div className="mt-4 grid grid-cols-10 items-center gap-2">
             <Detail
-              className="col-span-10 sm:col-span-6 md:col-span-2"
-              label={t("dosage")}
+              className={
+                prescription.dosage_type === "TITRATED"
+                  ? "col-span-10"
+                  : "col-span-10 md:col-span-4"
+              }
+              label={t("medicine")}
             >
-              {prescription.base_dosage}
+              {prescription.medicine_object?.name ?? prescription.medicine_old}
             </Detail>
-          )}
-
-          {prescription.dosage_type === "PRN" ? (
-            <>
+            <Detail
+              className="col-span-10 break-all sm:col-span-4"
+              label={t("route")}
+            >
+              {prescription.route &&
+                t("PRESCRIPTION_ROUTE_" + prescription.route)}
+            </Detail>
+            {prescription.dosage_type === "TITRATED" ? (
+              <>
+                <Detail
+                  className="col-span-5 sm:col-span-3"
+                  label={t("start_dosage")}
+                >
+                  {prescription.base_dosage}
+                </Detail>
+                <Detail
+                  className="col-span-5 sm:col-span-3"
+                  label={t("target_dosage")}
+                >
+                  {prescription.target_dosage}
+                </Detail>
+              </>
+            ) : (
               <Detail
-                className="col-span-10 md:col-span-6"
-                label={t("indicator")}
+                className="col-span-10 sm:col-span-6 md:col-span-2"
+                label={t("dosage")}
               >
-                {prescription.indicator}
+                {prescription.base_dosage}
               </Detail>
+            )}
+
+            {prescription.dosage_type === "PRN" ? (
+              <>
+                <Detail
+                  className="col-span-10 md:col-span-6"
+                  label={t("indicator")}
+                >
+                  {prescription.indicator}
+                </Detail>
+                <Detail
+                  className="col-span-10 md:col-span-2"
+                  label={t("max_dosage_24_hrs")}
+                >
+                  {prescription.max_dosage}
+                </Detail>
+                <Detail
+                  className="col-span-10 md:col-span-2"
+                  label={t("min_time_bw_doses")}
+                >
+                  {prescription.min_hours_between_doses &&
+                    prescription.min_hours_between_doses + " hrs."}
+                </Detail>
+              </>
+            ) : (
+              <>
+                <Detail className="col-span-5" label={t("frequency")}>
+                  {prescription.frequency &&
+                    t(
+                      "PRESCRIPTION_FREQUENCY_" +
+                        prescription.frequency.toUpperCase(),
+                    )}
+                </Detail>
+                <Detail className="col-span-5" label={t("days")}>
+                  {prescription.days}
+                </Detail>
+              </>
+            )}
+
+            {prescription.instruction_on_titration && (
               <Detail
-                className="col-span-10 md:col-span-2"
-                label={t("max_dosage_24_hrs")}
+                className="col-span-10"
+                label={t("instruction_on_titration")}
               >
-                {prescription.max_dosage}
+                <ReadMore
+                  text={prescription.instruction_on_titration}
+                  minChars={120}
+                />
+              </Detail>
+            )}
+
+            {prescription.notes && (
+              <Detail className="col-span-10" label={t("notes")}>
+                <ReadMore text={prescription.notes} minChars={120} />
               </Detail>
+            )}
+
+            {prescription.discontinued && (
               <Detail
-                className="col-span-10 md:col-span-2"
-                label={t("min_time_bw_doses")}
+                className="col-span-10"
+                label={t("reason_for_discontinuation")}
               >
-                {prescription.min_hours_between_doses &&
-                  prescription.min_hours_between_doses + " hrs."}
+                {prescription.discontinued_reason}
               </Detail>
-            </>
-          ) : (
-            <>
-              <Detail className="col-span-5" label={t("frequency")}>
-                {prescription.frequency &&
-                  t(
-                    "PRESCRIPTION_FREQUENCY_" +
-                      prescription.frequency.toUpperCase(),
-                  )}
-              </Detail>
-              <Detail className="col-span-5" label={t("days")}>
-                {prescription.days}
-              </Detail>
-            </>
-          )}
-
-          {prescription.instruction_on_titration && (
-            <Detail
-              className="col-span-10"
-              label={t("instruction_on_titration")}
-            >
-              <ReadMore
-                text={prescription.instruction_on_titration}
-                minChars={120}
-              />
-            </Detail>
-          )}
-
-          {prescription.notes && (
-            <Detail className="col-span-10" label={t("notes")}>
-              <ReadMore text={prescription.notes} minChars={120} />
-            </Detail>
-          )}
-
-          {prescription.discontinued && (
-            <Detail
-              className="col-span-10"
-              label={t("reason_for_discontinuation")}
-            >
-              {prescription.discontinued_reason}
-            </Detail>
-          )}
-        </div>
-
+            )}
+          </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 font-medium">
             Prescribed
diff --git a/src/Components/Medicine/PrescriptionsTable.tsx b/src/Components/Medicine/PrescriptionsTable.tsx
index d61275c42c1..f842ccc654b 100644
--- a/src/Components/Medicine/PrescriptionsTable.tsx
+++ b/src/Components/Medicine/PrescriptionsTable.tsx
@@ -3,12 +3,8 @@ import ResponsiveMedicineTable from "./ResponsiveMedicineTables";
 import { formatDateTime } from "../../Utils/utils";
 import { Prescription } from "./models";
 import CareIcon from "../../CAREUI/icons/CareIcon";
-import ButtonV2, { Cancel, Submit } from "../Common/components/ButtonV2";
-import SlideOver from "../../CAREUI/interactive/SlideOver";
-import MedicineAdministration from "./MedicineAdministration";
-import DiscontinuePrescription from "./DiscontinuePrescription";
+import { Cancel } from "../Common/components/ButtonV2";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
-import AdministerMedicine from "./AdministerMedicine";
 import DialogModal from "../Common/Dialog";
 import PrescriptionDetailCard from "./PrescriptionDetailCard";
 import { useTranslation } from "react-i18next";
@@ -19,21 +15,14 @@ import MedicineRoutes from "./routes";
 interface Props {
   is_prn?: boolean;
   prescription_type?: Prescription["prescription_type"];
-  onChange?: () => void;
-  readonly?: boolean;
 }
 
 export default function PrescriptionsTable({
   is_prn = false,
   prescription_type = "REGULAR",
-  onChange,
-  readonly,
 }: Props) {
   const consultation = useSlug("consultation");
   const { t } = useTranslation();
-  const [showBulkAdminister, setShowBulkAdminister] = useState(false);
-  const [showDiscontinueFor, setShowDiscontinueFor] = useState<Prescription>();
-  const [showAdministerFor, setShowAdministerFor] = useState<Prescription>();
   const [detailedViewFor, setDetailedViewFor] = useState<Prescription>();
 
   const { data } = useQuery(MedicineRoutes.listPrescriptions, {
@@ -57,42 +46,6 @@ export default function PrescriptionsTable({
 
   return (
     <div>
-      {data?.results && (
-        <SlideOver
-          title={t("administer_medicines")}
-          dialogClass="w-full max-w-sm sm:max-w-md md:max-w-[1200px]"
-          open={showBulkAdminister}
-          setOpen={setShowBulkAdminister}
-        >
-          <MedicineAdministration
-            prescriptions={data?.results}
-            onDone={() => {
-              setShowBulkAdminister(false);
-              onChange?.();
-            }}
-          />
-        </SlideOver>
-      )}
-      {showDiscontinueFor && (
-        <DiscontinuePrescription
-          prescription={showDiscontinueFor}
-          onClose={(success) => {
-            setShowDiscontinueFor(undefined);
-            if (success) onChange?.();
-          }}
-          key={showDiscontinueFor.id}
-        />
-      )}
-      {showAdministerFor && (
-        <AdministerMedicine
-          prescription={showAdministerFor}
-          onClose={(success) => {
-            setShowAdministerFor(undefined);
-            if (success) onChange?.();
-          }}
-          key={showAdministerFor.id}
-        />
-      )}
       {detailedViewFor && (
         <DialogModal
           onClose={() => setDetailedViewFor(undefined)}
@@ -111,27 +64,6 @@ export default function PrescriptionsTable({
                 onClick={() => setDetailedViewFor(undefined)}
                 label={t("close")}
               />
-              <Submit
-                disabled={
-                  detailedViewFor.discontinued ||
-                  detailedViewFor.prescription_type === "DISCHARGE"
-                }
-                variant="danger"
-                onClick={() => setShowDiscontinueFor(detailedViewFor)}
-              >
-                <CareIcon icon="l-ban" className="text-lg" />
-                {t("discontinue")}
-              </Submit>
-              <Submit
-                disabled={
-                  detailedViewFor.discontinued ||
-                  detailedViewFor.prescription_type === "DISCHARGE"
-                }
-                onClick={() => setShowAdministerFor(detailedViewFor)}
-              >
-                <CareIcon icon="l-syringe" className="text-lg" />
-                {t("administer")}
-              </Submit>
             </div>
           </div>
         </DialogModal>
@@ -148,34 +80,6 @@ export default function PrescriptionsTable({
             </span>
           </div>
         </div>
-        {prescription_type === "REGULAR" && (
-          <div className="mt-2 flex w-full flex-col justify-end gap-2 sm:flex-row md:mt-0 md:w-auto">
-            <ButtonV2
-              disabled={readonly}
-              variant="secondary"
-              border
-              href="prescriptions"
-              className="w-full lg:w-auto"
-            >
-              <CareIcon icon="l-pen" className="text-lg" />
-              <span className="hidden lg:block">{t("edit_prescriptions")}</span>
-              <span className="block lg:hidden">{t("edit")}</span>
-            </ButtonV2>
-            <ButtonV2
-              disabled={readonly}
-              ghost
-              border
-              onClick={() => setShowBulkAdminister(true)}
-              className="w-full lg:w-auto"
-            >
-              <CareIcon icon="l-syringe" className="text-lg" />
-              <span className="hidden lg:block">
-                {t("administer_medicines")}
-              </span>
-              <span className="block lg:hidden">{t("administer")}</span>
-            </ButtonV2>
-          </div>
-        )}
       </div>
       <div className="flex flex-col">
         <div className="-my-2 overflow-x-auto py-2 sm:-mx-6 sm:px-6 lg:-mx-8 lg:px-8">
@@ -209,63 +113,6 @@ export default function PrescriptionsTable({
               }
               objectKeys={Object.values(tkeys)}
               fieldsToDisplay={[2, 3]}
-              actions={
-                !readonly
-                  ? (med: Prescription) => {
-                      if (med.prescription_type === "DISCHARGE") {
-                        return (
-                          <div className="flex w-full items-center justify-center gap-1 font-medium text-gray-700">
-                            <span className="text-sm">
-                              {t("discharge_prescription")}
-                            </span>
-                          </div>
-                        );
-                      }
-
-                      if (med.discontinued) {
-                        return (
-                          <div className="flex w-full items-center justify-center gap-1 font-medium text-gray-700">
-                            <CareIcon icon="l-ban" />
-                            <span className="text-sm">{t("discontinued")}</span>
-                          </div>
-                        );
-                      }
-
-                      return (
-                        <div className="flex gap-1">
-                          <ButtonV2
-                            type="button"
-                            size="small"
-                            variant="secondary"
-                            ghost
-                            border
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              setShowAdministerFor(med);
-                            }}
-                          >
-                            <CareIcon icon="l-syringe" className="text-base" />
-                            {t("administer")}
-                          </ButtonV2>
-                          <ButtonV2
-                            type="button"
-                            size="small"
-                            variant="danger"
-                            ghost
-                            border
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              setShowDiscontinueFor(med);
-                            }}
-                          >
-                            <CareIcon icon="l-ban" className="text-base" />
-                            {t("discontinue")}
-                          </ButtonV2>
-                        </div>
-                      );
-                    }
-                  : undefined
-              }
             />
             {data?.results.length === 0 && (
               <div className="text-semibold flex items-center justify-center py-2 text-gray-600">
diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx
index 9422d349b3a..f26957f63c6 100644
--- a/src/Components/Medicine/PrescrpitionTimeline.tsx
+++ b/src/Components/Medicine/PrescrpitionTimeline.tsx
@@ -15,6 +15,7 @@ import ConfirmDialog from "../Common/ConfirmDialog";
 import request from "../../Utils/request/request";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
 import CareIcon from "../../CAREUI/icons/CareIcon";
+import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
 
 interface MedicineAdministeredEvent extends TimelineEvent<"administered"> {
   administration: MedicineAdministrationRecord;
@@ -131,15 +132,17 @@ const MedicineAdministeredNode = ({
         actions={
           !event.cancelled &&
           !hideArchive && (
-            <ButtonV2
-              size="small"
-              border
-              ghost
-              variant="secondary"
-              onClick={() => setShowArchiveConfirmation(true)}
-            >
-              Archive
-            </ButtonV2>
+            <AuthorizedForConsultationRelatedActions>
+              <ButtonV2
+                size="small"
+                border
+                ghost
+                variant="secondary"
+                onClick={() => setShowArchiveConfirmation(true)}
+              >
+                Archive
+              </ButtonV2>
+            </AuthorizedForConsultationRelatedActions>
           )
         }
         isLast={isLastNode}
diff --git a/src/Components/Patient/DailyRoundListDetails.tsx b/src/Components/Patient/DailyRoundListDetails.tsx
index 3c5e70044ed..66536c986ca 100644
--- a/src/Components/Patient/DailyRoundListDetails.tsx
+++ b/src/Components/Patient/DailyRoundListDetails.tsx
@@ -1,5 +1,5 @@
 import { lazy, useState } from "react";
-import { CONSCIOUSNESS_LEVEL, SYMPTOM_CHOICES } from "../../Common/constants";
+import { CONSCIOUSNESS_LEVEL } from "../../Common/constants";
 import { DailyRoundsModel } from "./models";
 import Page from "../Common/components/Page";
 import ButtonV2 from "../Common/components/ButtonV2";
@@ -7,7 +7,6 @@ import { formatDateTime } from "../../Utils/utils";
 import useQuery from "../../Utils/request/useQuery";
 import routes from "../../Redux/api";
 const Loading = lazy(() => import("../Common/Loading"));
-const symptomChoices = [...SYMPTOM_CHOICES];
 
 export const DailyRoundListDetails = (props: any) => {
   const { facilityId, patientId, consultationId, id } = props;
@@ -21,16 +20,8 @@ export const DailyRoundListDetails = (props: any) => {
         const tdata: DailyRoundsModel = {
           ...data,
           temperature: Number(data.temperature) ? data.temperature : "",
-          additional_symptoms_text: "",
           medication_given: data.medication_given ?? [],
         };
-        if (data.additional_symptoms?.length) {
-          const symptoms = data.additional_symptoms.map((symptom: number) => {
-            const option = symptomChoices.find((i) => i.id === symptom);
-            return option ? option.text.toLowerCase() : symptom;
-          });
-          tdata.additional_symptoms_text = symptoms.join(", ");
-        }
         setDailyRoundListDetails(tdata);
       }
     },
@@ -85,12 +76,6 @@ export const DailyRoundListDetails = (props: any) => {
             <span className="font-semibold leading-relaxed">SpO2: </span>
             {dailyRoundListDetailsData.ventilator_spo2 ?? "-"}
           </div>
-          <div className="capitalize md:col-span-2">
-            <span className="font-semibold leading-relaxed">
-              Additional Symptoms:{" "}
-            </span>
-            {dailyRoundListDetailsData.additional_symptoms_text ?? "-"}
-          </div>
           <div className="capitalize md:col-span-2">
             <span className="font-semibold leading-relaxed">
               Admitted To *:{" "}
@@ -103,12 +88,6 @@ export const DailyRoundListDetails = (props: any) => {
             </span>
             {dailyRoundListDetailsData.physical_examination_info ?? "-"}
           </div>
-          <div className="md:col-span-2">
-            <span className="font-semibold leading-relaxed">
-              Other Symptoms:{" "}
-            </span>
-            {dailyRoundListDetailsData.other_symptoms ?? "-"}
-          </div>
           <div className="md:col-span-2">
             <span className="font-semibold leading-relaxed">
               Other Details:{" "}
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index d39d1feac7d..5675b56da6e 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -17,7 +17,6 @@ import { capitalize } from "lodash-es";
 import BloodPressureFormField, {
   BloodPressureValidator,
 } from "../Common/BloodPressureFormField";
-import { SymptomsSelect } from "../Common/SymptomsSelect";
 import TemperatureFormField from "../Common/TemperatureFormField";
 import { Cancel, Submit } from "../Common/components/ButtonV2";
 import Page from "../Common/components/Page";
@@ -44,11 +43,11 @@ import {
   ConditionVerificationStatuses,
   ConsultationDiagnosis,
 } from "../Diagnosis/types";
+import { EncounterSymptomsBuilder } from "../Symptoms/SymptomsBuilder";
+import { FieldLabel } from "../Form/FormFields/FormField";
 const Loading = lazy(() => import("../Common/Loading"));
 
 const initForm: any = {
-  additional_symptoms: [],
-  other_symptoms: "",
   physical_examination_info: "",
   other_details: "",
   patient_category: "",
@@ -135,7 +134,6 @@ export const DailyRounds = (props: any) => {
   const formFields = [
     "physical_examination_info",
     "other_details",
-    "additional_symptoms",
     "action",
     "review_interval",
     "bp",
@@ -229,15 +227,6 @@ export const DailyRounds = (props: any) => {
             invalidForm = true;
           }
           return;
-        case "other_symptoms":
-          if (
-            state.form.additional_symptoms?.includes(9) &&
-            !state.form[field]
-          ) {
-            errors[field] = "Please enter the other symptom details";
-            invalidForm = true;
-          }
-          return;
         case "bp": {
           const error = BloodPressureValidator(state.form.bp);
           if (error) {
@@ -311,11 +300,6 @@ export const DailyRounds = (props: any) => {
         taken_at: state.form.taken_at
           ? state.form.taken_at
           : new Date().toISOString(),
-
-        additional_symptoms: state.form.additional_symptoms,
-        other_symptoms: state.form.additional_symptoms?.includes(9)
-          ? state.form.other_symptoms
-          : undefined,
         admitted_to:
           (state.form.admitted === "Select"
             ? undefined
@@ -527,22 +511,11 @@ export const DailyRounds = (props: any) => {
             label="Other Details"
             rows={5}
           />
-          <SymptomsSelect
-            {...field("additional_symptoms")}
-            label="Symptoms"
-            className="md:col-span-2"
-          />
 
-          {state.form.additional_symptoms?.includes(9) && (
-            <div className="md:col-span-2">
-              <TextAreaFormField
-                {...field("other_symptoms")}
-                required
-                label="Other Symptoms Details"
-                placeholder="Enter the other symptoms here"
-              />
-            </div>
-          )}
+          <div className="pb-6 md:col-span-2">
+            <FieldLabel>Symptoms</FieldLabel>
+            <EncounterSymptomsBuilder />
+          </div>
 
           {state.form.rounds_type !== "DOCTORS_LOG" && (
             <>
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index 81e92efdf8b..6f63a697229 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -57,7 +57,7 @@ export const header_content_type: URLS = {
 };
 
 // Array of image extensions
-const ExtImage: string[] = [
+export const ExtImage: string[] = [
   "jpeg",
   "jpg",
   "png",
@@ -119,12 +119,13 @@ interface URLS {
   [id: string]: string;
 }
 
-interface ModalDetails {
+export interface ModalDetails {
   name?: string;
   id?: string;
   reason?: string;
   userArchived?: string;
   archiveTime?: any;
+  associatedId?: string;
 }
 
 export interface StateInterface {
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index ac716f7bf45..a99d12c09fc 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -181,6 +181,7 @@ export const PatientManager = () => {
       qParams.date_declared_positive_before || undefined,
     date_declared_positive_after:
       qParams.date_declared_positive_after || undefined,
+    ration_card_category: qParams.ration_card_category || undefined,
     last_consultation_medico_legal_case:
       qParams.last_consultation_medico_legal_case || undefined,
     last_consultation_encounter_date_before:
@@ -960,6 +961,13 @@ export const PatientManager = () => {
               "Is Medico-Legal Case",
               "last_consultation_medico_legal_case",
             ),
+            value(
+              "Ration Card Category",
+              "ration_card_category",
+              qParams.ration_card_category
+                ? t(`ration_card__${qParams.ration_card_category}`)
+                : "",
+            ),
             value(
               "Facility",
               "facility",
diff --git a/src/Components/Patient/PatientConsentRecordBlock.tsx b/src/Components/Patient/PatientConsentRecordBlock.tsx
new file mode 100644
index 00000000000..9c1969ae5a3
--- /dev/null
+++ b/src/Components/Patient/PatientConsentRecordBlock.tsx
@@ -0,0 +1,187 @@
+import dayjs from "dayjs";
+import {
+  CONSENT_PATIENT_CODE_STATUS_CHOICES,
+  CONSENT_TYPE_CHOICES,
+} from "../../Common/constants";
+import routes from "../../Redux/api";
+import useQuery from "../../Utils/request/useQuery";
+import { ConsentRecord } from "../Facility/models";
+import { FileUploadModel } from "./models";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import ButtonV2 from "../Common/components/ButtonV2";
+import { useEffect } from "react";
+import useAuthUser from "../../Common/hooks/useAuthUser";
+
+export default function PatientConsentRecordBlockGroup(props: {
+  consentRecord: ConsentRecord;
+  previewFile: (file: FileUploadModel, file_associating_id: string) => void;
+  archiveFile: (
+    file: FileUploadModel,
+    file_associating_id: string,
+    skipPrompt?: { reason: string },
+  ) => void;
+  onDelete: (consentRecord: ConsentRecord) => void;
+  refreshTrigger: any;
+  showArchive: boolean;
+  onFilesFound: () => void;
+}) {
+  const {
+    consentRecord,
+    previewFile,
+    archiveFile,
+    refreshTrigger,
+    showArchive,
+  } = props;
+
+  const authUser = useAuthUser();
+
+  const filesQuery = useQuery(routes.viewUpload, {
+    query: {
+      file_type: "CONSENT_RECORD",
+      associating_id: consentRecord.id,
+      is_archived: false,
+      limit: 100,
+      offset: 0,
+    },
+    onResponse: (response) => {
+      /*
+      if (consentRecord.deleted === true && response.data?.results) {
+        const unarchivedFiles = response.data.results;
+        console.log("checking for unarchived files on this deleted consent record")
+        for (const file of unarchivedFiles) {
+          console.log("archiving file", file)
+          archiveFile(file, consentRecord.id, {
+            reason: "Consent Record Archived",
+          });
+        }
+      }
+      */
+
+      if ((response.data?.results?.length || 0) > 0) {
+        props.onFilesFound();
+      }
+    },
+  });
+
+  const archivedFilesQuery = useQuery(routes.viewUpload, {
+    query: {
+      file_type: "CONSENT_RECORD",
+      associating_id: consentRecord.id,
+      is_archived: true,
+      limit: 100,
+      offset: 0,
+    },
+    prefetch: showArchive,
+    onResponse: (response) => {
+      if ((response.data?.results?.length || 0) > 0) {
+        props.onFilesFound();
+      }
+    },
+  });
+
+  const consent = CONSENT_TYPE_CHOICES.find((c) => c.id === consentRecord.type);
+  const consentPCS = CONSENT_PATIENT_CODE_STATUS_CHOICES.find(
+    (c) => c.id === consentRecord.patient_code_status,
+  );
+
+  const data = showArchive
+    ? [
+        ...(archivedFilesQuery.data?.results || []),
+        ...(consentRecord.deleted ? filesQuery.data?.results || [] : []),
+      ]
+    : filesQuery.data?.results;
+
+  const loading = archivedFilesQuery.loading || filesQuery.loading;
+
+  useEffect(() => {
+    if (!showArchive) {
+      filesQuery.refetch();
+    } else {
+      archivedFilesQuery.refetch();
+    }
+  }, [showArchive, refreshTrigger]);
+
+  return (
+    <div
+      className={`flex flex-col gap-2 ${(data?.length || 0) < 1 && "hidden"}`}
+    >
+      <div className="flex items-center justify-between">
+        <div>
+          <h4>
+            {consent?.text} {consentPCS?.text && `(${consentPCS.text})`}
+          </h4>
+          {consentRecord.deleted && (
+            <div>
+              <div className="text-sm">
+                <CareIcon icon="l-archive" className="mr-1" />
+                Archived
+              </div>
+            </div>
+          )}
+        </div>
+        {/*
+        {!consentRecord.deleted && !showArchive && (
+          <button
+            className="text-red-500 hover:text-red-600"
+            onClick={() => props.onDelete(consentRecord)}
+          >
+            <CareIcon icon="l-archive" className="mr-1" />
+            Archive
+          </button>
+        )}
+      */}
+      </div>
+      {loading ? (
+        <div className="skeleton-animate-alpha h-32 rounded-lg" />
+      ) : (
+        data?.map((file: FileUploadModel, i: number) => (
+          <div
+            key={i}
+            className={`flex flex-col justify-between gap-2 rounded-lg border border-gray-300 md:flex-row md:items-center ${showArchive ? "text-gray-600" : "bg-white"}  px-4 py-2 transition-all hover:bg-gray-100`}
+          >
+            <div className="flex items-center gap-4 ">
+              <div>
+                <CareIcon icon="l-file" className="text-5xl text-gray-600" />
+              </div>
+              <div className="min-w-[40%] break-all">
+                <div className="">
+                  {file.name}
+                  {file.extension} {file.is_archived && "(Archived)"}
+                </div>
+                <div className="text-xs text-gray-700">
+                  {dayjs(file.created_date).format("DD MMM YYYY, hh:mm A")}
+                </div>
+              </div>
+            </div>
+            <div className="flex shrink-0 justify-end gap-2">
+              {!file.is_archived && (
+                <ButtonV2
+                  onClick={() => previewFile(file, consentRecord.id)}
+                  className=""
+                >
+                  <CareIcon icon="l-eye" />
+                  View
+                </ButtonV2>
+              )}
+              {(file.is_archived ||
+                file?.uploaded_by?.username === authUser.username ||
+                authUser.user_type === "DistrictAdmin" ||
+                authUser.user_type === "StateAdmin") && (
+                <ButtonV2
+                  variant={file.is_archived ? "primary" : "secondary"}
+                  onClick={() => archiveFile(file, consentRecord.id)}
+                  className=""
+                >
+                  <CareIcon
+                    icon={file.is_archived ? "l-info-circle" : "l-archive"}
+                  />
+                  {file.is_archived ? "More Info" : "Archive"}
+                </ButtonV2>
+              )}
+            </div>
+          </div>
+        ))
+      )}
+    </div>
+  );
+}
diff --git a/src/Components/Patient/PatientConsentRecords.tsx b/src/Components/Patient/PatientConsentRecords.tsx
new file mode 100644
index 00000000000..ca26b270d80
--- /dev/null
+++ b/src/Components/Patient/PatientConsentRecords.tsx
@@ -0,0 +1,312 @@
+import { useEffect, useState } from "react";
+import {
+  CONSENT_PATIENT_CODE_STATUS_CHOICES,
+  CONSENT_TYPE_CHOICES,
+} from "../../Common/constants";
+import routes from "../../Redux/api";
+import useQuery from "../../Utils/request/useQuery";
+import Page from "../Common/components/Page";
+import { ConsentRecord } from "../Facility/models";
+import request from "../../Utils/request/request";
+import ConfirmDialog from "../Common/ConfirmDialog";
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { formatDateTime } from "../../Utils/utils";
+import TextFormField from "../Form/FormFields/TextFormField";
+import ButtonV2 from "../Common/components/ButtonV2";
+import useFileUpload from "../../Utils/useFileUpload";
+import PatientConsentRecordBlockGroup from "./PatientConsentRecordBlock";
+import SwitchTabs from "../Common/components/SwitchTabs";
+import useFileManager from "../../Utils/useFileManager";
+
+export default function PatientConsentRecords(props: {
+  facilityId: string;
+  patientId: string;
+  consultationId: string;
+}) {
+  const { facilityId, patientId, consultationId } = props;
+  const [showArchived, setShowArchived] = useState(false);
+  const [filesFound, setFilesFound] = useState(false);
+  const [showPCSChangeModal, setShowPCSChangeModal] = useState<number | null>(
+    null,
+  );
+  const [newConsent, setNewConsent] = useState({
+    type: 0,
+    patient_code_status: 4,
+  });
+
+  const fileUpload = useFileUpload({
+    type: "CONSENT_RECORD",
+  });
+
+  const fileManager = useFileManager({
+    type: "CONSENT_RECORD",
+    onArchive: async () => {
+      refetch();
+    },
+  });
+
+  const { data: patient } = useQuery(routes.getPatient, {
+    pathParams: {
+      id: patientId,
+    },
+  });
+  const {
+    data: consultation,
+    refetch,
+    loading,
+  } = useQuery(routes.getConsultation, {
+    pathParams: { id: consultationId! },
+    onResponse: (data) => {
+      if (data.data && data.data.consent_records) {
+        setConsentRecords(data.data.consent_records);
+      }
+    },
+  });
+
+  const [showDeleteConsent, setShowDeleteConsent] = useState<string | null>(
+    null,
+  );
+
+  const [consentRecords, setConsentRecords] = useState<ConsentRecord[] | null>(
+    null,
+  );
+
+  const handleDeleteConsent = async () => {
+    const consent_id = showDeleteConsent;
+    if (!consent_id || !consultationId || !consentRecords) return;
+    const newRecords = consentRecords.map((cr) =>
+      cr.id === consent_id ? { ...cr, deleted: true } : cr,
+    );
+    setConsentRecords(newRecords);
+    setShowDeleteConsent(null);
+  };
+
+  const selectField = (name: string) => {
+    return {
+      name,
+      optionValue: (option: any) => option.id,
+      optionLabel: (option: any) => option.text,
+      optionDescription: (option: any) => option.desc,
+    };
+  };
+
+  const handleUpload = async (diffPCS?: ConsentRecord) => {
+    if (newConsent.type === 0) return;
+    const consentTypeExists = consentRecords?.find(
+      (record) => record.type === newConsent.type && record.deleted !== true,
+    );
+    if (consentTypeExists && !diffPCS) {
+      await fileUpload.handleFileUpload(consentTypeExists.id);
+    } else {
+      const randomId = "consent-" + new Date().getTime().toString();
+      const newRecords = [
+        ...(consentRecords?.map((r) =>
+          r.id === diffPCS?.id ? { ...r, deleted: true } : r,
+        ) || []),
+        {
+          id: randomId,
+          type: newConsent.type,
+          patient_code_status:
+            newConsent.type === 2 ? newConsent.patient_code_status : undefined,
+        },
+      ];
+      await request(routes.partialUpdateConsultation, {
+        pathParams: { id: consultationId },
+        body: { consent_records: newRecords },
+      });
+      await fileUpload.handleFileUpload(randomId);
+      setConsentRecords(newRecords);
+    }
+
+    refetch();
+  };
+
+  useEffect(() => {
+    const timeout = setTimeout(async () => {
+      if (consentRecords) {
+        await request(routes.partialUpdateConsultation, {
+          pathParams: { id: consultationId },
+          body: { consent_records: consentRecords },
+        });
+      }
+    }, 1000);
+    return () => clearTimeout(timeout);
+  }, [consentRecords]);
+
+  const tabConsents = consentRecords?.filter((c) => showArchived || !c.deleted);
+
+  useEffect(() => {
+    setFilesFound(false);
+  }, [showArchived]);
+
+  return (
+    <Page
+      title={"Patient Consent Records"}
+      crumbsReplacements={{
+        [facilityId]: { name: patient?.facility_object?.name },
+        [patientId]: { name: patient?.name },
+        [consultationId]: {
+          name:
+            patient?.last_consultation?.suggestion === "A"
+              ? `Admitted on ${formatDateTime(
+                  patient?.last_consultation?.encounter_date,
+                )}`
+              : patient?.last_consultation?.suggestion_text,
+        },
+      }}
+      backUrl={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/`}
+    >
+      {fileUpload.Dialogues}
+      {fileManager.Dialogues}
+      <ConfirmDialog
+        show={showDeleteConsent !== null}
+        onClose={() => setShowDeleteConsent(null)}
+        onConfirm={handleDeleteConsent}
+        action="Archive"
+        variant="danger"
+        description={
+          "Are you sure you want to archive this consent record? You can find it in the archive section."
+        }
+        title="Archive Consent"
+        className="w-auto"
+      />
+      <ConfirmDialog
+        show={showPCSChangeModal !== null}
+        onClose={() => setShowPCSChangeModal(null)}
+        onConfirm={() => {
+          if (showPCSChangeModal !== null) {
+            handleUpload(
+              consentRecords?.find(
+                (record) =>
+                  record.type === 2 &&
+                  !record.deleted &&
+                  record.patient_code_status !== showPCSChangeModal,
+              ),
+            );
+          }
+          setShowPCSChangeModal(null);
+        }}
+        action="Change Patient Code Status"
+        variant="danger"
+        description={`Consent records exist with the "${CONSENT_PATIENT_CODE_STATUS_CHOICES.find((c) => consentRecords?.find((c) => c.type === 2 && !c.deleted)?.patient_code_status === c.id)?.text}" patient code status. Adding a new record for a different type will archive the existing records. Are you sure you want to proceed?`}
+        title="Archive Previous Records"
+        className="w-auto"
+      />
+      <SwitchTabs
+        tab1="Active"
+        tab2="Archived"
+        className="my-4"
+        onClickTab1={() => setShowArchived(false)}
+        onClickTab2={() => setShowArchived(true)}
+        isTab2Active={showArchived}
+      />
+      <div className="mt-8 flex flex-col gap-4 lg:flex-row-reverse">
+        <div className="shrink-0 lg:w-[350px]">
+          <h4 className="font-black">Add New Record</h4>
+          <SelectFormField
+            {...selectField("consent_type")}
+            onChange={async (e) => {
+              setNewConsent({ ...newConsent, type: e.value });
+            }}
+            value={newConsent.type}
+            label="Consent Type"
+            options={CONSENT_TYPE_CHOICES}
+            required
+          />
+          {newConsent.type === 2 && (
+            <SelectFormField
+              {...selectField("consent_type")}
+              onChange={(e) => {
+                setNewConsent({
+                  ...newConsent,
+                  patient_code_status: e.value,
+                });
+              }}
+              label="Patient Code Status"
+              value={newConsent.patient_code_status}
+              options={CONSENT_PATIENT_CODE_STATUS_CHOICES}
+              required
+            />
+          )}
+          <TextFormField
+            name="filename"
+            label="File Name"
+            value={fileUpload.fileName}
+            onChange={(e) => fileUpload.setFileName(e.value)}
+          />
+          <div className="flex gap-2">
+            {fileUpload.file ? (
+              <>
+                <ButtonV2
+                  onClick={() => {
+                    const diffPCS = consentRecords?.find(
+                      (record) =>
+                        record.type === 2 &&
+                        newConsent.type === 2 &&
+                        record.patient_code_status !==
+                          newConsent.patient_code_status &&
+                        record.deleted !== true,
+                    );
+                    if (diffPCS) {
+                      setShowPCSChangeModal(newConsent.patient_code_status);
+                    } else {
+                      handleUpload();
+                    }
+                  }}
+                  loading={!!fileUpload.progress}
+                  className="flex-1"
+                >
+                  <CareIcon icon="l-check" className="mr-2" />
+                  Upload
+                </ButtonV2>
+                <ButtonV2
+                  variant="danger"
+                  onClick={fileUpload.clearFile}
+                  disabled={!!fileUpload.progress}
+                >
+                  <CareIcon icon="l-trash-alt" className="" />
+                </ButtonV2>
+              </>
+            ) : (
+              <>
+                <fileUpload.UploadButton />
+                <button
+                  type="button"
+                  className="flex aspect-square h-9 shrink-0 items-center justify-center rounded text-xl transition-all hover:bg-black/10"
+                  onClick={fileUpload.handleCameraCapture}
+                >
+                  <CareIcon icon={"l-camera"} />
+                </button>
+              </>
+            )}
+          </div>
+        </div>
+        <div className="flex-1">
+          <div className="flex flex-col gap-4">
+            {loading ? (
+              <div className="skeleton-animate-alpha h-32 rounded-lg" />
+            ) : tabConsents?.length === 0 || !filesFound ? (
+              <div className="flex h-32 items-center justify-center text-gray-500">
+                No records found
+              </div>
+            ) : null}
+            {!loading &&
+              tabConsents?.map((record, index) => (
+                <PatientConsentRecordBlockGroup
+                  key={index}
+                  consentRecord={record}
+                  previewFile={fileManager.viewFile}
+                  archiveFile={fileManager.archiveFile}
+                  onDelete={(record) => setShowDeleteConsent(record.id)}
+                  refreshTrigger={consultation}
+                  showArchive={showArchived}
+                  onFilesFound={() => setFilesFound(true)}
+                />
+              ))}
+          </div>
+        </div>
+      </div>
+    </Page>
+  );
+}
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index 0d8ebaae2b0..f153f9aa93d 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -7,6 +7,7 @@ import {
   FACILITY_TYPES,
   GENDER_TYPES,
   PATIENT_FILTER_CATEGORIES,
+  RATION_CARD_CATEGORY,
 } from "../../Common/constants";
 import useConfig from "../../Common/hooks/useConfig";
 import useMergeState from "../../Common/hooks/useMergeState";
@@ -31,11 +32,14 @@ import useQuery from "../../Utils/request/useQuery";
 import routes from "../../Redux/api";
 import request from "../../Utils/request/request";
 import useAuthUser from "../../Common/hooks/useAuthUser";
+import { SelectFormField } from "../Form/FormFields/SelectFormField";
+import { useTranslation } from "react-i18next";
 
 const getDate = (value: any) =>
   value && dayjs(value).isValid() && dayjs(value).toDate();
 
 export default function PatientFilter(props: any) {
+  const { t } = useTranslation();
   const authUser = useAuthUser();
   const { kasp_enabled, kasp_string } = useConfig();
   const { filter, onChange, closeFilter, removeFilters } = props;
@@ -59,6 +63,7 @@ export default function PatientFilter(props: any) {
     age_min: filter.age_min || null,
     age_max: filter.age_max || null,
     date_declared_positive: filter.date_declared_positive || null,
+    ration_card_category: filter.ration_card_category || null,
     last_consultation_medico_legal_case:
       filter.last_consultation_medico_legal_case || null,
     last_consultation_encounter_date_before:
@@ -171,6 +176,7 @@ export default function PatientFilter(props: any) {
       gender,
       age_min,
       age_max,
+      ration_card_category,
       last_consultation_medico_legal_case,
       last_consultation_encounter_date_before,
       last_consultation_encounter_date_after,
@@ -214,6 +220,7 @@ export default function PatientFilter(props: any) {
       created_date_after: dateQueryString(created_date_after),
       modified_date_before: dateQueryString(modified_date_before),
       modified_date_after: dateQueryString(modified_date_after),
+      ration_card_category,
       last_consultation_medico_legal_case:
         last_consultation_medico_legal_case || "",
       last_consultation_encounter_date_before: dateQueryString(
@@ -467,6 +474,21 @@ export default function PatientFilter(props: any) {
               }
             />
           </div>
+          <SelectFormField
+            name="ration_card_category"
+            label="Ration Card Category"
+            placeholder="Select"
+            options={RATION_CARD_CATEGORY}
+            optionLabel={(o) => t(`ration_card__${o}`)}
+            optionValue={(o) => o}
+            value={filterState.ration_card_category}
+            onChange={(e) =>
+              setFilterState({
+                ...filterState,
+                [e.name]: e.value,
+              })
+            }
+          />
         </div>
       </AccordionV2>
       <AccordionV2
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index 50fc5819314..e92d043dff4 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -411,22 +411,13 @@ export const PatientHome = (props: any) => {
                   {patientData.facility_object?.name || "-"}
                 </h3>
                 <p className="mb-7 mt-4 text-sm font-medium text-zinc-500">
-                  {patientGender} | {patientData.blood_group || "-"}
+                  {patientGender} | {patientData.blood_group || "-"} | Born on{" "}
+                  {patientData.date_of_birth
+                    ? formatDate(patientData.date_of_birth)
+                    : patientData.year_of_birth}
                 </p>
               </div>
               <div className="mb-8 mt-2 grid grid-cols-1 gap-x-4 gap-y-2 md:grid-cols-2 md:gap-y-8 lg:grid-cols-4">
-                <div className="sm:col-span-1">
-                  <div className="text-sm font-semibold leading-5 text-zinc-400">
-                    {patientData.date_of_birth
-                      ? "Date of Birth"
-                      : "Year of Birth"}
-                  </div>
-                  <div className="mt-1 text-sm font-medium leading-5">
-                    {patientData.date_of_birth
-                      ? formatDate(patientData.date_of_birth)
-                      : patientData.year_of_birth}
-                  </div>
-                </div>
                 <div className="sm:col-span-1">
                   <div className="text-sm font-semibold leading-5 text-zinc-400">
                     Phone
@@ -537,6 +528,16 @@ export const PatientHome = (props: any) => {
                     {parseOccupation(patientData.meta_info?.occupation) || "-"}
                   </div>
                 </div>
+                <div className="sm:col-span-1">
+                  <div className="text-sm font-semibold leading-5 text-zinc-400">
+                    Ration Card Category
+                  </div>
+                  <div className="mt-1  text-sm font-medium leading-5 ">
+                    {patientData.ration_card_category
+                      ? t(`ration_card__${patientData.ration_card_category}`)
+                      : "-"}
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -552,7 +553,7 @@ export const PatientHome = (props: any) => {
                     0 && (
                     <div
                       className={
-                        "mb-6 mt-6 inline-flex w-full items-center justify-center rounded-md border p-3 text-xs font-semibold leading-4 shadow-sm lg:mt-0 " +
+                        "mb-6 inline-flex w-full items-center justify-center rounded-md border p-3 text-xs font-semibold leading-4 shadow-sm lg:mt-0 " +
                         (dayjs().isBefore(patientData.review_time)
                           ? " bg-gray-100"
                           : " bg-red-600/5 p-1 text-sm font-normal text-red-600")
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index 7a88c478bba..ba9280e903d 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -234,13 +234,15 @@ export default function PatientInfoCard(props: {
                   {category.toUpperCase()}
                 </div>
               )}
-              <ButtonV2
-                ghost
-                onClick={() => setOpen(true)}
-                className="mt-1 px-[10px] py-1"
-              >
-                {bedDialogTitle}
-              </ButtonV2>
+              {consultation?.admitted && (
+                <ButtonV2
+                  ghost
+                  onClick={() => setOpen(true)}
+                  className="mt-1 px-[10px] py-1"
+                >
+                  {bedDialogTitle}
+                </ButtonV2>
+              )}
             </div>
             <div className="flex items-center justify-center">
               <div
@@ -299,7 +301,7 @@ export default function PatientInfoCard(props: {
               </div>
               <div className="flex flex-wrap items-center gap-2 text-sm sm:flex-row">
                 <div
-                  className="flex flex-wrap items-center justify-center gap-2 text-sm text-gray-900 sm:flex-row sm:text-sm lg:justify-normal"
+                  className="flex flex-wrap items-center justify-center gap-2 text-sm text-gray-900 sm:flex-row sm:text-sm md:pr-10 lg:justify-normal"
                   id="patient-consultationbadges"
                 >
                   {consultation?.patient_no && (
@@ -352,6 +354,18 @@ export default function PatientInfoCard(props: {
                         </div>
                       </div>
                     )}
+                  {(
+                    consultation?.consent_records?.filter((c) => !c.deleted) ||
+                    []
+                  ).length < 1 && (
+                    <div>
+                      <div className="inline-flex w-full items-center justify-start rounded border border-gray-500 bg-red-400 p-1 px-3 text-xs font-semibold leading-4">
+                        <span className="font-semibold text-white">
+                          Consent Records Missing
+                        </span>
+                      </div>
+                    </div>
+                  )}
                   {consultation?.suggestion === "DC" && (
                     <div>
                       <div>
@@ -634,6 +648,12 @@ export default function PatientInfoCard(props: {
                       consultation?.id &&
                       !consultation?.discharge_date,
                   ],
+                  [
+                    `/facility/${patient.facility}/patient/${patient.id}/consultation/${consultation?.id}/consent-records`,
+                    "Consent Records",
+                    "l-file-medical",
+                    patient.is_active,
+                  ],
                   [
                     `/patient/${patient.id}/investigation_reports`,
                     "Investigation Summary",
@@ -667,7 +687,10 @@ export default function PatientInfoCard(props: {
                             key={i}
                             className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
                             href={
-                              action[1] !== "Treatment Summary" &&
+                              ![
+                                "Treatment Summary",
+                                "Consent Records",
+                              ].includes(action[1]) &&
                               consultation?.admitted &&
                               !consultation?.current_bed &&
                               i === 1
@@ -676,7 +699,10 @@ export default function PatientInfoCard(props: {
                             }
                             onClick={() => {
                               if (
-                                action[1] !== "Treatment Summary" &&
+                                ![
+                                  "Treatment Summary",
+                                  "Consent Records",
+                                ].includes(action[1]) &&
                                 consultation?.admitted &&
                                 !consultation?.current_bed &&
                                 i === 1
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index 07e682c137f..34d2ac66387 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -5,6 +5,7 @@ import {
   GENDER_TYPES,
   MEDICAL_HISTORY_CHOICES,
   OCCUPATION_TYPES,
+  RATION_CARD_CATEGORY,
   VACCINES,
 } from "../../Common/constants";
 import {
@@ -65,6 +66,7 @@ import SelectMenuV2 from "../Form/SelectMenuV2.js";
 import Checkbox from "../Common/components/CheckBox.js";
 import _ from "lodash";
 import { ILocalBodies } from "../ExternalResult/models.js";
+import { useTranslation } from "react-i18next";
 
 const Loading = lazy(() => import("../Common/Loading"));
 const PageTitle = lazy(() => import("../Common/PageTitle"));
@@ -130,6 +132,7 @@ const initForm: any = {
   last_vaccinated_date: null,
   abha_number: null,
   ...medicalHistoryChoices,
+  ration_card_category: null,
 };
 
 const initError = Object.assign(
@@ -169,6 +172,7 @@ export const parseOccupationFromExt = (occupation: Occupation) => {
 
 export const PatientRegister = (props: PatientRegisterProps) => {
   const authUser = useAuthUser();
+  const { t } = useTranslation();
   const { goBack } = useAppHistory();
   const { gov_data_api_key, enable_hcx, enable_abdm } = useConfig();
   const { facilityId, id } = props;
@@ -750,6 +754,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
       blood_group: formData.blood_group ? formData.blood_group : undefined,
       medical_history,
       is_active: true,
+      ration_card_category: formData.ration_card_category,
     };
     const { res, data: requestData } = id
       ? await request(routes.updatePatient, {
@@ -1702,6 +1707,14 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                                 optionLabel={(o) => o.text}
                                 optionValue={(o) => o.id}
                               />
+                              <SelectFormField
+                                {...field("ration_card_category")}
+                                label="Ration Card Category"
+                                placeholder="Select"
+                                options={RATION_CARD_CATEGORY}
+                                optionLabel={(o) => t(`ration_card__${o}`)}
+                                optionValue={(o) => o}
+                              />
                             </>
                           ) : (
                             <div id="passport_no-div">
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index 39186b44c6e..f64d71146c4 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -3,6 +3,7 @@ import { PerformedByModel } from "../HCX/misc";
 import {
   CONSCIOUSNESS_LEVEL,
   OCCUPATION_TYPES,
+  RATION_CARD_CATEGORY,
   RHYTHM_CHOICES,
 } from "../../Common/constants";
 
@@ -101,6 +102,7 @@ export interface PatientModel {
   state?: number;
   nationality?: string;
   passport_no?: string;
+  ration_card_category?: (typeof RATION_CARD_CATEGORY)[number] | null;
   date_of_test?: string;
   date_of_result?: string; // keeping this to avoid errors in Death report
   covin_id?: string;
@@ -303,13 +305,10 @@ export interface DailyRoundsModel {
   physical_examination_info?: string;
   other_details?: string;
   consultation?: number;
-  additional_symptoms?: Array<number>;
   medication_given?: Array<any>;
-  additional_symptoms_text?: string;
   action?: string;
   review_interval?: number;
   id?: string;
-  other_symptoms?: string;
   admitted_to?: string;
   patient_category?: PatientCategory;
   output?: DailyRoundsOutput[];
@@ -333,7 +332,7 @@ export interface FacilityNameModel {
 
 // File Upload Models
 
-type FileCategory = "UNSPECIFIED" | "XRAY" | "AUDIO" | "IDENTITY_PROOF";
+export type FileCategory = "UNSPECIFIED" | "XRAY" | "AUDIO" | "IDENTITY_PROOF";
 
 export interface CreateFileRequest {
   file_type: string | number;
diff --git a/src/Components/Scribe/formDetails.ts b/src/Components/Scribe/formDetails.ts
index 2b56ce90df5..74673adea70 100644
--- a/src/Components/Scribe/formDetails.ts
+++ b/src/Components/Scribe/formDetails.ts
@@ -3,9 +3,9 @@ import {
   PATIENT_CATEGORIES,
   REVIEW_AT_CHOICES,
   RHYTHM_CHOICES,
-  SYMPTOM_CHOICES,
   TELEMEDICINE_ACTIONS,
 } from "../../Common/constants";
+import { SYMPTOM_CHOICES } from "../Symptoms/types";
 import { Field } from "./Scribe";
 
 export const DAILY_ROUND_FORM_SCRIBE_DATA: Field[] = [
diff --git a/src/Components/Symptoms/SymptomsBuilder.tsx b/src/Components/Symptoms/SymptomsBuilder.tsx
new file mode 100644
index 00000000000..4d142a67841
--- /dev/null
+++ b/src/Components/Symptoms/SymptomsBuilder.tsx
@@ -0,0 +1,379 @@
+import { useState } from "react";
+import { Writable } from "../../Utils/types";
+import {
+  EncounterSymptom,
+  OTHER_SYMPTOM_CHOICE,
+  SYMPTOM_CHOICES,
+} from "./types";
+import AutocompleteMultiSelectFormField from "../Form/FormFields/AutocompleteMultiselect";
+import DateFormField from "../Form/FormFields/DateFormField";
+import ButtonV2 from "../Common/components/ButtonV2";
+import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
+import { classNames, dateQueryString } from "../../Utils/utils";
+import { FieldChangeEvent } from "../Form/FormFields/Utils";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import useSlug from "../../Common/hooks/useSlug";
+import useQuery from "../../Utils/request/useQuery";
+import SymptomsApi from "./api";
+import request from "../../Utils/request/request";
+import { Success } from "../../Utils/Notifications";
+import { sortByOnsetDate } from "./utils";
+
+export const CreateSymptomsBuilder = (props: {
+  value: Writable<EncounterSymptom>[];
+  onChange: (value: Writable<EncounterSymptom>[]) => void;
+}) => {
+  return (
+    <div className="flex w-full flex-col items-start rounded-lg border border-gray-400">
+      <ul className="flex w-full flex-col gap-2 p-4">
+        {props.value.map((obj, index, arr) => {
+          const handleUpdate = (event: FieldChangeEvent<unknown>) => {
+            const updated = { ...obj, [event.name]: event.value };
+            props.onChange(arr.map((old, i) => (i === index ? updated : old)));
+          };
+
+          const handleRemove = () => {
+            props.onChange(arr.filter((_, i) => i !== index));
+          };
+
+          return (
+            <li
+              key={index}
+              id={`symptom-${index}`}
+              className="border-b-2 border-dashed border-gray-400 py-4 last:border-b-0 last:pb-0 md:border-b-0 md:py-2"
+            >
+              <SymptomEntry
+                value={obj}
+                onChange={handleUpdate}
+                onRemove={handleRemove}
+              />
+            </li>
+          );
+        })}
+      </ul>
+
+      {props.value.length === 0 && (
+        <div className="flex w-full justify-center gap-2 pb-8 text-center font-medium text-gray-700">
+          No symptoms added
+        </div>
+      )}
+
+      <div className="w-full rounded-b-lg border-t-2 border-dashed border-gray-400 bg-gray-100 p-4">
+        <AddSymptom
+          existing={props.value}
+          onAdd={(objects) => props.onChange([...props.value, ...objects])}
+        />
+      </div>
+    </div>
+  );
+};
+
+export const EncounterSymptomsBuilder = (props: { showAll?: boolean }) => {
+  const consultationId = useSlug("consultation");
+
+  const [isProcessing, setIsProcessing] = useState(false);
+  const { data, loading, refetch } = useQuery(SymptomsApi.list, {
+    pathParams: { consultationId },
+    query: { limit: 100 },
+  });
+
+  if (!data) {
+    return (
+      <div className="flex w-full animate-pulse justify-center gap-2 rounded-lg bg-gray-200 py-8 text-center font-medium text-gray-700">
+        <CareIcon icon="l-spinner-alt" className="animate-spin text-lg" />
+        <span>Fetching symptom records...</span>
+      </div>
+    );
+  }
+
+  let items = sortByOnsetDate(data.results);
+  if (!props.showAll) {
+    items = items.filter(
+      (i) => i.clinical_impression_status !== "entered-in-error",
+    );
+  }
+
+  return (
+    <div className="flex w-full flex-col items-start rounded-lg border border-gray-400">
+      <ul
+        className={classNames(
+          "flex w-full flex-col p-4",
+          (loading || isProcessing) && "pointer-events-none animate-pulse",
+        )}
+      >
+        {items.map((symptom) => {
+          const handleUpdate = async (event: FieldChangeEvent<unknown>) => {
+            setIsProcessing(true);
+            await request(SymptomsApi.partialUpdate, {
+              pathParams: { consultationId, external_id: symptom.id },
+              body: { [event.name]: event.value },
+            });
+            await refetch();
+            setIsProcessing(false);
+          };
+
+          const handleMarkAsEnteredInError = async () => {
+            setIsProcessing(true);
+            await request(SymptomsApi.markAsEnteredInError, {
+              pathParams: { consultationId, external_id: symptom.id },
+            });
+            await refetch();
+            setIsProcessing(false);
+          };
+
+          return (
+            <li
+              key={symptom.id}
+              className="border-b-2 border-dashed border-gray-400 py-4 last:border-b-0 last:pb-0 md:border-b-0 md:py-2"
+            >
+              <SymptomEntry
+                value={symptom}
+                disabled={isProcessing}
+                onChange={handleUpdate}
+                onRemove={handleMarkAsEnteredInError}
+              />
+            </li>
+          );
+        })}
+      </ul>
+
+      {items.length === 0 && (
+        <div className="flex w-full justify-center gap-2 pb-8 text-center font-medium text-gray-700">
+          Patient is Asymptomatic
+        </div>
+      )}
+
+      <div className="w-full rounded-b-lg border-t-2 border-dashed border-gray-400 bg-gray-100 p-4">
+        <AddSymptom
+          existing={data.results}
+          consultationId={consultationId}
+          onAdd={() => refetch()}
+        />
+      </div>
+    </div>
+  );
+};
+
+const SymptomEntry = (props: {
+  disabled?: boolean;
+  value: Writable<EncounterSymptom> | EncounterSymptom;
+  onChange: (event: FieldChangeEvent<unknown>) => void;
+  onRemove: () => void;
+}) => {
+  const symptom = props.value;
+  const disabled =
+    props.disabled || symptom.clinical_impression_status === "entered-in-error";
+  return (
+    <div className="grid grid-cols-6 items-center gap-2 md:grid-cols-5">
+      <DateFormField
+        className="col-span-3 w-full md:col-span-1"
+        name="onset_date"
+        value={new Date(symptom.onset_date)}
+        disableFuture
+        disabled={disabled}
+        onChange={props.onChange}
+        errorClassName="hidden"
+      />
+      <DateFormField
+        className="col-span-3 w-full md:col-span-1"
+        name="cure_date"
+        value={symptom.cure_date ? new Date(symptom.cure_date) : undefined}
+        disableFuture
+        position="CENTER"
+        placeholder="Date of cure"
+        min={new Date(symptom.onset_date)}
+        disabled={disabled}
+        onChange={props.onChange}
+        errorClassName="hidden"
+      />
+      <div className="col-span-6 flex items-center gap-2 md:col-span-3">
+        <div
+          className={classNames(
+            "cui-input-base w-full font-medium",
+            disabled && "bg-gray-200",
+          )}
+        >
+          <span
+            className={classNames(
+              "whitespace-pre-wrap",
+              symptom.clinical_impression_status === "entered-in-error" &&
+                "line-through decoration-red-500 decoration-2",
+            )}
+          >
+            <SymptomText value={symptom} />
+          </span>
+          {symptom.clinical_impression_status === "entered-in-error" && (
+            <span className="pl-2 text-red-500 no-underline">
+              Entered in Error
+            </span>
+          )}
+        </div>
+        <ButtonV2
+          type="button"
+          variant="danger"
+          className="p-1"
+          size="small"
+          circle
+          ghost
+          border
+          onClick={props.onRemove}
+          disabled={disabled}
+          tooltip="Mark as entered in error"
+          tooltipClassName="tooltip-bottom -translate-x-2/3 md:-translate-x-1/2 translate-y-1 text-xs"
+        >
+          <CareIcon icon="l-times" className="text-base md:text-lg" />
+        </ButtonV2>
+      </div>
+    </div>
+  );
+};
+
+const AddSymptom = (props: {
+  disabled?: boolean;
+  existing: (Writable<EncounterSymptom> | EncounterSymptom)[];
+  onAdd?: (value: Writable<EncounterSymptom>[]) => void;
+  consultationId?: string;
+}) => {
+  const [processing, setProcessing] = useState(false);
+  const [selected, setSelected] = useState<EncounterSymptom["symptom"][]>([]);
+  const [otherSymptom, setOtherSymptom] = useState("");
+  const [onsetDate, setOnsetDate] = useState<Date>();
+
+  const activeSymptomIds = props.existing
+    .filter((o) => o.symptom !== OTHER_SYMPTOM_CHOICE.id && !o.cure_date)
+    .map((o) => o.symptom);
+
+  const handleAdd = async () => {
+    const objects = selected.map((symptom) => {
+      return {
+        symptom,
+        onset_date: dateQueryString(onsetDate),
+        other_symptom:
+          symptom === OTHER_SYMPTOM_CHOICE.id ? otherSymptom : undefined,
+      };
+    });
+
+    if (props.consultationId) {
+      const responses = await Promise.all(
+        objects.map((body) =>
+          request(SymptomsApi.add, {
+            body,
+            pathParams: { consultationId: props.consultationId! },
+          }),
+        ),
+      );
+
+      if (responses.every(({ res }) => !!res?.ok)) {
+        Success({ msg: "Symptoms records updated successfully" });
+      }
+    }
+    props.onAdd?.(objects);
+
+    setSelected([]);
+    setOtherSymptom("");
+  };
+
+  const hasSymptoms = !!selected.length;
+  const otherSymptomValid = selected.includes(OTHER_SYMPTOM_CHOICE.id)
+    ? !!otherSymptom.trim()
+    : true;
+
+  return (
+    <div className="flex w-full flex-wrap items-start gap-4 md:flex-nowrap">
+      <DateFormField
+        className="w-full md:w-36"
+        name="onset_date"
+        placeholder="Date of onset"
+        disableFuture
+        value={onsetDate}
+        onChange={({ value }) => setOnsetDate(value)}
+        errorClassName="hidden"
+      />
+      <div className="flex w-full flex-col gap-2">
+        <AutocompleteMultiSelectFormField
+          id="additional_symptoms"
+          name="symptom"
+          className="w-full"
+          disabled={props.disabled || processing}
+          placeholder="Search for symptoms"
+          value={selected}
+          onChange={(e) => setSelected(e.value)}
+          options={SYMPTOM_CHOICES.filter(
+            ({ id }) => !activeSymptomIds.includes(id),
+          )}
+          optionLabel={(option) => option.text}
+          optionValue={(option) => option.id}
+          errorClassName="hidden"
+        />
+        {selected.includes(OTHER_SYMPTOM_CHOICE.id) && (
+          <TextAreaFormField
+            id="other_symptoms"
+            label="Other symptom details"
+            labelClassName="text-sm"
+            name="other_symptom"
+            placeholder="Describe the other symptom"
+            value={otherSymptom}
+            onChange={({ value }) => setOtherSymptom(value)}
+            errorClassName="hidden"
+          />
+        )}
+      </div>
+      <ButtonV2
+        type="button"
+        className="w-full py-3 md:w-auto"
+        disabled={
+          processing || !hasSymptoms || !otherSymptomValid || !onsetDate
+        }
+        tooltip={
+          !hasSymptoms
+            ? "No symptoms selected to be added"
+            : !otherSymptomValid
+              ? "Other symptom details not specified"
+              : !onsetDate
+                ? "No date of onset specified"
+                : undefined
+        }
+        tooltipClassName="tooltip-bottom -translate-x-1/2 text-xs translate-y-1 w-full max-w-96 whitespace-pre-wrap"
+        onClick={async () => {
+          setProcessing(true);
+          await handleAdd();
+          setProcessing(false);
+        }}
+      >
+        {processing ? (
+          <>
+            <CareIcon icon="l-spinner-alt" className="animate-spin text-lg" />
+            <span>Adding...</span>
+          </>
+        ) : (
+          <span>Add Symptom(s)</span>
+        )}
+      </ButtonV2>
+    </div>
+  );
+};
+
+export const SymptomText = (props: {
+  value: Writable<EncounterSymptom> | EncounterSymptom;
+}) => {
+  const symptom =
+    SYMPTOM_CHOICES.find(({ id }) => props.value.symptom === id) ||
+    OTHER_SYMPTOM_CHOICE;
+
+  const isOtherSymptom = symptom.id === OTHER_SYMPTOM_CHOICE.id;
+
+  return isOtherSymptom ? (
+    <>
+      <span className="font-normal">Other: </span>
+      <span
+        className={classNames(
+          !props.value.other_symptom?.trim() && "italic text-gray-700",
+        )}
+      >
+        {props.value.other_symptom || "Not specified"}
+      </span>
+    </>
+  ) : (
+    symptom.text
+  );
+};
diff --git a/src/Components/Symptoms/SymptomsCard.tsx b/src/Components/Symptoms/SymptomsCard.tsx
new file mode 100644
index 00000000000..3ea124c17b2
--- /dev/null
+++ b/src/Components/Symptoms/SymptomsCard.tsx
@@ -0,0 +1,84 @@
+import RecordMeta from "../../CAREUI/display/RecordMeta";
+import useSlug from "../../Common/hooks/useSlug";
+import useQuery from "../../Utils/request/useQuery";
+import { SymptomText } from "./SymptomsBuilder";
+import SymptomsApi from "./api";
+import { type EncounterSymptom } from "./types";
+import { groupAndSortSymptoms } from "./utils";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+
+// TODO: switch to list from events as timeline view instead once filter event by event type name is done
+const EncounterSymptomsCard = () => {
+  const consultationId = useSlug("consultation");
+
+  const { data } = useQuery(SymptomsApi.list, {
+    pathParams: { consultationId },
+    query: { limit: 100 },
+  });
+
+  if (!data) {
+    return (
+      <div className="flex w-full animate-pulse justify-center gap-2 rounded-lg bg-gray-200 py-8 text-center font-medium text-gray-700">
+        <CareIcon icon="l-spinner-alt" className="animate-spin text-lg" />
+        <span>Fetching symptom records...</span>
+      </div>
+    );
+  }
+
+  const records = groupAndSortSymptoms(data.results);
+
+  return (
+    <div>
+      <h3 className="mb-2 text-lg font-semibold leading-relaxed text-gray-900">
+        Symptoms
+      </h3>
+
+      <div className="grid gap-4 divide-y-2 divide-dashed divide-gray-400 md:grid-cols-2 md:divide-x-2 md:divide-y-0">
+        <SymptomsSection title="Active" symptoms={records["in-progress"]} />
+        <div className="pt-4 md:pl-6 md:pt-0">
+          <SymptomsSection title="Cured" symptoms={records["completed"]} />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const SymptomsSection = (props: {
+  title: string;
+  symptoms: EncounterSymptom[];
+}) => {
+  return (
+    <div>
+      <h4 className="text-base font-semibold leading-relaxed text-gray-900">
+        {props.title}
+      </h4>
+      <ul className="flex list-disc flex-col px-4">
+        {props.symptoms.map((record) => (
+          <li key={record.id}>
+            <div>
+              <SymptomText value={record} />
+              <br />
+              <span className="flex text-sm text-gray-800">
+                <span className="flex gap-1">
+                  Onset <RecordMeta time={record.onset_date} />
+                </span>
+                {record.cure_date && (
+                  <span className="flex gap-1">
+                    {"; Cured"} <RecordMeta time={record.cure_date} />
+                  </span>
+                )}
+              </span>
+            </div>
+          </li>
+        ))}
+      </ul>
+      {!props.symptoms.length && (
+        <div className="flex h-full w-full gap-2 font-medium text-gray-700">
+          No symptoms
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default EncounterSymptomsCard;
diff --git a/src/Components/Symptoms/api.ts b/src/Components/Symptoms/api.ts
new file mode 100644
index 00000000000..1cce062cb1e
--- /dev/null
+++ b/src/Components/Symptoms/api.ts
@@ -0,0 +1,47 @@
+import { Type } from "../../Redux/api";
+import { PaginatedResponse } from "../../Utils/request/types";
+import { WritableOnly } from "../../Utils/types";
+import { EncounterSymptom } from "./types";
+
+const SymptomsApi = {
+  list: {
+    method: "GET",
+    path: "/api/v1/consultation/{consultationId}/symptoms/",
+    TRes: Type<PaginatedResponse<EncounterSymptom>>(),
+  },
+
+  add: {
+    path: "/api/v1/consultation/{consultationId}/symptoms/",
+    method: "POST",
+    TRes: Type<EncounterSymptom>(),
+    TBody: Type<WritableOnly<EncounterSymptom>>(),
+  },
+
+  retrieve: {
+    method: "GET",
+    path: "/api/v1/consultation/{consultationId}/symptoms/{external_id}/",
+    TRes: Type<EncounterSymptom>(),
+  },
+
+  update: {
+    method: "PUT",
+    path: "/api/v1/consultation/{consultationId}/symptoms/{external_id}/",
+    TBody: Type<WritableOnly<EncounterSymptom>>(),
+    TRes: Type<EncounterSymptom>(),
+  },
+
+  partialUpdate: {
+    method: "PATCH",
+    path: "/api/v1/consultation/{consultationId}/symptoms/{external_id}/",
+    TBody: Type<Partial<WritableOnly<EncounterSymptom>>>(),
+    TRes: Type<EncounterSymptom>(),
+  },
+
+  markAsEnteredInError: {
+    method: "DELETE",
+    path: "/api/v1/consultation/{consultationId}/symptoms/{external_id}/",
+    TRes: Type<unknown>(),
+  },
+} as const;
+
+export default SymptomsApi;
diff --git a/src/Components/Symptoms/types.ts b/src/Components/Symptoms/types.ts
new file mode 100644
index 00000000000..78e769ce9a9
--- /dev/null
+++ b/src/Components/Symptoms/types.ts
@@ -0,0 +1,52 @@
+import { BaseModel } from "../../Utils/types";
+
+export const OTHER_SYMPTOM_CHOICE = { id: 9, text: "Other Symptom" } as const;
+
+export const SYMPTOM_CHOICES = [
+  { id: 2, text: "Fever" },
+  { id: 3, text: "Sore throat" },
+  { id: 4, text: "Cough" },
+  { id: 5, text: "Breathlessness" },
+  { id: 6, text: "Myalgia" },
+  { id: 7, text: "Abdominal discomfort" },
+  { id: 8, text: "Vomiting" },
+  { id: 11, text: "Sputum" },
+  { id: 12, text: "Nausea" },
+  { id: 13, text: "Chest pain" },
+  { id: 14, text: "Hemoptysis" },
+  { id: 15, text: "Nasal discharge" },
+  { id: 16, text: "Body ache" },
+  { id: 17, text: "Diarrhoea" },
+  { id: 18, text: "Pain" },
+  { id: 19, text: "Pedal Edema" },
+  { id: 20, text: "Wound" },
+  { id: 21, text: "Constipation" },
+  { id: 22, text: "Head ache" },
+  { id: 23, text: "Bleeding" },
+  { id: 24, text: "Dizziness" },
+  { id: 25, text: "Chills" },
+  { id: 26, text: "General weakness" },
+  { id: 27, text: "Irritability" },
+  { id: 28, text: "Confusion" },
+  { id: 29, text: "Abdominal pain" },
+  { id: 30, text: "Join pain" },
+  { id: 31, text: "Redness of eyes" },
+  { id: 32, text: "Anorexia" },
+  { id: 33, text: "New loss of taste" },
+  { id: 34, text: "New loss of smell" },
+  OTHER_SYMPTOM_CHOICE,
+] as const;
+
+type ClinicalImpressionStatus =
+  | "in-progress"
+  | "completed"
+  | "entered-in-error";
+
+export interface EncounterSymptom extends BaseModel {
+  symptom: (typeof SYMPTOM_CHOICES)[number]["id"];
+  other_symptom?: string | null;
+  onset_date: string;
+  cure_date?: string | null;
+  readonly clinical_impression_status: ClinicalImpressionStatus;
+  readonly is_migrated: boolean;
+}
diff --git a/src/Components/Symptoms/utils.ts b/src/Components/Symptoms/utils.ts
new file mode 100644
index 00000000000..997acfc914b
--- /dev/null
+++ b/src/Components/Symptoms/utils.ts
@@ -0,0 +1,37 @@
+import { Writable } from "../../Utils/types";
+import { compareByDateString } from "../../Utils/utils";
+import { EncounterSymptom } from "./types";
+
+// TODO: switch to using Object.groupBy(...) instead once upgraded to node v22
+export const groupAndSortSymptoms = <
+  T extends Writable<EncounterSymptom> | EncounterSymptom,
+>(
+  records: T[],
+) => {
+  const result: Record<EncounterSymptom["clinical_impression_status"], T[]> = {
+    "entered-in-error": [],
+    "in-progress": [],
+    completed: [],
+  };
+
+  for (const record of records) {
+    const status =
+      record.clinical_impression_status ||
+      (record.cure_date ? "completed" : "in-progress");
+    result[status].push(record);
+  }
+
+  result["completed"] = sortByOnsetDate(result["completed"]);
+  result["in-progress"] = sortByOnsetDate(result["in-progress"]);
+  result["entered-in-error"] = sortByOnsetDate(result["entered-in-error"]);
+
+  return result;
+};
+
+export const sortByOnsetDate = <
+  T extends Writable<EncounterSymptom> | EncounterSymptom,
+>(
+  records: T[],
+) => {
+  return records.sort(compareByDateString("onset_date"));
+};
diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json
index e2556587e96..019a51232ba 100644
--- a/src/Locale/en/Common.json
+++ b/src/Locale/en/Common.json
@@ -163,5 +163,8 @@
   "clear_all_filters": "Clear All Filters",
   "summary": "Summary",
   "report": "Report",
-  "treating_doctor":"Treating Doctor"
+  "treating_doctor": "Treating Doctor",
+  "ration_card__NO_CARD": "Non-card holder",
+  "ration_card__BPL": "BPL",
+  "ration_card__APL": "APL"
 }
\ No newline at end of file
diff --git a/src/Locale/en/Medicine.json b/src/Locale/en/Medicine.json
index 36adc259514..4a5a5785047 100644
--- a/src/Locale/en/Medicine.json
+++ b/src/Locale/en/Medicine.json
@@ -36,6 +36,7 @@
   "prescription_discontinued": "Prescription discontinued",
   "administration_notes": "Administration Notes",
   "last_administered": "Last administered",
+  "prescription_logs": "Prescription Logs",
   "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.",
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 6dc5fa9c05d..8b75e3f147f 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -9,6 +9,7 @@ import { make as CriticalCareRecording } from "../../Components/CriticalCareReco
 import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
 import TreatmentSummary from "../../Components/Facility/TreatmentSummary";
 import ConsultationDoctorNotes from "../../Components/Facility/ConsultationDoctorNotes";
+import PatientConsentRecords from "../../Components/Patient/PatientConsentRecords";
 
 export default {
   "/facility/:facilityId/patient/:patientId/consultation": ({
@@ -22,6 +23,14 @@ export default {
   }: any) => (
     <ConsultationForm facilityId={facilityId} patientId={patientId} id={id} />
   ),
+  "/facility/:facilityId/patient/:patientId/consultation/:id/consent-records":
+    ({ facilityId, patientId, id }: any) => (
+      <PatientConsentRecords
+        facilityId={facilityId}
+        patientId={patientId}
+        consultationId={id}
+      />
+    ),
   "/facility/:facilityId/patient/:patientId/consultation/:id/files/": ({
     facilityId,
     patientId,
diff --git a/src/Utils/types.ts b/src/Utils/types.ts
new file mode 100644
index 00000000000..519ede36ffc
--- /dev/null
+++ b/src/Utils/types.ts
@@ -0,0 +1,36 @@
+import { PerformedByModel } from "../Components/HCX/misc";
+
+export interface BaseModel {
+  readonly id: string;
+  readonly modified_date: string;
+  readonly created_date: string;
+  readonly created_by: PerformedByModel;
+  readonly updated_by: PerformedByModel;
+}
+
+export type Writable<T> = {
+  [P in keyof T as IfEquals<
+    { [Q in P]: T[P] },
+    { -readonly [Q in P]: T[P] },
+    never,
+    P
+  >]?: undefined;
+} & {
+  [P in keyof T as IfEquals<
+    { [Q in P]: T[P] },
+    { -readonly [Q in P]: T[P] },
+    P,
+    never
+  >]: T[P];
+};
+
+export type WritableOnly<T> = {
+  [P in keyof T as IfEquals<
+    { [Q in P]: T[P] },
+    { -readonly [Q in P]: T[P] },
+    P
+  >]: T[P];
+};
+
+type IfEquals<X, Y, A = X, B = never> =
+  (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx
new file mode 100644
index 00000000000..133b4d2533d
--- /dev/null
+++ b/src/Utils/useFileManager.tsx
@@ -0,0 +1,274 @@
+import { useState } from "react";
+import FilePreviewDialog from "../Components/Common/FilePreviewDialog";
+import { FileUploadModel } from "../Components/Patient/models";
+import { ExtImage, StateInterface } from "../Components/Patient/FileUpload";
+import request from "./request/request";
+import routes from "../Redux/api";
+import DialogModal from "../Components/Common/Dialog";
+import CareIcon from "../CAREUI/icons/CareIcon";
+import TextAreaFormField from "../Components/Form/FormFields/TextAreaFormField";
+import { Cancel, Submit } from "../Components/Common/components/ButtonV2";
+import { formatDateTime } from "./utils";
+import * as Notification from "./Notifications.js";
+
+export interface FileManagerOptions {
+  type: string;
+  onArchive?: () => void;
+}
+
+export interface FileManagerResult {
+  viewFile: (file: FileUploadModel, associating_id: string) => void;
+  archiveFile: (
+    file: FileUploadModel,
+    associating_id: string,
+    skipPrompt?: { reason: string },
+  ) => void;
+  Dialogues: React.ReactNode;
+}
+
+export default function useFileManager(
+  options: FileManagerOptions,
+): FileManagerResult {
+  const { type: fileType, onArchive } = options;
+
+  const [file_state, setFileState] = useState<StateInterface>({
+    open: false,
+    isImage: false,
+    name: "",
+    extension: "",
+    zoom: 4,
+    isZoomInDisabled: false,
+    isZoomOutDisabled: false,
+    rotation: 0,
+  });
+  const [fileUrl, setFileUrl] = useState<string>("");
+  const [downloadURL, setDownloadURL] = useState<string>("");
+  const [archiveDialogueOpen, setArchiveDialogueOpen] = useState<
+    (FileUploadModel & { associating_id: string }) | null
+  >(null);
+  const [archiveReason, setArchiveReason] = useState("");
+  const [archiveReasonError, setArchiveReasonError] = useState("");
+  const [archiving, setArchiving] = useState(false);
+
+  const getExtension = (url: string) => {
+    const div1 = url.split("?")[0].split(".");
+    const ext: string = div1[div1.length - 1].toLowerCase();
+    return ext;
+  };
+
+  const viewFile = async (file: FileUploadModel, associating_id: string) => {
+    setFileUrl("");
+    setFileState({ ...file_state, open: true });
+    const { data } = await request(routes.retrieveUpload, {
+      query: {
+        file_type: fileType,
+        associating_id,
+      },
+      pathParams: { id: file.id || "" },
+    });
+
+    if (!data) return;
+
+    const signedUrl = data.read_signed_url as string;
+    const extension = getExtension(signedUrl);
+
+    const downloadFileUrl = (url: string) => {
+      fetch(url)
+        .then((res) => res.blob())
+        .then((blob) => {
+          setDownloadURL(URL.createObjectURL(blob));
+        });
+    };
+
+    setFileState({
+      ...file_state,
+      open: true,
+      name: data.name as string,
+      extension,
+      isImage: ExtImage.includes(extension),
+    });
+    downloadFileUrl(signedUrl);
+    setFileUrl(signedUrl);
+  };
+
+  const validateArchiveReason = (name: any) => {
+    if (name.trim() === "") {
+      setArchiveReasonError("Please enter a valid reason!");
+      return false;
+    } else {
+      setArchiveReasonError("");
+      return true;
+    }
+  };
+
+  const handleFileArchive = async (archiveFile: typeof archiveDialogueOpen) => {
+    if (!validateArchiveReason(archiveReason)) {
+      setArchiving(false);
+      return;
+    }
+
+    const { res } = await request(routes.editUpload, {
+      body: { is_archived: true, archive_reason: archiveReason },
+      pathParams: {
+        id: archiveFile?.id || "",
+        fileType,
+        associatingId: archiveFile?.associating_id || "",
+      },
+    });
+
+    if (res?.ok) {
+      Notification.Success({ msg: "File archived successfully" });
+    }
+
+    setArchiveDialogueOpen(null);
+    setArchiving(false);
+    setArchiveReason("");
+    onArchive && onArchive();
+    return res;
+  };
+
+  const archiveFile = (
+    file: FileUploadModel,
+    associating_id: string,
+    skipPrompt?: { reason: string },
+  ) => {
+    if (skipPrompt) {
+      setArchiving(true);
+      setArchiveReason(skipPrompt.reason);
+      handleFileArchive({
+        ...file,
+        associating_id,
+      });
+      return;
+    }
+    setArchiveDialogueOpen({ ...file, associating_id });
+  };
+
+  const handleFilePreviewClose = () => {
+    setDownloadURL("");
+    setFileState({
+      ...file_state,
+      open: false,
+      zoom: 4,
+      isZoomInDisabled: false,
+      isZoomOutDisabled: false,
+    });
+  };
+
+  const Dialogues = (
+    <>
+      <FilePreviewDialog
+        show={file_state.open}
+        fileUrl={fileUrl}
+        file_state={file_state}
+        setFileState={setFileState}
+        downloadURL={downloadURL}
+        onClose={handleFilePreviewClose}
+        fixedWidth={false}
+        className="h-[80vh] w-full md:h-screen"
+      />
+      <DialogModal
+        show={
+          archiveDialogueOpen !== null &&
+          archiveDialogueOpen.archived_datetime === null
+        }
+        title={
+          <div className="flex flex-row">
+            <div className="my-1 mr-3 rounded-full bg-red-100 px-5 py-4 text-center">
+              <CareIcon
+                icon="l-exclamation-triangle"
+                className="text-lg text-danger-500"
+              />
+            </div>
+            <div className="text-grey-200 text-sm">
+              <h1 className="text-xl text-black">Archive File</h1>
+              This action is irreversible. Once a file is archived it cannot be
+              unarchived.
+            </div>
+          </div>
+        }
+        onClose={() => setArchiveDialogueOpen(null)}
+      >
+        <form
+          onSubmit={(event: any) => {
+            event.preventDefault();
+            handleFileArchive(archiveDialogueOpen);
+          }}
+          className="mx-2 my-4 flex w-full flex-col"
+        >
+          <div>
+            <TextAreaFormField
+              name="editFileName"
+              label={
+                <span>
+                  State the reason for archiving{" "}
+                  <b>{archiveDialogueOpen?.name}</b> file?
+                </span>
+              }
+              rows={6}
+              required
+              placeholder="Type the reason..."
+              value={archiveReason}
+              onChange={(e) => setArchiveReason(e.value)}
+              error={archiveReasonError}
+            />
+          </div>
+          <div className="mt-4 flex flex-col-reverse justify-end gap-2 md:flex-row">
+            <Cancel onClick={() => setArchiveDialogueOpen(null)} />
+            <Submit disabled={archiving} label="Proceed" />
+          </div>
+        </form>
+      </DialogModal>
+      <DialogModal
+        show={
+          archiveDialogueOpen !== null &&
+          archiveDialogueOpen.archived_datetime !== null
+        }
+        title={
+          <div className="flex flex-row">
+            <div className="my-1 mr-3 rounded-full bg-primary-100 px-5 py-4 text-center">
+              <CareIcon
+                icon="l-question-circle"
+                className="text-lg text-primary-500"
+              />
+            </div>
+            <div className="text-grey-200 text-sm">
+              <h1 className="text-xl text-black">File Details</h1>
+              This file is archived. Once a file is archived it cannot be
+              unarchived.
+            </div>
+          </div>
+        }
+        onClose={() => setArchiveDialogueOpen(null)}
+      >
+        <div className="flex flex-col">
+          <div>
+            <div className="text-md m-2 text-center">
+              <b id="archive-file-name">{archiveDialogueOpen?.name}</b> file is
+              archived.
+            </div>
+            <div className="text-md text-center" id="archive-file-reason">
+              <b>Reason:</b> {archiveDialogueOpen?.archive_reason}
+            </div>
+            <div className="text-md text-center">
+              <b>Archived by:</b> {archiveDialogueOpen?.archived_by?.username}
+            </div>
+            <div className="text-md text-center">
+              <b>Time of Archive: </b>
+              {formatDateTime(archiveDialogueOpen?.archived_datetime)}
+            </div>
+          </div>
+          <div className="mt-4 flex flex-col-reverse justify-end gap-2 md:flex-row">
+            <Cancel onClick={(_) => setArchiveDialogueOpen(null)} />
+          </div>
+        </div>
+      </DialogModal>
+    </>
+  );
+
+  return {
+    viewFile,
+    archiveFile,
+    Dialogues,
+  };
+}
diff --git a/src/Utils/useFileUpload.tsx b/src/Utils/useFileUpload.tsx
new file mode 100644
index 00000000000..e28e8c9b1b5
--- /dev/null
+++ b/src/Utils/useFileUpload.tsx
@@ -0,0 +1,448 @@
+import { ChangeEvent, useCallback, useRef, useState } from "react";
+import {
+  CreateFileResponse,
+  FileCategory,
+  FileUploadModel,
+} from "../Components/Patient/models";
+import DialogModal from "../Components/Common/Dialog";
+import CareIcon, { IconName } from "../CAREUI/icons/CareIcon";
+import Webcam from "react-webcam";
+import ButtonV2, { Submit } from "../Components/Common/components/ButtonV2";
+import { t } from "i18next";
+import useWindowDimensions from "../Common/hooks/useWindowDimensions";
+import { classNames } from "./utils";
+import request from "./request/request";
+import routes from "../Redux/api";
+import uploadFile from "./request/uploadFile";
+import * as Notification from "./Notifications.js";
+import imageCompression from "browser-image-compression";
+
+export type FileUploadOptions = {
+  type: string;
+  category?: FileCategory;
+  onUpload?: (file: FileUploadModel) => void;
+} & (
+  | {
+      allowAllExtensions?: boolean;
+    }
+  | {
+      allowedExtensions?: string[];
+    }
+);
+
+export type FileUploadButtonProps = {
+  icon?: IconName;
+  content?: string;
+  className?: string;
+};
+
+export type FileUploadReturn = {
+  progress: null | number;
+  error: null | string;
+  handleCameraCapture: () => void;
+  handleAudioCapture: () => void;
+  handleFileUpload: (associating_id: string) => Promise<void>;
+  Dialogues: JSX.Element;
+  UploadButton: (_: FileUploadButtonProps) => JSX.Element;
+  fileName: string;
+  file: File | null;
+  setFileName: (name: string) => void;
+  clearFile: () => void;
+};
+
+const videoConstraints = {
+  width: { ideal: 4096 },
+  height: { ideal: 2160 },
+  facingMode: "user",
+};
+
+// Array of image extensions
+const ExtImage: string[] = [
+  "jpeg",
+  "jpg",
+  "png",
+  "gif",
+  "svg",
+  "bmp",
+  "webp",
+  "jfif",
+];
+
+export default function useFileUpload(
+  options: FileUploadOptions,
+): FileUploadReturn {
+  const { type, onUpload, category = "UNSPECIFIED" } = options;
+
+  const [uploadFileName, setUploadFileName] = useState<string>("");
+  const [error, setError] = useState<string | null>(null);
+  const [progress, setProgress] = useState<null | number>(null);
+  const [cameraModalOpen, setCameraModalOpen] = useState(false);
+  const [cameraFacingFront, setCameraFacingFront] = useState(true);
+  const webRef = useRef<any>(null);
+  const [previewImage, setPreviewImage] = useState(null);
+  const [file, setFile] = useState<File | null>(null);
+
+  const handleSwitchCamera = useCallback(() => {
+    setCameraFacingFront((prevState) => !prevState);
+  }, []);
+
+  const { width } = useWindowDimensions();
+  const LaptopScreenBreakpoint = 640;
+  const isLaptopScreen = width >= LaptopScreenBreakpoint ? true : false;
+
+  const captureImage = () => {
+    setPreviewImage(webRef.current.getScreenshot());
+    const canvas = webRef.current.getCanvas();
+    canvas?.toBlob((blob: Blob) => {
+      const extension = blob.type.split("/").pop();
+      const myFile = new File([blob], `capture.${extension}`, {
+        type: blob.type,
+      });
+      setUploadFileName(uploadFileName || "");
+      setFile(myFile);
+    });
+  };
+
+  const onFileChange = (e: ChangeEvent<HTMLInputElement>): any => {
+    if (!e.target.files?.length) {
+      return;
+    }
+    const f = e.target.files[0];
+    const fileName = f.name;
+    setFile(e.target.files[0]);
+    setUploadFileName(
+      uploadFileName ||
+        fileName.substring(0, fileName.lastIndexOf(".")) ||
+        fileName,
+    );
+
+    const ext: string = fileName.split(".")[1];
+
+    if (ExtImage.includes(ext)) {
+      const options = {
+        initialQuality: 0.6,
+        alwaysKeepResolution: true,
+      };
+      imageCompression(f, options).then((compressedFile: File) => {
+        setFile(compressedFile);
+      });
+      return;
+    }
+    setFile(f);
+  };
+
+  const validateFileUpload = () => {
+    const filenameLength = uploadFileName.trim().length;
+    const f = file;
+    if (f === undefined || f === null) {
+      setError("Please choose a file to upload");
+      return false;
+    }
+    if (filenameLength === 0) {
+      setError("Please give a name !!");
+      return false;
+    }
+    if (f.size > 10e7) {
+      setError("Maximum size of files is 100 MB");
+      return false;
+    }
+    return true;
+  };
+  const markUploadComplete = (
+    data: CreateFileResponse,
+    associatingId: string,
+  ) => {
+    return request(routes.editUpload, {
+      body: { upload_completed: true },
+      pathParams: {
+        id: data.id,
+        fileType: type,
+        associatingId,
+      },
+    });
+  };
+
+  const uploadfile = async (data: CreateFileResponse) => {
+    const url = data.signed_url;
+    const internal_name = data.internal_name;
+    const f = file;
+    if (!f) return;
+    const newFile = new File([f], `${internal_name}`);
+    console.log("filetype: ", newFile.type);
+    return new Promise<void>((resolve, reject) => {
+      uploadFile(
+        url,
+        newFile,
+        "PUT",
+        { "Content-Type": file?.type },
+        (xhr: XMLHttpRequest) => {
+          if (xhr.status >= 200 && xhr.status < 300) {
+            setProgress(null);
+            setFile(null);
+            setUploadFileName("");
+            Notification.Success({
+              msg: "File Uploaded Successfully",
+            });
+            setError(null);
+            onUpload && onUpload(data);
+            resolve();
+          } else {
+            Notification.Error({
+              msg: "Error Uploading File: " + xhr.statusText,
+            });
+            setProgress(null);
+            reject();
+          }
+        },
+        setProgress as any,
+        () => {
+          Notification.Error({
+            msg: "Error Uploading File: Network Error",
+          });
+          setProgress(null);
+          reject();
+        },
+      );
+    });
+  };
+
+  const handleUpload = async (associating_id: string) => {
+    if (!validateFileUpload()) return;
+    const f = file;
+
+    const filename = uploadFileName === "" && f ? f.name : uploadFileName;
+    const name = f?.name;
+    setProgress(0);
+
+    const { data } = await request(routes.createUpload, {
+      body: {
+        original_name: name ?? "",
+        file_type: type,
+        name: filename,
+        associating_id,
+        file_category: category,
+        mime_type: f?.type ?? "",
+      },
+    });
+
+    if (data) {
+      await uploadfile(data);
+      await markUploadComplete(data, associating_id);
+    }
+  };
+
+  const cameraFacingMode = cameraFacingFront
+    ? "user"
+    : { exact: "environment" };
+
+  const Dialogues = (
+    <DialogModal
+      show={cameraModalOpen}
+      title={
+        <div className="flex flex-row">
+          <div className="rounded-full bg-primary-100 px-5 py-4">
+            <CareIcon
+              icon="l-camera-change"
+              className="text-lg text-primary-500"
+            />
+          </div>
+          <div className="m-4">
+            <h1 className="text-xl text-black "> Camera</h1>
+          </div>
+        </div>
+      }
+      className="max-w-2xl"
+      onClose={() => setCameraModalOpen(false)}
+    >
+      <div>
+        {!previewImage ? (
+          <div className="m-3">
+            <Webcam
+              forceScreenshotSourceSize
+              screenshotQuality={1}
+              audio={false}
+              screenshotFormat="image/jpeg"
+              ref={webRef}
+              videoConstraints={{
+                ...videoConstraints,
+                facingMode: cameraFacingMode,
+              }}
+            />
+          </div>
+        ) : (
+          <div className="m-3">
+            <img src={previewImage} />
+          </div>
+        )}
+      </div>
+
+      {/* buttons for mobile screens */}
+      <div className="m-4 flex justify-evenly sm:hidden ">
+        <div>
+          {!previewImage ? (
+            <ButtonV2 onClick={handleSwitchCamera} className="m-2">
+              {t("switch")}
+            </ButtonV2>
+          ) : (
+            <></>
+          )}
+        </div>
+        <div>
+          {!previewImage ? (
+            <>
+              <div>
+                <ButtonV2
+                  onClick={() => {
+                    captureImage();
+                  }}
+                  className="m-2"
+                >
+                  {t("capture")}
+                </ButtonV2>
+              </div>
+            </>
+          ) : (
+            <>
+              <div className="flex space-x-2">
+                <ButtonV2
+                  onClick={() => {
+                    setPreviewImage(null);
+                  }}
+                  className="m-2"
+                >
+                  {t("retake")}
+                </ButtonV2>
+                <Submit
+                  onClick={() => {
+                    setPreviewImage(null);
+                    setCameraModalOpen(false);
+                  }}
+                  className="m-2"
+                >
+                  {t("submit")}
+                </Submit>
+              </div>
+            </>
+          )}
+        </div>
+        <div className="sm:flex-1">
+          <ButtonV2
+            variant="secondary"
+            onClick={() => {
+              setPreviewImage(null);
+              setCameraModalOpen(false);
+            }}
+            className="m-2"
+          >
+            {t("close")}
+          </ButtonV2>
+        </div>
+      </div>
+      {/* buttons for laptop screens */}
+      <div className={`${isLaptopScreen ? " " : " hidden "}`}>
+        <div className="m-4 flex lg:hidden">
+          <ButtonV2 onClick={handleSwitchCamera}>
+            <CareIcon icon="l-camera-change" className="text-lg" />
+            {`${t("switch")} ${t("camera")}`}
+          </ButtonV2>
+        </div>
+
+        <div className="flex justify-end  gap-2 p-4">
+          <div>
+            {!previewImage ? (
+              <>
+                <div>
+                  <ButtonV2
+                    onClick={() => {
+                      captureImage();
+                    }}
+                  >
+                    <CareIcon icon="l-capture" className="text-lg" />
+                    {t("capture")}
+                  </ButtonV2>
+                </div>
+              </>
+            ) : (
+              <>
+                <div className="flex space-x-2">
+                  <ButtonV2
+                    onClick={() => {
+                      setPreviewImage(null);
+                    }}
+                  >
+                    {t("retake")}
+                  </ButtonV2>
+                  <Submit
+                    onClick={() => {
+                      setCameraModalOpen(false);
+                      setPreviewImage(null);
+                    }}
+                  >
+                    {t("submit")}
+                  </Submit>
+                </div>
+              </>
+            )}
+          </div>
+          <div className="sm:flex-1" />
+          <ButtonV2
+            variant="secondary"
+            onClick={() => {
+              setPreviewImage(null);
+              setCameraModalOpen(false);
+            }}
+          >
+            {`${t("close")} ${t("camera")}`}
+          </ButtonV2>
+        </div>
+      </div>
+    </DialogModal>
+  );
+
+  const UploadButton = (props: FileUploadButtonProps) => (
+    <label
+      className={classNames(
+        "button-size-default button-shape-square button-primary-default inline-flex h-min w-full cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out",
+        props.className,
+      )}
+    >
+      <CareIcon icon={props.icon || "l-file-upload-alt"} className="text-lg" />
+      {props.content || t("choose_file")}
+      <input
+        id="file_upload_patient"
+        title="changeFile"
+        onChange={onFileChange}
+        type="file"
+        accept={
+          "allowAllExtensions" in options
+            ? "image/*,video/*,audio/*,text/plain,text/csv,application/rtf,application/msword,application/vnd.oasis.opendocument.text,application/pdf,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet,application/pdf"
+            : "allowedExtensions" in options
+              ? options.allowedExtensions?.join(",")
+              : ""
+        }
+        hidden
+      />
+    </label>
+  );
+
+  return {
+    progress,
+    error,
+    handleCameraCapture: () => {
+      setCameraModalOpen(true);
+    },
+    handleAudioCapture: () => {
+      console.log("Audio capture not implemented");
+    },
+    handleFileUpload: handleUpload,
+    Dialogues,
+    UploadButton,
+    fileName: uploadFileName,
+    file: file,
+    setFileName: setUploadFileName,
+    clearFile: () => {
+      setFile(null);
+      setUploadFileName("");
+    },
+  };
+}
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 38ffc2e1c66..d599a494b1c 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -409,6 +409,14 @@ export const compareBy = <T extends object>(key: keyof T) => {
   };
 };
 
+export const compareByDateString = <T extends object>(key: keyof T) => {
+  return (a: T, b: T) => {
+    const aV = new Date(a[key] as string);
+    const bV = new Date(b[key] as string);
+    return aV < bV ? -1 : aV > bV ? 1 : 0;
+  };
+};
+
 export const isValidUrl = (url?: string) => {
   try {
     new URL(url ?? "");
diff --git a/src/style/index.css b/src/style/index.css
index fe2c9c8edb1..b05417bf912 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -429,6 +429,12 @@ button:disabled,
     }
 }
 
+.skeleton-animate-alpha {
+    animation: skeletonShimmer 3s infinite linear;
+    background: linear-gradient(to right, rgba(0, 0, 0, 0.1) 10%, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1) 70%);
+    background-size: 1000px 100%;
+}
+
 
 @media print {
     body * {