diff --git a/SECURITY.md b/SECURITY.md
index 0b3730ed9ad..03d8dec4837 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -23,4 +23,4 @@
 
 ## Reporting a Vulnerability
 
-Please create a ticket at https://support.coronasafe.network
+Please create an issue at https://github.com/coronasafe/care_fe/issues/new
diff --git a/cypress/e2e/patient_spec/patient_consultation.cy.ts b/cypress/e2e/patient_spec/patient_consultation.cy.ts
index 8caea111ca1..d5732a6619d 100644
--- a/cypress/e2e/patient_spec/patient_consultation.cy.ts
+++ b/cypress/e2e/patient_spec/patient_consultation.cy.ts
@@ -66,7 +66,7 @@ describe("Patient Consultation in multiple combination", () => {
     );
     patientConsultationPage.typePatientWeight(patientWeight);
     patientConsultationPage.typePatientHeight(patientHeight);
-    patientConsultationPage.selectPatientCategory("Stable");
+    patientConsultationPage.selectPatientCategory("Mild");
     // icd 11 - 4 diagnosis with one principal
     patientConsultationPage.selectPatientDiagnosis(
       diagnosis1,
@@ -236,7 +236,7 @@ describe("Patient Consultation in multiple combination", () => {
     // Asymptomatic
     cy.searchAndSelectOption("#symptoms", "ASYMPTOMATIC");
     // Abnormal category
-    patientConsultationPage.selectPatientCategory("Abnormal");
+    patientConsultationPage.selectPatientCategory("Moderate");
     patientConsultationPage.selectPatientSuggestion("Domiciliary Care");
     // one ICD-11 diagnosis
     patientConsultationPage.selectPatientDiagnosis(
@@ -299,7 +299,7 @@ describe("Patient Consultation in multiple combination", () => {
       "SORE THROAT",
     ]);
     // Stable category
-    patientConsultationPage.selectPatientCategory("Stable");
+    patientConsultationPage.selectPatientCategory("Mild");
     // Date of symptoms
     patientConsultationPage.selectSymptomsDate(
       "#symptoms_onset_date",
diff --git a/cypress/e2e/patient_spec/patient_logupdate.cy.ts b/cypress/e2e/patient_spec/patient_logupdate.cy.ts
index 8cf83b1c5a8..a55b86e464b 100644
--- a/cypress/e2e/patient_spec/patient_logupdate.cy.ts
+++ b/cypress/e2e/patient_spec/patient_logupdate.cy.ts
@@ -10,7 +10,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
   const patientPage = new PatientPage();
   const patientLogupdate = new PatientLogupdate();
   const domicilaryPatient = "Dummy Patient 11";
-  const patientCategory = "Abnormal";
+  const patientCategory = "Moderate";
   const additionalSymptoms = "ASYMPTOMATIC";
   const physicalExamination = "physical examination details";
   const otherExamination = "Other";
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/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
index db68c6f042c..ec270bf8134 100644
--- a/src/CAREUI/misc/PaginatedList.tsx
+++ b/src/CAREUI/misc/PaginatedList.tsx
@@ -1,4 +1,4 @@
-import { createContext, useContext, useState } from "react";
+import { createContext, useContext, useEffect, useState } from "react";
 import { PaginatedResponse, QueryRoute } from "../../Utils/request/types";
 import useQuery, { QueryOptions } from "../../Utils/request/useQuery";
 import ButtonV2, {
@@ -33,6 +33,9 @@ function useContextualized<TItem>() {
 interface Props<TItem> extends QueryOptions<PaginatedResponse<TItem>> {
   route: QueryRoute<PaginatedResponse<TItem>>;
   perPage?: number;
+  queryCB?: (
+    query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
+  ) => void;
   children: (
     ctx: PaginatedListContext<TItem>,
     query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>,
@@ -43,6 +46,7 @@ export default function PaginatedList<TItem extends object>({
   children,
   route,
   perPage = DEFAULT_PER_PAGE_LIMIT,
+  queryCB,
   ...queryOptions
 }: Props<TItem>) {
   const [currentPage, setPage] = useState(1);
@@ -57,6 +61,12 @@ export default function PaginatedList<TItem extends object>({
 
   const items = query.data?.results ?? [];
 
+  useEffect(() => {
+    if (queryCB) {
+      queryCB(query);
+    }
+  }, [query]);
+
   return (
     <context.Provider
       value={{ ...query, items, perPage, currentPage, setPage }}
diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx
index fa91d058d1b..1f84952362a 100644
--- a/src/Common/constants.tsx
+++ b/src/Common/constants.tsx
@@ -456,8 +456,8 @@ export const PATIENT_CATEGORIES: {
   twClass: string;
 }[] = [
   { id: "Comfort", text: "Comfort Care", twClass: "patient-comfort" },
-  { id: "Stable", text: "Stable", twClass: "patient-stable" },
-  { id: "Moderate", text: "Abnormal", twClass: "patient-abnormal" },
+  { id: "Stable", text: "Mild", twClass: "patient-stable" },
+  { id: "Moderate", text: "Moderate", twClass: "patient-abnormal" },
   { id: "Critical", text: "Critical", twClass: "patient-critical" },
 ];
 
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/Assets/configure/MonitorConfigure.tsx b/src/Components/Assets/configure/MonitorConfigure.tsx
index 5053b5b7d02..785b82873de 100644
--- a/src/Components/Assets/configure/MonitorConfigure.tsx
+++ b/src/Components/Assets/configure/MonitorConfigure.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { BedSelect } from "../../Common/BedSelect";
 import { BedModel } from "../../Facility/models";
-import { AssetData } from "../AssetTypes";
+import { AssetClass, AssetData } from "../AssetTypes";
 import * as Notification from "../../../Utils/Notifications.js";
 import { Submit } from "../../Common/components/ButtonV2";
 import { FieldLabel } from "../../Form/FormFields/FormField";
@@ -73,6 +73,7 @@ export default function MonitorConfigure({ asset }: { asset: AssetData }) {
             multiple={false}
             location={asset?.location_object?.id}
             facility={asset?.location_object?.facility?.id}
+            not_occupied_by_asset_type={AssetClass.HL7MONITOR}
             className="w-full"
           />
         </div>
diff --git a/src/Components/CameraFeed/AssetBedSelect.tsx b/src/Components/CameraFeed/AssetBedSelect.tsx
index 17701dccbde..c8a2d5451bc 100644
--- a/src/Components/CameraFeed/AssetBedSelect.tsx
+++ b/src/Components/CameraFeed/AssetBedSelect.tsx
@@ -1,39 +1,28 @@
 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";
 
 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 selected = props.value;
 
-  const { data, loading } = useQuery(routes.listAssetBeds, {
-    query: {
-      limit: 100,
-      facility,
-      asset: props.asset?.id,
-      bed: props.bed?.id,
-    },
-  });
+  const options = props.options.filter(({ meta }) => meta.type !== "boundary");
 
-  const selected = props.value;
+  const label = props.label ?? defaultLabel;
 
   return (
-    <Listbox value={selected} onChange={props.onChange} disabled={loading}>
-      <div className="relative">
+    <Listbox value={selected} onChange={props.onChange}>
+      <div className="relative flex-1">
         <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"}
+            {selected ? label(selected) : "No 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 +35,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 +52,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>
                   </>
                 )}
@@ -75,3 +64,7 @@ export default function AssetBedSelect(props: Props) {
     </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..8f7659cf730 100644
--- a/src/Components/CameraFeed/CameraFeed.tsx
+++ b/src/Components/CameraFeed/CameraFeed.tsx
@@ -24,6 +24,7 @@ interface Props {
   // Controls
   constrolsDisabled?: boolean;
   shortcutsDisabled?: boolean;
+  onMove?: () => void;
 }
 
 export default function CameraFeed(props: Props) {
@@ -76,7 +77,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]);
@@ -90,7 +91,7 @@ export default function CameraFeed(props: Props) {
     <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,
         )}
       >
@@ -180,6 +181,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..4c205c0e9c6 100644
--- a/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx
+++ b/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx
@@ -2,14 +2,22 @@ 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";
 
 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>
+        ) : (
+          <AssetBedSelect
+            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/Common/BedSelect.tsx b/src/Components/Common/BedSelect.tsx
index 2e7bf09072e..5c31055a3a4 100644
--- a/src/Components/Common/BedSelect.tsx
+++ b/src/Components/Common/BedSelect.tsx
@@ -4,6 +4,7 @@ import AutoCompleteAsync from "../Form/AutoCompleteAsync";
 import { useTranslation } from "react-i18next";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
+import { AssetClass } from "../Assets/AssetTypes";
 
 interface BedSelectProps {
   name: string;
@@ -17,6 +18,7 @@ interface BedSelectProps {
   showAll?: boolean;
   showNOptions?: number;
   selected: BedModel | BedModel[] | null;
+  not_occupied_by_asset_type?: AssetClass;
   setSelected: (selected: BedModel | BedModel[] | null) => void;
 }
 
@@ -33,6 +35,7 @@ export const BedSelect = (props: BedSelectProps) => {
     facility,
     location,
     showNOptions = 20,
+    not_occupied_by_asset_type,
   } = props;
   const { t } = useTranslation();
 
@@ -45,8 +48,8 @@ export const BedSelect = (props: BedSelectProps) => {
         all: searchAll,
         facility,
         location,
+        not_occupied_by_asset_type,
       };
-
       const { data } = await request(routes.listFacilityBeds, { query });
 
       if (unoccupiedOnly) {
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/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/Facility/BedManagement.tsx b/src/Components/Facility/BedManagement.tsx
index 27100bf992b..10624675b5e 100644
--- a/src/Components/Facility/BedManagement.tsx
+++ b/src/Components/Facility/BedManagement.tsx
@@ -5,13 +5,14 @@ import { ReactElement } from "react";
 import * as Notification from "../../Utils/Notifications.js";
 import { LOCATION_BED_TYPES } from "../../Common/constants";
 import BedDeleteDialog from "./BedDeleteDialog";
-import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import AuthorizeFor, { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import Page from "../Common/components/Page";
 import request from "../../Utils/request/request";
 import routes from "../../Redux/api";
 import useQuery from "../../Utils/request/useQuery";
 import useFilters from "../../Common/hooks/useFilters";
+import useAuthUser from "../../Common/hooks/useAuthUser";
 const Loading = lazy(() => import("../Common/Loading"));
 
 interface BedManagementProps {
@@ -45,7 +46,7 @@ const BedRow = (props: BedRowProps) => {
     show: boolean;
     name: string;
   }>({ show: false, name: "" });
-
+  const authUser = useAuthUser();
   const handleDelete = (name: string, _id: string) => {
     setBedData({
       show: true,
@@ -53,6 +54,10 @@ const BedRow = (props: BedRowProps) => {
     });
   };
 
+  const allowedUser = ["DistrictAdmin", "StateAdmin"].includes(
+    authUser.user_type,
+  );
+
   const handleDeleteConfirm = async () => {
     const { res } = await request(routes.deleteFacilityBed, {
       pathParams: { external_id: id },
@@ -126,14 +131,19 @@ const BedRow = (props: BedRowProps) => {
           <ButtonV2
             id="delete-bed-button"
             onClick={() => handleDelete(name, id)}
-            authorizeFor={NonReadOnlyUsers}
+            authorizeFor={AuthorizeFor(["DistrictAdmin", "StateAdmin"])}
             variant="danger"
             border
             ghost
             className="w-full lg:w-auto"
-            disabled={isOccupied}
-            tooltip={isOccupied ? "Bed is occupied" : undefined}
-            tooltipClassName="w-full lg:w-auto"
+            tooltip={
+              !allowedUser
+                ? "Contact your admin to delete the bed"
+                : isOccupied
+                  ? "Bed is occupied"
+                  : undefined
+            }
+            tooltipClassName=" text-xs w-full lg:w-auto"
           >
             <CareIcon icon="l-trash-alt" className="text-lg" />
             Delete
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..64ba39ae5aa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
@@ -1,22 +1,176 @@
-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 w-36 items-center justify-end md:w-64">
+            {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-500 md:mx-2"
+                  />
+                ) : (
+                  <ButtonV2
+                    size="small"
+                    variant="secondary"
+                    disabled={!hasMoved}
+                    className="disabled:bg-transparent disabled:text-zinc-700"
+                    ghost
+                    tooltip={
+                      hasMoved
+                        ? "Save current position to preset"
+                        : "Change camera position to update preset"
+                    }
+                    tooltipClassName={classNames(
+                      "translate-y-8 text-xs",
+                      hasMoved ? "-translate-x-20" : "-translate-x-28",
+                    )}
+                    onClick={handleUpdatePreset}
+                  >
+                    <CareIcon icon="l-save" className="text-base" />
+                  </ButtonV2>
+                )}
+              </>
+            ) : (
+              <span>loading presets...</span>
+            )}
+          </div>
+        </CameraFeed>
+      </div>
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
index e9e658cee4f..a7e52257e28 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx
@@ -249,7 +249,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 +256,6 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => {
                         <div className="overflow-x-auto overflow-y-hidden">
                           <PrescriptionsTable
                             is_prn
-                            readonly
                             prescription_type="DISCHARGE"
                           />
                         </div>
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 4d393752888..38882c66f33 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -210,57 +210,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 ba248b8db6f..7e6fe345f7c 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -125,7 +125,6 @@ type FormDetails = {
   death_datetime: string;
   death_confirmed_doctor: string;
   InvestigationAdvice: InvestigationType[];
-  procedures: ProcedureType[];
   consent_records: ConsentRecord[];
 };
 
@@ -176,7 +175,6 @@ const initForm: FormDetails = {
   death_datetime: "",
   death_confirmed_doctor: "",
   InvestigationAdvice: [],
-  procedures: [],
   consent_records: [],
 };
 
@@ -375,7 +373,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
             (Array.isArray(data.investigation) && data.investigation) || [],
         });
         handleFormFieldChange({
-          name: "procedures",
+          name: "procedure",
           value: (Array.isArray(data.procedure) && data.procedure) || [],
         });
         if (data.suggestion === "R") {
@@ -593,7 +591,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
           }
           return;
         case "procedure": {
-          for (const p of state.form.procedures) {
+          for (const p of state.form.procedure) {
             if (!p.procedure?.replace(/\s/g, "").length) {
               errors[field] = "Procedure field can not be empty";
               invalidForm = true;
@@ -725,7 +723,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
         create_diagnoses: isUpdate ? undefined : state.form.create_diagnoses,
         treating_physician: state.form.treating_physician,
         investigation: state.form.InvestigationAdvice,
-        procedure: state.form.procedures,
+        procedure: state.form.procedure,
         patient: patientId,
         facility: facilityId,
         referred_to:
@@ -1433,11 +1431,11 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
                       >
                         <FieldLabel>Procedures</FieldLabel>
                         <ProcedureBuilder
-                          procedures={state.form.procedures}
-                          setProcedures={(procedures) => {
+                          procedures={state.form.procedure}
+                          setProcedures={(procedure) => {
                             handleFormFieldChange({
-                              name: "procedures",
-                              value: procedures,
+                              name: "procedure",
+                              value: procedure,
                             });
                           }}
                         />
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/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx
index b06e5cd1b4b..098be9141c2 100644
--- a/src/Components/Facility/DischargedPatientsList.tsx
+++ b/src/Components/Facility/DischargedPatientsList.tsx
@@ -5,11 +5,13 @@ import PaginatedList from "../../CAREUI/misc/PaginatedList";
 import Loading from "../Common/Loading";
 import { PatientModel } from "../Patient/models";
 import useQuery from "../../Utils/request/useQuery";
-import { debounce } from "lodash-es";
 import SearchInput from "../Form/SearchInput";
 import {
+  ADMITTED_TO,
   DISCHARGED_PATIENT_SORT_OPTIONS,
+  DISCHARGE_REASONS,
   GENDER_TYPES,
+  PATIENT_CATEGORIES,
 } from "../../Common/constants";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
@@ -18,6 +20,21 @@ import { useTranslation } from "react-i18next";
 import SwitchTabs from "../Common/components/SwitchTabs";
 import SortDropdownMenu from "../Common/SortDropdown";
 import useFilters from "../../Common/hooks/useFilters";
+import PatientFilter from "../Patient/PatientFilter";
+import { AdvancedFilterButton } from "../../CAREUI/interactive/FiltersSlideover";
+import CountBlock from "../../CAREUI/display/Count";
+import { FieldChangeEvent } from "../Form/FormFields/Utils";
+import PhoneNumberFormField from "../Form/FormFields/PhoneNumberFormField";
+import { useEffect, useState } from "react";
+import { parseOptionId } from "../../Common/utils";
+import {
+  DIAGNOSES_FILTER_LABELS,
+  DiagnosesFilterKey,
+  FILTER_BY_DIAGNOSES_KEYS,
+} from "../Patient/DiagnosesFilter";
+import { getDiagnosesByIds } from "../Diagnosis/utils";
+import { ICD11DiagnosisModel } from "./models";
+import FilterBadge from "../../CAREUI/display/FilterBadge";
 
 const DischargedPatientsList = ({
   facility_external_id,
@@ -29,7 +46,170 @@ const DischargedPatientsList = ({
     pathParams: { id: facility_external_id },
   });
 
-  const { qParams, updateQuery, FilterBadges } = useFilters({});
+  const { qParams, updateQuery, advancedFilter, FilterBadges } = useFilters({
+    limit: 12,
+    cacheBlacklist: [
+      "name",
+      "patient_no",
+      "phone_number",
+      "emergency_phone_number",
+    ],
+  });
+
+  useEffect(() => {
+    if (!qParams.phone_number && phone_number.length >= 13) {
+      setPhoneNumber("+91");
+    }
+    if (
+      !qParams.emergency_phone_number &&
+      emergency_phone_number.length >= 13
+    ) {
+      setEmergencyPhoneNumber("+91");
+    }
+  }, [qParams]);
+
+  const { data: districtData } = useQuery(routes.getDistrict, {
+    pathParams: {
+      id: qParams.district,
+    },
+    prefetch: !!Number(qParams.district),
+  });
+
+  const { data: LocalBodyData } = useQuery(routes.getLocalBody, {
+    pathParams: {
+      id: qParams.lsgBody,
+    },
+    prefetch: !!Number(qParams.lsgBody),
+  });
+
+  const { data: facilityAssetLocationData } = useQuery(
+    routes.getFacilityAssetLocation,
+    {
+      pathParams: {
+        facility_external_id: qParams.facility,
+        external_id: qParams.last_consultation_current_bed__location,
+      },
+      prefetch: !!qParams.last_consultation_current_bed__location,
+    },
+  );
+
+  const getTheCategoryFromId = () => {
+    let category_name;
+    if (qParams.category) {
+      category_name = PATIENT_CATEGORIES.find(
+        (item: any) => qParams.category === item.id,
+      )?.text;
+
+      return String(category_name);
+    } else {
+      return "";
+    }
+  };
+
+  const getDiagnosisFilterValue = (key: DiagnosesFilterKey) => {
+    const ids: string[] = (qParams[key] ?? "").split(",");
+    return ids.map((id) => diagnoses.find((obj) => obj.id == id)?.label ?? id);
+  };
+
+  useEffect(() => {
+    const ids: string[] = [];
+    FILTER_BY_DIAGNOSES_KEYS.forEach((key) => {
+      ids.push(...(qParams[key] ?? "").split(",").filter(Boolean));
+    });
+    const existing = diagnoses.filter(({ id }) => ids.includes(id));
+    const objIds = existing.map((o) => o.id);
+    const diagnosesToBeFetched = ids.filter((id) => !objIds.includes(id));
+    getDiagnosesByIds(diagnosesToBeFetched).then((data) => {
+      const retrieved = data.filter(Boolean) as ICD11DiagnosisModel[];
+      setDiagnoses([...existing, ...retrieved]);
+    });
+  }, [
+    qParams.diagnoses,
+    qParams.diagnoses_confirmed,
+    qParams.diagnoses_provisional,
+    qParams.diagnoses_unconfirmed,
+    qParams.diagnoses_differential,
+  ]);
+
+  const LastAdmittedToTypeBadges = () => {
+    const badge = (key: string, value: any, id: string) => {
+      return (
+        value && (
+          <FilterBadge
+            name={key}
+            value={value}
+            onRemove={() => {
+              const lcat = qParams.last_consultation_admitted_bed_type_list
+                .split(",")
+                .filter((x: string) => x != id)
+                .join(",");
+              updateQuery({
+                ...qParams,
+                last_consultation_admitted_bed_type_list: lcat,
+              });
+            }}
+          />
+        )
+      );
+    };
+    return qParams.last_consultation_admitted_bed_type_list
+      .split(",")
+      .map((id: string) => {
+        const text = ADMITTED_TO.find((obj) => obj.id == id)?.text;
+        return badge("Bed Type", text, id);
+      });
+  };
+
+  const queryField = <T,>(name: string, defaultValue?: T) => {
+    return {
+      name,
+      value: qParams[name] || defaultValue,
+      onChange: (e: FieldChangeEvent<T>) => updateQuery({ [e.name]: e.value }),
+      className: "grow w-full mb-2",
+    };
+  };
+  const [diagnoses, setDiagnoses] = useState<ICD11DiagnosisModel[]>([]);
+  const [phone_number, setPhoneNumber] = useState("");
+  const [phoneNumberError, setPhoneNumberError] = useState("");
+  const [emergency_phone_number, setEmergencyPhoneNumber] = useState("");
+  const [emergencyPhoneNumberError, setEmergencyPhoneNumberError] =
+    useState("");
+  const [count, setCount] = useState(0);
+
+  const setPhoneNum = (phone_number: string) => {
+    setPhoneNumber(phone_number);
+    if (phone_number.length >= 13) {
+      setPhoneNumberError("");
+      updateQuery({ phone_number });
+      return;
+    }
+
+    if (phone_number === "+91" || phone_number === "") {
+      setPhoneNumberError("");
+      qParams.phone_number && updateQuery({ phone_number: null });
+      return;
+    }
+
+    setPhoneNumberError("Enter a valid number");
+  };
+
+  const setEmergencyPhoneNum = (emergency_phone_number: string) => {
+    setEmergencyPhoneNumber(emergency_phone_number);
+    if (emergency_phone_number.length >= 13) {
+      setEmergencyPhoneNumberError("");
+      updateQuery({ emergency_phone_number });
+      return;
+    }
+
+    if (emergency_phone_number === "+91" || emergency_phone_number === "") {
+      setEmergencyPhoneNumberError("");
+      qParams.emergency_phone_number &&
+        updateQuery({ emergency_phone_number: null });
+      return;
+    }
+
+    setEmergencyPhoneNumberError("Enter a valid number");
+  };
 
   return (
     <Page
@@ -39,14 +219,7 @@ const DischargedPatientsList = ({
       }}
       options={
         <>
-          <SearchInput
-            className="mr-4 w-full max-w-sm"
-            placeholder="Search by patient name"
-            name="name"
-            value={qParams.name}
-            onChange={debounce((e) => updateQuery({ name: e.value }))}
-          />
-          <div className="flex flex-col gap-4 md:flex-row">
+          <div className="flex flex-col gap-4 lg:flex-row">
             <SwitchTabs
               tab1="Live"
               tab2="Discharged"
@@ -54,6 +227,9 @@ const DischargedPatientsList = ({
               onClickTab1={() => navigate("/patients")}
               isTab2Active
             />
+            <AdvancedFilterButton
+              onClick={() => advancedFilter.setShow(true)}
+            />
             <SortDropdownMenu
               options={DISCHARGED_PATIENT_SORT_OPTIONS}
               selected={qParams.ordering}
@@ -63,16 +239,169 @@ const DischargedPatientsList = ({
         </>
       }
     >
+      <div className="manualGrid my-4 mb-[-12px] mt-5 grid-cols-1 gap-3 px-2 sm:grid-cols-4 md:px-0">
+        <div className="mt-2 flex h-full flex-col gap-3 xl:flex-row">
+          <div className="flex-1">
+            <CountBlock
+              text="Discharged Patients"
+              count={count}
+              loading={facilityQuery.loading}
+              icon="l-user-injured"
+              className="pb-12"
+            />
+          </div>
+        </div>
+        <div className="col-span-3 w-full">
+          <div className="col-span-2 mt-2">
+            <div className="mt-1 md:flex md:gap-4">
+              <SearchInput
+                label="Search by Patient"
+                placeholder="Enter patient name"
+                {...queryField("name")}
+              />
+              <SearchInput
+                label="Search by IP/OP Number"
+                placeholder="Enter IP/OP Number"
+                secondary
+                {...queryField("patient_no")}
+              />
+            </div>
+            <div className="md:flex md:gap-4">
+              <PhoneNumberFormField
+                label="Search by Primary Number"
+                {...queryField("phone_number", "+91")}
+                value={phone_number}
+                onChange={(e) => setPhoneNum(e.value)}
+                error={phoneNumberError}
+                types={["mobile", "landline"]}
+              />
+              <PhoneNumberFormField
+                label="Search by Emergency Number"
+                {...queryField("emergency_phone_number", "+91")}
+                value={emergency_phone_number}
+                onChange={(e) => setEmergencyPhoneNum(e.value)}
+                error={emergencyPhoneNumberError}
+                types={["mobile", "landline"]}
+              />
+            </div>
+          </div>
+        </div>
+      </div>
       <div className="col-span-3 mt-6 flex flex-wrap">
-        <FilterBadges badges={({ ordering }) => [ordering()]} />
+        <FilterBadges
+          badges={({
+            badge,
+            value,
+            kasp,
+            phoneNumber,
+            dateRange,
+            range,
+            ordering,
+          }) => [
+            phoneNumber("Primary number", "phone_number"),
+            phoneNumber("Emergency number", "emergency_phone_number"),
+            badge("Patient name", "name"),
+            badge("IP/OP number", "patient_no"),
+            ...dateRange("Modified", "modified_date"),
+            ...dateRange("Created", "created_date"),
+            ...dateRange("Admitted", "last_consultation_encounter_date"),
+            ...dateRange("Discharged", "last_consultation_discharge_date"),
+            // Admitted to type badges
+            badge("No. of vaccination doses", "number_of_doses"),
+            kasp(),
+            badge("COWIN ID", "covin_id"),
+            badge("Is Antenatal", "is_antenatal"),
+            badge("Review Missed", "review_missed"),
+            badge(
+              "Is Medico-Legal Case",
+              "last_consultation_medico_legal_case",
+            ),
+            value(
+              "Location",
+              "last_consultation_current_bed__location",
+              qParams.last_consultation_current_bed__location
+                ? facilityAssetLocationData?.name ||
+                    qParams.last_consultation_current_bed__locations
+                : "",
+            ),
+            badge("Facility Type", "facility_type"),
+            value(
+              "District",
+              "district",
+              qParams.district ? districtData?.name || "" : "",
+            ),
+            ordering(),
+            value("Category", "category", getTheCategoryFromId()),
+            badge("Disease Status", "disease_status"),
+            value(
+              "Respiratory Support",
+              "ventilator_interface",
+              qParams.ventilator_interface &&
+                t(`RESPIRATORY_SUPPORT_${qParams.ventilator_interface}`),
+            ),
+            value(
+              "Gender",
+              "gender",
+              parseOptionId(GENDER_TYPES, qParams.gender) || "",
+            ),
+            {
+              name: "Admitted to",
+              value: ADMITTED_TO[qParams.last_consultation_admitted_to],
+              paramKey: "last_consultation_admitted_to",
+            },
+            ...range("Age", "age"),
+            badge("SRF ID", "srf_id"),
+            {
+              name: "LSG Body",
+              value: qParams.lsgBody ? LocalBodyData?.name || "" : "",
+              paramKey: "lsgBody",
+            },
+            ...FILTER_BY_DIAGNOSES_KEYS.map((key) =>
+              value(
+                DIAGNOSES_FILTER_LABELS[key],
+                key,
+                getDiagnosisFilterValue(key).join(", "),
+              ),
+            ),
+            badge("Declared Status", "is_declared_positive"),
+            ...dateRange("Result", "date_of_result"),
+            ...dateRange("Declared positive", "date_declared_positive"),
+            ...dateRange(
+              "Symptoms onset",
+              "last_consultation_symptoms_onset_date",
+            ),
+            ...dateRange("Last vaccinated", "last_vaccinated_date"),
+            {
+              name: "Telemedicine",
+              paramKey: "last_consultation_is_telemedicine",
+            },
+            value(
+              "Discharge Reason",
+              "last_consultation__new_discharge_reason",
+              parseOptionId(
+                DISCHARGE_REASONS,
+                qParams.last_consultation__new_discharge_reason,
+              ) || "",
+            ),
+          ]}
+          children={
+            qParams.last_consultation_admitted_bed_type_list &&
+            LastAdmittedToTypeBadges()
+          }
+        />
       </div>
       <PaginatedList
+        perPage={12}
         route={routes.listFacilityDischargedPatients}
         pathParams={{ facility_external_id }}
         query={{ ordering: "-modified_date", ...qParams }}
+        queryCB={(query) => {
+          setCount(query.data?.count || 0);
+          console.log(query.data?.count);
+        }}
       >
         {() => (
-          <div className="flex flex-col gap-4 py-4 lg:px-4 lg:py-8">
+          <div className="flex flex-col gap-4">
             <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
               <span>{t("discharged_patients_empty")}</span>
             </PaginatedList.WhenEmpty>
@@ -99,6 +428,11 @@ const DischargedPatientsList = ({
           </div>
         )}
       </PaginatedList>
+      <PatientFilter
+        {...advancedFilter}
+        key={window.location.search}
+        dischargePage
+      />
     </Page>
   );
 };
diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx
index 06e0de28d62..18f3af60eb5 100644
--- a/src/Components/Facility/LocationManagement.tsx
+++ b/src/Components/Facility/LocationManagement.tsx
@@ -1,6 +1,6 @@
 import { lazy, useState } from "react";
 import ButtonV2, { Cancel } from "../Common/components/ButtonV2";
-import { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
+import AuthorizeFor, { NonReadOnlyUsers } from "../../Utils/AuthorizeFor";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import Page from "../Common/components/Page";
 import routes from "../../Redux/api";
@@ -12,6 +12,7 @@ import * as Notification from "../../Utils/Notifications.js";
 import ConfirmDialog from "../Common/ConfirmDialog";
 import DialogModal from "../Common/Dialog";
 import Uptime from "../Common/Uptime";
+import useAuthUser from "../../Common/hooks/useAuthUser";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -21,10 +22,12 @@ interface Props {
 
 interface LocationProps extends LocationModel {
   facilityId: string;
+  disabled: boolean;
   setShowDeletePopup: (e: { open: boolean; name: string; id: string }) => void;
 }
 
 export default function LocationManagement({ facilityId }: Props) {
+  const authUser = useAuthUser();
   const [showDeleteFailModal, setShowDeleteFailModal] = useState({
     open: false,
     id: "",
@@ -115,6 +118,11 @@ export default function LocationManagement({ facilityId }: Props) {
                   setShowDeletePopup={setShowDeletePopup}
                   facilityId={facilityId}
                   {...item}
+                  disabled={
+                    ["DistrictAdmin", "StateAdmin"].includes(authUser.user_type)
+                      ? false
+                      : true
+                  }
                 />
               )}
             </PaginatedList.Items>
@@ -213,6 +221,7 @@ const Location = ({
   created_date,
   modified_date,
   id,
+  disabled,
   setShowDeletePopup,
   facilityId,
 }: LocationProps) => (
@@ -286,14 +295,16 @@ const Location = ({
       </div>
       <div className="w-full md:w-1/2">
         <ButtonV2
+          authorizeFor={AuthorizeFor(["DistrictAdmin", "StateAdmin"])}
           id="delete-location-button"
           variant="secondary"
           border
           className="w-full"
+          tooltip={disabled ? "Contact your admin to delete the location" : ""}
+          tooltipClassName=" text-xs w-full lg:w-auto"
           onClick={() =>
             setShowDeletePopup({ open: true, name: name ?? "", id: id ?? "" })
           }
-          authorizeFor={NonReadOnlyUsers}
         >
           <CareIcon icon="l-trash" className="text-lg" />
           Delete
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 d61d5a9f129..49a2f1346af 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -95,11 +95,7 @@ export interface OptionsType {
   disabled?: boolean;
 }
 
-export type PatientCategory =
-  | "Comfort Care"
-  | "Stable"
-  | "Abnormal"
-  | "Critical";
+export type PatientCategory = "Comfort Care" | "Mild" | "Moderate" | "Critical";
 
 export interface ConsultationModel {
   encounter_date: string;
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/PrescriptionBuilder.tsx b/src/Components/Medicine/PrescriptionBuilder.tsx
index d5388dfa44a..972a74159d2 100644
--- a/src/Components/Medicine/PrescriptionBuilder.tsx
+++ b/src/Components/Medicine/PrescriptionBuilder.tsx
@@ -11,6 +11,7 @@ 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";
 
 interface Props {
   prescription_type?: Prescription["prescription_type"];
@@ -75,20 +76,27 @@ export default function PrescriptionBuilder({
           />
         ))}
       </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..630ab324662 100644
--- a/src/Components/Medicine/PrescriptionDetailCard.tsx
+++ b/src/Components/Medicine/PrescriptionDetailCard.tsx
@@ -5,6 +5,7 @@ import ReadMore from "../Common/components/Readmore";
 import ButtonV2 from "../Common/components/ButtonV2";
 import { useTranslation } from "react-i18next";
 import RecordMeta from "../../CAREUI/display/RecordMeta";
+import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild";
 
 export default function PrescriptionDetailCard({
   prescription,
@@ -56,33 +57,35 @@ 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={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>
         </div>
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/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index e0a3b2d9ee5..ac716f7bf45 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -77,13 +77,6 @@ function TabPanel(props: TabPanelProps) {
   );
 }
 
-const PatientCategoryDisplayText: Record<PatientCategory, string> = {
-  "Comfort Care": "COMFORT CARE",
-  Stable: "STABLE",
-  Abnormal: "ABNORMAL",
-  Critical: "CRITICAL",
-};
-
 export const PatientManager = () => {
   const { t } = useTranslation();
   const {
@@ -473,7 +466,7 @@ export const PatientManager = () => {
             className={`absolute inset-y-0 left-0 flex h-full w-1 items-center rounded-l-lg transition-all duration-200 ease-in-out group-hover:w-5 ${categoryClass}`}
           >
             <span className="absolute -inset-x-32 inset-y-0 flex -rotate-90 items-center justify-center text-center text-xs font-bold uppercase tracking-widest opacity-0 transition-all duration-200 ease-in-out group-hover:opacity-100">
-              {category ? PatientCategoryDisplayText[category] : "UNKNOWN"}
+              {category || "UNKNOWN"}
             </span>
           </div>
           <div className="flex flex-col items-start gap-4 md:flex-row">
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index fe7a9f4ee06..0d8ebaae2b0 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -345,26 +345,31 @@ export default function PatientFilter(props: any) {
               />
             </div>
           </div>
-          <div className="w-full flex-none" id="bed-type-select">
-            <FieldLabel className="text-sm">Admitted to (Bed Types)</FieldLabel>
-            <MultiSelectMenuV2
-              id="last_consultation_admitted_bed_type_list"
-              placeholder="Select bed types"
-              options={ADMITTED_TO}
-              value={filterState.last_consultation_admitted_bed_type_list}
-              optionValue={(o) => o.id}
-              optionLabel={(o) => o.text}
-              onChange={(o) =>
-                setFilterState({
-                  ...filterState,
-                  last_consultation_admitted_bed_type_list: o,
-                })
-              }
-            />
-          </div>
-          {["StateAdmin", "StateReadOnlyAdmin"].includes(
-            authUser.user_type,
-          ) && (
+          {props.dischargePage || (
+            <div className="w-full flex-none" id="bed-type-select">
+              <FieldLabel className="text-sm">
+                {props.dischargePage && "Last "}Admitted to (Bed Types)
+              </FieldLabel>
+              <MultiSelectMenuV2
+                id="last_consultation_admitted_bed_type_list"
+                placeholder="Select bed types"
+                options={ADMITTED_TO}
+                value={filterState.last_consultation_admitted_bed_type_list}
+                optionValue={(o) => o.id}
+                optionLabel={(o) => o.text}
+                onChange={(o) =>
+                  setFilterState({
+                    ...filterState,
+                    last_consultation_admitted_bed_type_list: o,
+                  })
+                }
+              />
+            </div>
+          )}
+          {(props.dischargePage ||
+            ["StateAdmin", "StateReadOnlyAdmin"].includes(
+              authUser.user_type,
+            )) && (
             <div className="w-full flex-none" id="discharge-reason-select">
               <FieldLabel className="text-sm">Discharge Reason</FieldLabel>
               <SelectMenuV2
@@ -415,7 +420,7 @@ export default function PatientFilter(props: any) {
               }
             />
           </div>
-          <div className="w-full flex-none">
+          {/* <div className="w-full flex-none">
             <FieldLabel className="text-sm">Is Antenatal</FieldLabel>
             <SelectMenuV2
               placeholder="Show all"
@@ -423,28 +428,27 @@ export default function PatientFilter(props: any) {
               optionLabel={(o) =>
                 o === "true" ? "Antenatal" : "Non-antenatal"
               }
-              optionDescription={(o) =>
-                o === "true"
-                  ? "i.e., last menstruation start date is within the last 9 months"
-                  : undefined
-              }
               value={filterState.is_antenatal}
               onChange={(v) =>
                 setFilterState({ ...filterState, is_antenatal: v })
               }
             />
-          </div>
+          </div> */}
           <div className="w-full flex-none">
-            <FieldLabel className="text-sm">Review Missed</FieldLabel>
-            <SelectMenuV2
-              placeholder="Show all"
-              options={["true", "false"]}
-              optionLabel={(o) => (o === "true" ? "Yes" : "No")}
-              value={filterState.review_missed}
-              onChange={(v) =>
-                setFilterState({ ...filterState, review_missed: v })
-              }
-            />
+            {props.dischargePage || (
+              <>
+                <FieldLabel className="text-sm">Review Missed</FieldLabel>
+                <SelectMenuV2
+                  placeholder="Show all"
+                  options={["true", "false"]}
+                  optionLabel={(o) => (o === "true" ? "Yes" : "No")}
+                  value={filterState.review_missed}
+                  onChange={(v) =>
+                    setFilterState({ ...filterState, review_missed: v })
+                  }
+                />
+              </>
+            )}
           </div>
           <div className="w-full flex-none">
             <FieldLabel className="text-sm">Is Medico-Legal Case</FieldLabel>
@@ -568,16 +572,18 @@ export default function PatientFilter(props: any) {
         className="rounded-md"
       >
         <div className="space-y-4">
-          <div>
-            <FieldLabel className="text-sm">Facility</FieldLabel>
-            <FacilitySelect
-              multiple={false}
-              name="facility"
-              showAll={false}
-              selected={filterState.facility_ref}
-              setSelected={(obj) => setFilterWithRef("facility", obj)}
-            />
-          </div>
+          {!props.dischargePage && (
+            <div>
+              <FieldLabel className="text-sm">Facility</FieldLabel>
+              <FacilitySelect
+                multiple={false}
+                name="facility"
+                showAll={false}
+                selected={filterState.facility_ref}
+                setSelected={(obj) => setFilterWithRef("facility", obj)}
+              />
+            </div>
+          )}
           {filterState.facility && (
             <div>
               <FieldLabel className="text-sm">Location</FieldLabel>
@@ -596,22 +602,24 @@ export default function PatientFilter(props: any) {
               />
             </div>
           )}
-          <div>
-            <FieldLabel className="text-sm">Facility type</FieldLabel>
-            <SelectMenuV2
-              placeholder="Show all"
-              options={FACILITY_TYPES}
-              optionLabel={(o) => o.text}
-              optionValue={(o) => o.text}
-              value={filterState.facility_type}
-              onChange={(v) =>
-                setFilterState({ ...filterState, facility_type: v })
-              }
-              optionIcon={() => (
-                <CareIcon icon="l-hospital" className="text-lg" />
-              )}
-            />
-          </div>
+          {!props.dischargePage && (
+            <div>
+              <FieldLabel className="text-sm">Facility type</FieldLabel>
+              <SelectMenuV2
+                placeholder="Show all"
+                options={FACILITY_TYPES}
+                optionLabel={(o) => o.text}
+                optionValue={(o) => o.text}
+                value={filterState.facility_type}
+                onChange={(v) =>
+                  setFilterState({ ...filterState, facility_type: v })
+                }
+                optionIcon={() => (
+                  <CareIcon icon="l-hospital" className="text-lg" />
+                )}
+              />
+            </div>
+          )}
           <div>
             <FieldLabel className="text-sm">LSG Body</FieldLabel>
             <div className="">