diff --git a/.example.env b/.example.env
index 862f05eb5c4..79e826ad65f 100644
--- a/.example.env
+++ b/.example.env
@@ -62,3 +62,6 @@ REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
 
 # ISO 3166-1 Alpha-2 code for the default country code (default: "IN")
 REACT_DEFAULT_COUNTRY=
+
+# Maps fallback URL template (default:"https://www.openstreetmap.org/?mlat={lat}&mlon={long}&zoom=15")
+REACT_MAPS_FALLBACK_URL_TEMPLATE=
\ No newline at end of file
diff --git a/care.config.ts b/care.config.ts
index d99d6fe73cd..9f646dbab0a 100644
--- a/care.config.ts
+++ b/care.config.ts
@@ -55,6 +55,10 @@ const careConfig = {
   defaultEncounterType: (env.REACT_DEFAULT_ENCOUNTER_TYPE ||
     "hh") as EncounterClass,
 
+  mapFallbackUrlTemplate:
+    env.REACT_MAPS_FALLBACK_URL_TEMPLATE ||
+    "https://www.openstreetmap.org/?mlat={lat}&mlon={long}&zoom=15",
+
   gmapsApiKey:
     env.REACT_GMAPS_API_KEY || "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",
 
diff --git a/public/locale/en.json b/public/locale/en.json
index 086561744a7..e4f1cb71f5c 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1510,6 +1510,7 @@
   "next_sessions": "Next Sessions",
   "next_week_short": "Next wk",
   "no": "No",
+  "no_active_medication_recorded": "No Active Medication Recorded",
   "no_address_provided": "No address provided",
   "no_allergies_recorded": "No allergies recorded",
   "no_appointments": "No appointments found",
@@ -1551,6 +1552,7 @@
   "no_log_update_delta": "No changes since previous log update",
   "no_log_updates": "No log updates found",
   "no_medical_history_available": "No Medical History Available",
+  "no_medication_recorded": "No Medication Recorded",
   "no_medications": "No Medications",
   "no_medications_found_for_this_encounter": "No medications found for this encounter.",
   "no_medications_to_administer": "No medications to administer",
@@ -2132,6 +2134,7 @@
   "select_policy_to_add_items": "Select a Policy to Add Items",
   "select_practitioner": "Select Practitioner",
   "select_previous": "Select Previous Fields",
+  "show_on_map": "Show on Map",
   "select_priority": "Select Priority",
   "select_prn_reason": "Select reason for PRN",
   "select_register_patient": "Select/Register Patient",
diff --git a/src/App.tsx b/src/App.tsx
index 51e33c2209d..7452d7afb23 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -18,13 +18,23 @@ import AuthUserProvider from "@/Providers/AuthUserProvider";
 import HistoryAPIProvider from "@/Providers/HistoryAPIProvider";
 import Routers from "@/Routers";
 import { handleHttpError } from "@/Utils/request/errorHandler";
+import { HTTPError } from "@/Utils/request/types";
 
 import { PubSubProvider } from "./Utils/pubsubContext";
 
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
-      retry: 2,
+      retry: (failureCount, error) => {
+        // Only retry network errors or server errors (502, 503, 504) up to 3 times
+        if (
+          error.message === "Network Error" ||
+          (error instanceof HTTPError && [502, 503, 504].includes(error.status))
+        ) {
+          return failureCount < 3;
+        }
+        return false;
+      },
       refetchOnWindowFocus: false,
     },
   },
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 119ac148aa9..080b90a0a54 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -16,8 +16,12 @@ const consultationRoutes: AppRoutes = {
       />
     ),
   "/facility/:facilityId/patient/:patientId/encounter/:encounterId/treatment_summary":
-    ({ facilityId, encounterId }) => (
-      <TreatmentSummary facilityId={facilityId} encounterId={encounterId} />
+    ({ facilityId, encounterId, patientId }) => (
+      <TreatmentSummary
+        facilityId={facilityId}
+        encounterId={encounterId}
+        patientId={patientId}
+      />
     ),
   "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire":
     ({ facilityId, encounterId, patientId }) => (
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 3198b10bcd3..c17e08e006f 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,3 +1,4 @@
+import careConfig from "@careConfig";
 import { differenceInMinutes, format } from "date-fns";
 import { toPng } from "html-to-image";
 
@@ -94,6 +95,16 @@ export const isUserOnline = (user: { last_login: DateLike }) => {
     : false;
 };
 
+export const isAndroidDevice = /android/i.test(navigator.userAgent);
+
+export const getMapUrl = (latitude: string, longitude: string) => {
+  return isAndroidDevice
+    ? `geo:${latitude},${longitude}`
+    : careConfig.mapFallbackUrlTemplate
+        .replace("{lat}", latitude)
+        .replace("{long}", longitude);
+};
+
 const getRelativeDateSuffix = (abbreviated: boolean) => {
   return {
     day: abbreviated ? "d" : "days",
diff --git a/src/components/Common/PrintTable.tsx b/src/components/Common/PrintTable.tsx
new file mode 100644
index 00000000000..7040e1e782c
--- /dev/null
+++ b/src/components/Common/PrintTable.tsx
@@ -0,0 +1,66 @@
+import { t } from "i18next";
+
+import { cn } from "@/lib/utils";
+
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+
+type HeaderRow = {
+  key: string;
+  width?: number;
+};
+
+type TableRowType = Record<string, string | undefined>;
+interface GenericTableProps {
+  headers: HeaderRow[];
+  rows: TableRowType[] | undefined;
+}
+
+export default function PrintTable({ headers, rows }: GenericTableProps) {
+  return (
+    <div className="overflow-hidden rounded-lg border border-gray">
+      <Table className="w-full">
+        <TableHeader>
+          <TableRow className="bg-transparent hover:bg-transparent divide-x divide-gray border-b-gray">
+            {headers.map(({ key, width }, index) => (
+              <TableHead
+                className={cn(
+                  index == 0 && "first:rounded-l-md",
+                  "h-auto py-1 pl-2 pr-2 text-black text-center ",
+                  width && `w-${width}`,
+                )}
+                key={key}
+              >
+                {t(key)}
+              </TableHead>
+            ))}
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {!!rows &&
+            rows.map((row, index) => (
+              <TableRow
+                key={index}
+                className="bg-transparent hover:bg-transparent divide-x divide-gray"
+              >
+                {headers.map(({ key }) => (
+                  <TableCell
+                    className="break-words whitespace-normal text-center"
+                    key={key}
+                  >
+                    {row[key] || "-"}
+                  </TableCell>
+                ))}
+              </TableRow>
+            ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
index 2514c7bbdfe..c6fc5667222 100644
--- a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
+++ b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -197,12 +197,23 @@ function StructuredResponseBadge({
   );
 }
 
-function ResponseCard({ item }: { item: QuestionnaireResponse }) {
+function ResponseCard({
+  item,
+  isPrintPreview,
+}: {
+  item: QuestionnaireResponse;
+  isPrintPreview?: boolean;
+}) {
   const isStructured = !item.questionnaire;
   const structuredType = Object.keys(item.structured_responses || {})[0];
 
   return (
-    <Card className="flex flex-col py-3 px-4 transition-colors hover:bg-muted/50">
+    <Card
+      className={cn(
+        "flex flex-col py-3 px-4 transition-colors hover:bg-muted/50",
+        isPrintPreview && "shadow-none",
+      )}
+    >
       <div className="flex items-start justify-between">
         <div className="space-y-1">
           <div className="flex items-center gap-2 text-xs text-gray-500">
@@ -317,7 +328,12 @@ export default function QuestionnaireResponsesList({
         ) : (
           <div>
             {questionnarieResponses?.results?.length === 0 ? (
-              <Card className="p-6">
+              <Card
+                className={cn(
+                  "p-6",
+                  isPrintPreview && "shadow-none border-gray",
+                )}
+              >
                 <div className="text-lg font-medium text-gray-500">
                   {t("no_questionnaire_responses")}
                 </div>
@@ -327,7 +343,11 @@ export default function QuestionnaireResponsesList({
                 {questionnarieResponses?.results?.map(
                   (item: QuestionnaireResponse) => (
                     <li key={item.id} className="w-full">
-                      <ResponseCard key={item.id} item={item} />
+                      <ResponseCard
+                        key={item.id}
+                        item={item}
+                        isPrintPreview={isPrintPreview}
+                      />
                     </li>
                   ),
                 )}
diff --git a/src/components/Facility/FacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
index c6cabe1de6a..1058f324bd0 100644
--- a/src/components/Facility/FacilityForm.tsx
+++ b/src/components/Facility/FacilityForm.tsx
@@ -144,7 +144,7 @@ export default function FacilityForm({
 
   const handleFeatureChange = (value: string[]) => {
     const features = value.map((val) => Number(val));
-    form.setValue("features", features);
+    form.setValue("features", features, { shouldDirty: true });
   };
 
   const handleGetCurrentLocation = () => {
@@ -152,8 +152,12 @@ export default function FacilityForm({
       setIsGettingLocation(true);
       navigator.geolocation.getCurrentPosition(
         (position) => {
-          form.setValue("latitude", position.coords.latitude);
-          form.setValue("longitude", position.coords.longitude);
+          form.setValue("latitude", position.coords.latitude, {
+            shouldDirty: true,
+          });
+          form.setValue("longitude", position.coords.longitude, {
+            shouldDirty: true,
+          });
           setIsGettingLocation(false);
           toast.success(t("location_updated_successfully"));
         },
@@ -346,7 +350,9 @@ export default function FacilityForm({
                       value={form.watch("geo_organization")}
                       selected={selectedLevels}
                       onChange={(value) =>
-                        form.setValue("geo_organization", value)
+                        form.setValue("geo_organization", value, {
+                          shouldDirty: true,
+                        })
                       }
                       required
                     />
@@ -418,6 +424,7 @@ export default function FacilityForm({
                         form.setValue(
                           "latitude",
                           e.target.value ? Number(e.target.value) : undefined,
+                          { shouldDirty: true },
                         );
                       }}
                       data-cy="facility-latitude"
@@ -445,6 +452,7 @@ export default function FacilityForm({
                         form.setValue(
                           "longitude",
                           e.target.value ? Number(e.target.value) : undefined,
+                          { shouldDirty: true },
                         );
                       }}
                       data-cy="facility-longitude"
@@ -493,7 +501,9 @@ export default function FacilityForm({
           type="submit"
           className="w-full"
           variant="primary"
-          disabled={facilityId ? isUpdatePending : isPending}
+          disabled={
+            facilityId ? isUpdatePending || !form.formState.isDirty : isPending
+          }
           data-cy={facilityId ? "update-facility" : "submit-facility"}
         >
           {facilityId ? (
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index edd84bdf56b..c619575586c 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -35,6 +35,8 @@ import type {
 } from "@/types/organization/organization";
 import { getOrgLabel } from "@/types/organization/organization";
 
+import { FacilityMapsLink } from "./FacilityMapLink";
+
 type Props = {
   facilityId: string;
 };
@@ -322,8 +324,13 @@ export const FacilityHome = ({ facilityId }: Props) => {
                         <span className="font-semibold text-lg">
                           {t("location_details")}
                         </span>
-                        <span className="text-gray-800 truncate">
-                          {/* Add Location Link Here */}
+                        <span>
+                          {facilityData.latitude && facilityData.longitude && (
+                            <FacilityMapsLink
+                              latitude={facilityData.latitude.toString()}
+                              longitude={facilityData.longitude.toString()}
+                            />
+                          )}
                         </span>
                       </div>
                     </div>
diff --git a/src/components/Facility/FacilityMapLink.tsx b/src/components/Facility/FacilityMapLink.tsx
new file mode 100644
index 00000000000..47a76082fbf
--- /dev/null
+++ b/src/components/Facility/FacilityMapLink.tsx
@@ -0,0 +1,42 @@
+import { SquareArrowOutUpRight } from "lucide-react";
+import { Link } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import { getMapUrl, isAndroidDevice } from "@/Utils/utils";
+
+const isValidLatitude = (latitude: string) => {
+  const lat = parseFloat(latitude.trim());
+  return Number.isFinite(lat) && lat >= -90 && lat <= 90;
+};
+
+const isValidLongitude = (longitude: string) => {
+  const long = parseFloat(longitude.trim());
+  return Number.isFinite(long) && long >= -180 && long <= 180;
+};
+
+export const FacilityMapsLink = ({
+  latitude,
+  longitude,
+}: {
+  latitude: string;
+  longitude: string;
+}) => {
+  const { t } = useTranslation();
+
+  if (!isValidLatitude(latitude) || !isValidLongitude(longitude)) {
+    return null;
+  }
+  const target = isAndroidDevice ? "_self" : "_blank";
+
+  return (
+    <Link
+      className="text-primary flex items-center gap-1 w-max"
+      href={getMapUrl(latitude, longitude)}
+      target={target}
+      rel="noreferrer"
+    >
+      {t("show_on_map")}
+      <SquareArrowOutUpRight className="h-3 w-3" />
+    </Link>
+  );
+};
diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx
index 50fb179cd36..3c1abcbfb45 100644
--- a/src/components/Files/FilesTab.tsx
+++ b/src/components/Files/FilesTab.tsx
@@ -251,54 +251,52 @@ export const FilesTab = (props: FilesTabProps) => {
     const filetype = getFileType(file);
     return (
       <>
-        {editPermission() && (
-          <div className="flex flex-row gap-2 justify-end">
-            {filetype === "AUDIO" && !file.is_archived && (
-              <Button
-                variant="secondary"
-                onClick={() => {
-                  setSelectedAudioFile(file);
-                  setOpenAudioPlayerDialog(true);
-                }}
-              >
-                <span className="flex flex-row items-center gap-1">
-                  <CareIcon icon="l-play-circle" className="mr-1" />
-                  {t("play")}
-                </span>
-              </Button>
-            )}
-            {fileManager.isPreviewable(file) && (
-              <Button
-                variant="secondary"
-                onClick={() => fileManager.viewFile(file, associatingId)}
-              >
-                <span className="flex flex-row items-center gap-1">
-                  <CareIcon icon="l-eye" />
-                  {t("view")}
-                </span>
+        <div className="flex flex-row gap-2 justify-end">
+          {filetype === "AUDIO" && !file.is_archived && (
+            <Button
+              variant="secondary"
+              onClick={() => {
+                setSelectedAudioFile(file);
+                setOpenAudioPlayerDialog(true);
+              }}
+            >
+              <span className="flex flex-row items-center gap-1">
+                <CareIcon icon="l-play-circle" className="mr-1" />
+                {t("play")}
+              </span>
+            </Button>
+          )}
+          {fileManager.isPreviewable(file) && (
+            <Button
+              variant="secondary"
+              onClick={() => fileManager.viewFile(file, associatingId)}
+            >
+              <span className="flex flex-row items-center gap-1">
+                <CareIcon icon="l-eye" />
+                {t("view")}
+              </span>
+            </Button>
+          )}
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant="secondary">
+                <CareIcon icon="l-ellipsis-h" />
               </Button>
-            )}
-            {
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="secondary">
-                    <CareIcon icon="l-ellipsis-h" />
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="start">
-                  <DropdownMenuItem asChild className="text-primary-900">
-                    <Button
-                      size="sm"
-                      onClick={() =>
-                        fileManager.downloadFile(file, associatingId)
-                      }
-                      variant="ghost"
-                      className="w-full flex flex-row justify-stretch items-center"
-                    >
-                      <CareIcon icon="l-arrow-circle-down" className="mr-1" />
-                      <span>{t("download")}</span>
-                    </Button>
-                  </DropdownMenuItem>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem asChild className="text-primary-900">
+                <Button
+                  size="sm"
+                  onClick={() => fileManager.downloadFile(file, associatingId)}
+                  variant="ghost"
+                  className="w-full flex flex-row justify-stretch items-center"
+                >
+                  <CareIcon icon="l-arrow-circle-down" className="mr-1" />
+                  <span>{t("download")}</span>
+                </Button>
+              </DropdownMenuItem>
+              {editPermission() && (
+                <>
                   <DropdownMenuItem asChild className="text-primary-900">
                     <Button
                       size="sm"
@@ -323,11 +321,11 @@ export const FilesTab = (props: FilesTabProps) => {
                       <span>{t("rename")}</span>
                     </Button>
                   </DropdownMenuItem>
-                </DropdownMenuContent>
-              </DropdownMenu>
-            }
-          </div>
-        )}
+                </>
+              )}
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
       </>
     );
   };
diff --git a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
index 93d8c430717..b70ec7e45e8 100644
--- a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
+++ b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx
@@ -8,7 +8,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
+import { Card, CardContent } from "@/components/ui/card";
 import { Input } from "@/components/ui/input";
 import {
   Popover,
@@ -647,113 +647,124 @@ export const AdministrationTab: React.FC<AdministrationTabProps> = ({
     content = <EmptyState searching searchQuery={searchQuery} />;
   } else {
     content = (
-      <ScrollArea className="w-full whitespace-nowrap rounded-md">
-        <Card className="w-full border-none shadow-none min-w-[640px]">
-          <div className="grid grid-cols-[minmax(200px,2fr),repeat(4,minmax(140px,1fr)),40px]">
-            {/* Top row without vertical borders */}
-            <div className="col-span-full grid grid-cols-subgrid">
-              <div className="flex items-center justify-between p-4 bg-gray-50 border-t border-gray-50">
-                <div className="flex items-center gap-2 whitespace-break-spaces">
-                  {lastModifiedDate && (
-                    <div className="text-xs text-[#6b7280]">
-                      {t("last_modified")}{" "}
-                      {formatDistanceToNow(lastModifiedDate)} {t("ago")}
-                    </div>
-                  )}
+      <>
+        {!filteredMedications.length && (
+          <CardContent className="p-2">
+            <p className="text-gray-500 w-full flex justify-center mb-3">
+              {t("no_active_medication_recorded")}
+            </p>
+          </CardContent>
+        )}
+        <ScrollArea className="w-full whitespace-nowrap rounded-md">
+          <Card className="w-full border-none shadow-none min-w-[640px]">
+            <div className="grid grid-cols-[minmax(200px,2fr),repeat(4,minmax(140px,1fr)),40px]">
+              {/* Top row without vertical borders */}
+              <div className="col-span-full grid grid-cols-subgrid">
+                <div className="flex items-center justify-between p-4 bg-gray-50 border-t border-gray-50">
+                  <div className="flex items-center gap-2 whitespace-break-spaces">
+                    {lastModifiedDate && (
+                      <div className="text-xs text-[#6b7280]">
+                        {t("last_modified")}{" "}
+                        {formatDistanceToNow(lastModifiedDate)} {t("ago")}
+                      </div>
+                    )}
+                  </div>
+                  <div className="flex justify-end items-center bg-gray-50 rounded">
+                    <Button
+                      variant="outline"
+                      size="icon"
+                      className="h-8 w-8 text-gray-400 mr-2"
+                      onClick={handlePreviousSlot}
+                      disabled={!canGoBack}
+                      title={
+                        !canGoBack
+                          ? t("cannot_go_before_prescription_date")
+                          : ""
+                      }
+                    >
+                      <CareIcon icon="l-angle-left" className="h-4 w-4" />
+                    </Button>
+                  </div>
                 </div>
-                <div className="flex justify-end items-center bg-gray-50 rounded">
+                {visibleSlots.map((slot) => (
+                  <TimeSlotHeader
+                    key={`${format(slot.date, "yyyy-MM-dd")}-${slot.start}`}
+                    slot={slot}
+                    isCurrentSlot={isTimeInSlot(currentDate, slot)}
+                    isEndSlot={slot.date.getTime() === currentDate.getTime()}
+                  />
+                ))}
+                <div className="flex justify-start items-center px-1 bg-gray-50">
                   <Button
                     variant="outline"
                     size="icon"
-                    className="h-8 w-8 text-gray-400 mr-2"
-                    onClick={handlePreviousSlot}
-                    disabled={!canGoBack}
-                    title={
-                      !canGoBack ? t("cannot_go_before_prescription_date") : ""
-                    }
+                    className="h-8 w-8 text-gray-400"
+                    onClick={handleNextSlot}
+                    disabled={isTimeInSlot(currentDate, visibleSlots[3])}
                   >
-                    <CareIcon icon="l-angle-left" className="h-4 w-4" />
+                    <CareIcon icon="l-angle-right" className="h-4 w-4" />
                   </Button>
                 </div>
               </div>
-              {visibleSlots.map((slot) => (
-                <TimeSlotHeader
-                  key={`${format(slot.date, "yyyy-MM-dd")}-${slot.start}`}
-                  slot={slot}
-                  isCurrentSlot={isTimeInSlot(currentDate, slot)}
-                  isEndSlot={slot.date.getTime() === currentDate.getTime()}
-                />
-              ))}
-              <div className="flex justify-start items-center px-1 bg-gray-50">
-                <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-8 w-8 text-gray-400"
-                  onClick={handleNextSlot}
-                  disabled={isTimeInSlot(currentDate, visibleSlots[3])}
-                >
-                  <CareIcon icon="l-angle-right" className="h-4 w-4" />
-                </Button>
-              </div>
-            </div>
 
-            {/* Main content with borders */}
-            <div className="col-span-full grid grid-cols-subgrid divide-x divide-[#e5e7eb] border-l border-r">
-              {/* Headers */}
-              <div className="p-4 font-medium text-sm border-t bg-[#F3F4F6] text-secondary-700">
-                {t("medicine")}:
-              </div>
-              {visibleSlots.map((slot, i) => (
-                <div
-                  key={`${format(slot.date, "yyyy-MM-dd")}-${slot.start}`}
-                  className="p-4 font-semibold text-xs text-center border-t relative bg-[#F3F4F6] text-secondary-700"
-                >
-                  {i === endSlotIndex &&
-                    slot.date.getTime() === currentDate.getTime() && (
-                      <div className="absolute top-0 left-1/2 -translate-y-1/2 -translate-x-1/2">
-                        <div className="h-2 w-2 rounded-full bg-blue-500" />
-                      </div>
-                    )}
-                  {slot.label}
+              {/* Main content with borders */}
+              <div className="col-span-full grid grid-cols-subgrid divide-x divide-[#e5e7eb] border-l border-r">
+                {/* Headers */}
+                <div className="p-4 font-medium text-sm border-t bg-[#F3F4F6] text-secondary-700">
+                  {t("medicine")}:
                 </div>
-              ))}
-              <div className="border-t bg-[#F3F4F6]" />
-
-              {/* Medication rows */}
-              {filteredMedications?.map((medication) => (
-                <MedicationRow
-                  key={medication.id}
-                  medication={medication}
-                  visibleSlots={visibleSlots}
-                  currentDate={currentDate}
-                  administrations={administrations?.results}
-                  onAdminister={handleAdminister}
-                  onEditAdministration={handleEditAdministration}
-                  onDiscontinue={handleDiscontinue}
-                />
-              ))}
+                {visibleSlots.map((slot, i) => (
+                  <div
+                    key={`${format(slot.date, "yyyy-MM-dd")}-${slot.start}`}
+                    className="p-4 font-semibold text-xs text-center border-t relative bg-[#F3F4F6] text-secondary-700"
+                  >
+                    {i === endSlotIndex &&
+                      slot.date.getTime() === currentDate.getTime() && (
+                        <div className="absolute top-0 left-1/2 -translate-y-1/2 -translate-x-1/2">
+                          <div className="h-2 w-2 rounded-full bg-blue-500" />
+                        </div>
+                      )}
+                    {slot.label}
+                  </div>
+                ))}
+                <div className="border-t bg-[#F3F4F6]" />
+
+                {/* Medication rows */}
+                {filteredMedications?.map((medication) => (
+                  <MedicationRow
+                    key={medication.id}
+                    medication={medication}
+                    visibleSlots={visibleSlots}
+                    currentDate={currentDate}
+                    administrations={administrations?.results}
+                    onAdminister={handleAdminister}
+                    onEditAdministration={handleEditAdministration}
+                    onDiscontinue={handleDiscontinue}
+                  />
+                ))}
+              </div>
             </div>
-          </div>
 
-          {stoppedMedications?.results?.length > 0 && !searchQuery.trim() && (
-            <div
-              className="p-4 border-t border-[#e5e7eb] flex items-center gap-2 cursor-pointer hover:bg-gray-50"
-              onClick={() => setShowStopped(!showStopped)}
-            >
-              <CareIcon
-                icon={showStopped ? "l-eye-slash" : "l-eye"}
-                className="h-4 w-4"
-              />
-              <span className="text-sm underline">
-                {showStopped ? t("hide") : t("show")}{" "}
-                {`${stoppedMedications?.results?.length} ${t("stopped")}`}{" "}
-                {t("prescriptions")}
-              </span>
-            </div>
-          )}
-        </Card>
-        <ScrollBar orientation="horizontal" />
-      </ScrollArea>
+            {stoppedMedications?.results?.length > 0 && !searchQuery.trim() && (
+              <div
+                className="p-4 border-t border-[#e5e7eb] flex items-center gap-2 cursor-pointer hover:bg-gray-50"
+                onClick={() => setShowStopped(!showStopped)}
+              >
+                <CareIcon
+                  icon={showStopped ? "l-eye-slash" : "l-eye"}
+                  className="h-4 w-4"
+                />
+                <span className="text-sm underline">
+                  {showStopped ? t("hide") : t("show")}{" "}
+                  {`${stoppedMedications?.results?.length} ${t("stopped")}`}{" "}
+                  {t("prescriptions")}
+                </span>
+              </div>
+            )}
+          </Card>
+          <ScrollBar orientation="horizontal" />
+        </ScrollArea>
+      </>
     );
   }
 
diff --git a/src/components/Medicine/MedicationsTable.tsx b/src/components/Medicine/MedicationsTable.tsx
index e347d2a9ef7..d78c736fd28 100644
--- a/src/components/Medicine/MedicationsTable.tsx
+++ b/src/components/Medicine/MedicationsTable.tsx
@@ -1,7 +1,6 @@
-import { useQuery } from "@tanstack/react-query";
 import { useTranslation } from "react-i18next";
 
-import { Skeleton } from "@/components/ui/skeleton";
+import { CardContent } from "@/components/ui/card";
 import {
   Table,
   TableBody,
@@ -13,14 +12,12 @@ import {
 
 import { reverseFrequencyOption } from "@/components/Questionnaire/QuestionTypes/MedicationRequestQuestion";
 
-import query from "@/Utils/request/query";
 import {
   INACTIVE_MEDICATION_STATUSES,
   MEDICATION_REQUEST_TIMING_OPTIONS,
   MedicationRequestDosageInstruction,
   MedicationRequestRead,
 } from "@/types/emr/medicationRequest";
-import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
 
 import { formatDosage, formatSig } from "./utils";
 
@@ -37,38 +34,22 @@ export function getFrequencyDisplay(
 }
 
 interface MedicationsTableProps {
-  patientId?: string;
-  encounterId?: string;
-  medications?: MedicationRequestRead[];
+  medications: MedicationRequestRead[];
 }
 
-export const MedicationsTable = ({
-  medications,
-  patientId,
-  encounterId,
-}: MedicationsTableProps) => {
+export const MedicationsTable = ({ medications }: MedicationsTableProps) => {
   const { t } = useTranslation();
 
-  const { data: allMedications, isLoading } = useQuery({
-    queryKey: ["medication_requests", patientId, encounterId],
-    queryFn: query(medicationRequestApi.list, {
-      pathParams: { patientId },
-      queryParams: { encounter: encounterId, limit: 50, offset: 0 },
-    }),
-    enabled: !medications && !!patientId,
-  });
-
-  if (isLoading) {
+  if (!medications.length) {
     return (
-      <div className="flex h-[200px] items-center justify-center rounded-lg border-2 border-dashed p-4 text-gray-500">
-        <Skeleton className="h-[100px] w-full" />
-      </div>
+      <CardContent className="p-2">
+        <p className="text-gray-500 w-full flex justify-center mb-3">
+          {t("no_active_medication_recorded")}
+        </p>
+      </CardContent>
     );
   }
 
-  const displayedMedications = !medications
-    ? (allMedications?.results ?? [])
-    : medications;
   return (
     <div className="border rounded-lg overflow-hidden">
       <Table>
@@ -82,7 +63,7 @@ export const MedicationsTable = ({
           </TableRow>
         </TableHeader>
         <TableBody>
-          {displayedMedications?.map((medication) => {
+          {medications.map((medication) => {
             const instruction = medication.dosage_instruction[0];
             const frequency = getFrequencyDisplay(instruction?.timing);
             const dosage = formatDosage(instruction);
diff --git a/src/components/Patient/MedicationStatementList.tsx b/src/components/Patient/MedicationStatementList.tsx
index 112c42414a4..606c00962d7 100644
--- a/src/components/Patient/MedicationStatementList.tsx
+++ b/src/components/Patient/MedicationStatementList.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -35,20 +36,14 @@ import medicationStatementApi from "@/types/emr/medicationStatement/medicationSt
 interface MedicationStatementListProps {
   patientId: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 interface MedicationRowProps {
   statement: MedicationStatementRead;
   isEnteredInError?: boolean;
-  isPrintPreview?: boolean;
 }
 
-function MedicationRow({
-  statement,
-  isEnteredInError,
-  isPrintPreview = false,
-}: MedicationRowProps) {
+function MedicationRow({ statement, isEnteredInError }: MedicationRowProps) {
   const { t } = useTranslation();
 
   return (
@@ -80,26 +75,22 @@ function MedicationRow({
       <TableCell className="max-w-[200px]">
         {statement.note ? (
           <div className="flex items-center gap-2">
-            {isPrintPreview ? (
-              <span className="text-gray-950">{statement.note}</span>
-            ) : (
-              <Popover>
-                <PopoverTrigger asChild>
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    className="h-7 text-xs shrink-0"
-                  >
-                    {t("see_note")}
-                  </Button>
-                </PopoverTrigger>
-                <PopoverContent className="w-80 p-4">
-                  <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                    {statement.note}
-                  </p>
-                </PopoverContent>
-              </Popover>
-            )}
+            <Popover>
+              <PopoverTrigger asChild>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  className="h-7 text-xs shrink-0"
+                >
+                  {t("see_note")}
+                </Button>
+              </PopoverTrigger>
+              <PopoverContent className="w-80 p-4">
+                <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                  {statement.note}
+                </p>
+              </PopoverContent>
+            </Popover>
           </div>
         ) : (
           "-"
@@ -121,11 +112,10 @@ function MedicationRow({
 
 export function MedicationStatementList({
   patientId,
-  className,
-  isPrintPreview = false,
+  className = "",
 }: MedicationStatementListProps) {
   const { t } = useTranslation();
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: medications, isLoading } = useQuery({
     queryKey: ["medication_statements", patientId],
@@ -136,16 +126,9 @@ export function MedicationStatementList({
 
   if (isLoading) {
     return (
-      <Card className={cn("border-none rounded-sm", className)}>
-        <CardHeader
-          className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-        >
-          <CardTitle>{t("ongoing_medications")}</CardTitle>
-        </CardHeader>
-        <CardContent className="px-2 pb-2">
-          <Skeleton className="h-[100px] w-full" />
-        </CardContent>
-      </Card>
+      <MedicationStatementListLayout className={className}>
+        <Skeleton className="h-[100px] w-full" />
+      </MedicationStatementListLayout>
     );
   }
 
@@ -160,31 +143,18 @@ export function MedicationStatementList({
 
   if (!filteredMedications?.length) {
     return (
-      <Card className={cn("border-none rounded-sm", className)}>
-        <CardHeader
-          className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-        >
-          <CardTitle>{t("ongoing_medications")}</CardTitle>
-        </CardHeader>
-        <CardContent
-          className={cn("px-2 pb-3 pt-2", isPrintPreview && "px-0 py-0")}
-        >
-          <p className="text-gray-500">{t("no_ongoing_medications")}</p>
-        </CardContent>
-      </Card>
+      <MedicationStatementListLayout className={className}>
+        <p className="text-gray-500">{t("no_ongoing_medications")}</p>
+      </MedicationStatementListLayout>
     );
   }
 
   return (
-    <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn("px-4 pt-4 pb-2", isPrintPreview && "px-0 py-2")}
-      >
-        <CardTitle>
-          {t("ongoing_medications")} ({filteredMedications.length})
-        </CardTitle>
-      </CardHeader>
-      <CardContent className={cn("px-2 pb-2", isPrintPreview && "px-0 py-0")}>
+    <MedicationStatementListLayout
+      medicationsCount={filteredMedications.length}
+      className={className}
+    >
+      <>
         <Table className="border-separate border-spacing-y-0.5">
           <TableHeader>
             <TableRow className="rounded-md overflow-hidden bg-gray-100">
@@ -226,7 +196,6 @@ export function MedicationStatementList({
                 key={statement.id}
                 statement={statement}
                 isEnteredInError={statement.status === "entered_in_error"}
-                isPrintPreview={isPrintPreview}
               />
             ))}
           </TableBody>
@@ -246,7 +215,29 @@ export function MedicationStatementList({
             </div>
           </>
         )}
-      </CardContent>
-    </Card>
+      </>
+    </MedicationStatementListLayout>
   );
 }
+
+const MedicationStatementListLayout = ({
+  children,
+  className,
+  medicationsCount,
+}: {
+  children: React.ReactNode;
+  className?: string;
+  medicationsCount?: number | undefined;
+}) => {
+  return (
+    <Card className={cn("rounded-sm ", className)}>
+      <CardHeader className="px-4 pt-4 pb-2">
+        <CardTitle>
+          {t("ongoing_medications")}{" "}
+          {medicationsCount ? `(${medicationsCount})` : ""}
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
+    </Card>
+  );
+};
diff --git a/src/components/Patient/PatientRegistration.tsx b/src/components/Patient/PatientRegistration.tsx
index 6f46b141468..bfc08e2f435 100644
--- a/src/components/Patient/PatientRegistration.tsx
+++ b/src/components/Patient/PatientRegistration.tsx
@@ -262,26 +262,32 @@ export default function PatientRegistration(
         patientQuery.data.geo_organization as unknown as Organization,
       ]);
       form.reset({
-        ...patientQuery.data,
+        name: patientQuery.data.name || "",
+        phone_number: patientQuery.data.phone_number || "",
+        emergency_phone_number: patientQuery.data.emergency_phone_number || "",
         same_phone_number:
           patientQuery.data.phone_number ===
           patientQuery.data.emergency_phone_number,
         same_address:
           patientQuery.data.address === patientQuery.data.permanent_address,
+        gender: patientQuery.data.gender as (typeof GENDERS)[number],
+        blood_group: patientQuery.data.blood_group,
         age_or_dob: patientQuery.data.date_of_birth ? "dob" : "age",
+        date_of_birth: patientQuery.data.date_of_birth || undefined,
         age:
           !patientQuery.data.date_of_birth && patientQuery.data.year_of_birth
             ? new Date().getFullYear() - patientQuery.data.year_of_birth
             : undefined,
-        date_of_birth: patientQuery.data.date_of_birth
-          ? patientQuery.data.date_of_birth
-          : undefined,
+        address: patientQuery.data.address || "",
+        permanent_address: patientQuery.data.permanent_address || "",
+        pincode: patientQuery.data.pincode || undefined,
+        nationality: patientQuery.data.nationality || "India",
         geo_organization: (
           patientQuery.data.geo_organization as unknown as Organization
         )?.id,
       } as unknown as z.infer<typeof formSchema>);
     }
-  }, [patientQuery.data]); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [patientQuery.data]);
 
   const showDuplicate =
     !patientPhoneSearch.isLoading &&
@@ -733,7 +739,11 @@ export default function PatientRegistration(
               <Button
                 type="submit"
                 variant="primary"
-                disabled={isCreatingPatient || isUpdatingPatient}
+                disabled={
+                  isCreatingPatient ||
+                  isUpdatingPatient ||
+                  !form.formState.isDirty
+                }
               >
                 {patientId ? t("save") : t("save_and_continue")}
               </Button>
diff --git a/src/components/Patient/TreatmentSummary.tsx b/src/components/Patient/TreatmentSummary.tsx
index ad87eee91a6..862d7dca5b8 100644
--- a/src/components/Patient/TreatmentSummary.tsx
+++ b/src/components/Patient/TreatmentSummary.tsx
@@ -2,38 +2,133 @@ import careConfig from "@careConfig";
 import { useQuery } from "@tanstack/react-query";
 import { format } from "date-fns";
 import { t } from "i18next";
+import { Loader } from "lucide-react";
 
 import PrintPreview from "@/CAREUI/misc/PrintPreview";
 
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+
+import Loading from "@/components/Common/Loading";
+import PrintTable from "@/components/Common/PrintTable";
 import QuestionnaireResponsesList from "@/components/Facility/ConsultationDetails/QuestionnaireResponsesList";
-import { MedicationsTable } from "@/components/Medicine/MedicationsTable";
-import { AllergyList } from "@/components/Patient/allergy/list";
-import { DiagnosisList } from "@/components/Patient/diagnosis/list";
-import { SymptomsList } from "@/components/Patient/symptoms/list";
+import { getFrequencyDisplay } from "@/components/Medicine/MedicationsTable";
+import { formatDosage, formatSig } from "@/components/Medicine/utils";
 
 import api from "@/Utils/request/api";
 import query from "@/Utils/request/query";
-import { formatName, formatPatientAge } from "@/Utils/utils";
-
-import { MedicationStatementList } from "./MedicationStatementList";
+import { formatDateTime, formatName, formatPatientAge } from "@/Utils/utils";
+import allergyIntoleranceApi from "@/types/emr/allergyIntolerance/allergyIntoleranceApi";
+import diagnosisApi from "@/types/emr/diagnosis/diagnosisApi";
+import { completedEncounterStatus } from "@/types/emr/encounter";
+import medicationRequestApi from "@/types/emr/medicationRequest/medicationRequestApi";
+import medicationStatementApi from "@/types/emr/medicationStatement/medicationStatementApi";
+import symptomApi from "@/types/emr/symptom/symptomApi";
 
 interface TreatmentSummaryProps {
   facilityId: string;
   encounterId: string;
+
+  patientId: string;
 }
 
+const SectionLayout = ({
+  children,
+  title,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) => {
+  return (
+    <Card className="rounded-sm shadow-none border-none">
+      <CardHeader className="flex justify-between flex-row px-0 py-2 ">
+        <CardTitle>{title}</CardTitle>
+      </CardHeader>
+      <CardContent className="px-0 py-0">{children}</CardContent>
+    </Card>
+  );
+};
+
+const EmptyState = ({ message }: { message: string }) => {
+  return (
+    <CardContent className="px-2 pb-3 pt-2">
+      <p className="text-gray-500">{message}</p>
+    </CardContent>
+  );
+};
 export default function TreatmentSummary({
   facilityId,
   encounterId,
+  patientId,
 }: TreatmentSummaryProps) {
-  const { data: encounter } = useQuery({
+  const { data: encounter, isLoading: encounterLoading } = useQuery({
     queryKey: ["encounter", encounterId],
     queryFn: query(api.encounter.get, {
       pathParams: { id: encounterId },
       queryParams: { facility: facilityId },
     }),
+    enabled: !!encounterId && !!facilityId,
   });
 
+  const { data: allergies, isLoading: allergiesLoading } = useQuery({
+    queryKey: ["allergies", patientId, encounterId],
+    queryFn: query.paginated(allergyIntoleranceApi.getAllergy, {
+      pathParams: { patientId },
+      queryParams: {
+        encounter: (
+          encounter?.status
+            ? completedEncounterStatus.includes(encounter.status)
+            : false
+        )
+          ? encounterId
+          : undefined,
+      },
+      pageSize: 100,
+    }),
+  });
+
+  const { data: symptoms, isLoading: symptomsLoading } = useQuery({
+    queryKey: ["symptoms", patientId, encounterId],
+    queryFn: query.paginated(symptomApi.listSymptoms, {
+      pathParams: { patientId },
+      queryParams: { encounter: encounterId },
+      pageSize: 100,
+    }),
+    enabled: !!patientId && !!encounterId,
+  });
+
+  const { data: diagnoses, isLoading: diagnosesLoading } = useQuery({
+    queryKey: ["diagnosis", patientId, encounterId],
+    queryFn: query.paginated(diagnosisApi.listDiagnosis, {
+      pathParams: { patientId },
+      queryParams: { encounter: encounterId },
+      pageSize: 100,
+    }),
+    enabled: !!patientId && !!encounterId,
+  });
+
+  const { data: medications, isLoading: medicationsLoading } = useQuery({
+    queryKey: ["medication_requests", patientId, encounterId],
+    queryFn: query.paginated(medicationRequestApi.list, {
+      pathParams: { patientId },
+      queryParams: { encounter: encounterId },
+      pageSize: 100,
+    }),
+    enabled: !!encounterId,
+  });
+  const { data: medicationStatement, isLoading: medicationStatementLoading } =
+    useQuery({
+      queryKey: ["medication_statements", patientId],
+      queryFn: query.paginated(medicationStatementApi.list, {
+        pathParams: { patientId },
+        pageSize: 100,
+      }),
+      enabled: !!patientId,
+    });
+
+  if (encounterLoading) {
+    return <Loading />;
+  }
+
   if (!encounter) {
     return (
       <div className="flex h-[200px] items-center justify-center rounded-lg border-2 border-dashed p-4 text-gray-500">
@@ -42,11 +137,31 @@ export default function TreatmentSummary({
     );
   }
 
+  const isLoading =
+    encounterLoading ||
+    allergiesLoading ||
+    diagnosesLoading ||
+    symptomsLoading ||
+    medicationsLoading ||
+    medicationStatementLoading;
+
+  if (isLoading) {
+    return (
+      <PrintPreview
+        title={`${t("treatment_summary")} - ${encounter.patient.name}`}
+      >
+        <div className="flex items-center justify-center h-full">
+          <Loader />
+        </div>
+      </PrintPreview>
+    );
+  }
+
   return (
     <PrintPreview
       title={`${t("treatment_summary")} - ${encounter.patient.name}`}
     >
-      <div className="min-h-screen bg-white py-2 max-w-4xl mx-auto">
+      <div className="min-h-screen py-2 max-w-4xl mx-auto">
         <div className="space-y-6">
           {/* Header */}
           <div className="flex justify-between items-start pb-2 border-b">
@@ -68,36 +183,39 @@ export default function TreatmentSummary({
           </div>
 
           {/* Patient Details */}
-          <div className="grid grid-cols-2 gap-x-12 gap-y-6">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-6">
             <div className="space-y-3">
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("patient")}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">{encounter.patient.name}</span>
+                <span className="font-semibold break-words">
+                  {encounter.patient.name}
+                </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{`${t("age")} / ${t("sex")}`}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">
+                <span className="font-semibold break-words">
                   {`${formatPatientAge(encounter.patient, true)}, ${t(`GENDER__${encounter.patient.gender}`)}`}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("encounter_class")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_class__${encounter.encounter_class}`)}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("priority")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_priority__${encounter.priority}`)}
                 </span>
               </div>
+
               {encounter.hospitalization?.admit_source && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("admission_source")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -108,14 +226,14 @@ export default function TreatmentSummary({
                 </div>
               )}
               {encounter.hospitalization?.re_admission && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("readmission")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">{t("yes")}</span>
                 </div>
               )}
               {encounter.hospitalization?.diet_preference && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("diet_preference")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -126,16 +244,19 @@ export default function TreatmentSummary({
                 </div>
               )}
             </div>
+
+            {/* Right Column */}
             <div className="space-y-3">
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("mobile_number")}</span>
                 <span className="text-gray-600">:</span>
-                <span className="font-semibold">
+                <span className="font-semibold break-words">
                   {encounter.patient.phone_number}
                 </span>
               </div>
+
               {encounter.period?.start && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("encounter_date")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -146,22 +267,25 @@ export default function TreatmentSummary({
                   </span>
                 </div>
               )}
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("status")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {t(`encounter_status__${encounter.status}`)}
                 </span>
               </div>
-              <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+
+              <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                 <span className="text-gray-600">{t("consulting_doctor")}</span>
                 <span className="text-gray-600">:</span>
                 <span className="font-semibold">
                   {formatName(encounter.created_by)}
                 </span>
               </div>
+
               {encounter.external_identifier && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">{t("external_id")}</span>
                   <span className="text-gray-600">:</span>
                   <span className="font-semibold">
@@ -169,8 +293,9 @@ export default function TreatmentSummary({
                   </span>
                 </div>
               )}
+
               {encounter.hospitalization?.discharge_disposition && (
-                <div className="grid grid-cols-[8rem,0.25rem,1fr] items-center">
+                <div className="grid grid-cols-[10rem,auto,1fr] md:grid-cols-[8rem,auto,1fr] items-center">
                   <span className="text-gray-600">
                     {t("discharge_disposition")}
                   </span>
@@ -184,51 +309,176 @@ export default function TreatmentSummary({
               )}
             </div>
           </div>
-
           {/* Medical Information */}
           <div className="space-y-6">
             {/* Allergies */}
-            <AllergyList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+            <SectionLayout title={t("allergies")}>
+              {allergies?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "allergen" },
+                    { key: "status" },
+                    { key: "criticality" },
+                    { key: "verification" },
+                    { key: "notes" },
+                    { key: "logged_by" },
+                  ]}
+                  rows={allergies?.results.map((allergy) => ({
+                    allergen: allergy.code.display,
+                    status: t(allergy.clinical_status),
+                    criticality: t(allergy.criticality),
+                    verification: t(allergy.verification_status),
+                    notes: allergy.note,
+                    logged_by: formatName(allergy.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_allergies_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Symptoms */}
-            <SymptomsList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+
+            <SectionLayout title={t("symptoms")}>
+              {symptoms?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "symptom" },
+                    { key: "severity" },
+                    { key: "status" },
+                    { key: "verification" },
+                    { key: "onset" },
+                    { key: "notes" },
+                    { key: "logged_by" },
+                  ]}
+                  rows={symptoms?.results?.map((symptom) => ({
+                    symptom: symptom.code.display,
+                    severity: t(symptom.severity),
+                    status: t(symptom.clinical_status),
+                    verification: t(symptom.verification_status),
+                    onset: symptom.onset?.onset_datetime
+                      ? new Date(
+                          symptom.onset.onset_datetime,
+                        ).toLocaleDateString()
+                      : "-",
+                    notes: symptom.note,
+                    logged_by: formatName(symptom.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_symptoms_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Diagnoses */}
-            <DiagnosisList
-              patientId={encounter.patient.id}
-              encounterId={encounterId}
-              className="border-none shadow-none"
-              isPrintPreview={true}
-            />
+            <SectionLayout title={t("diagnoses")}>
+              {diagnoses?.count ? (
+                <PrintTable
+                  headers={[
+                    { key: "diagnosis" },
+                    { key: "status" },
+                    { key: "verification" },
+                    { key: "onset" },
+                    { key: "notes" },
+                    { key: "logged_by" },
+                  ]}
+                  rows={diagnoses?.results.map((diagnosis) => ({
+                    diagnosis: diagnosis.code.display,
+                    status: t(diagnosis.clinical_status),
+                    verification: t(diagnosis.verification_status),
+                    onset: diagnosis.onset?.onset_datetime
+                      ? new Date(
+                          diagnosis.onset.onset_datetime,
+                        ).toLocaleDateString()
+                      : undefined,
+                    notes: diagnosis.note,
+                    logged_by: formatName(diagnosis.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_diagnoses_recorded")} />
+              )}
+            </SectionLayout>
 
             {/* Medications */}
-            <div className="border-none shadow-none space-y-2">
-              <p className="text-sm font-semibold text-gray-950">
-                {t("medications")}
-              </p>
-              <MedicationsTable
-                patientId={encounter.patient.id}
-                encounterId={encounterId}
-              />
-            </div>
-          </div>
+            <SectionLayout title={t("medications")}>
+              {medications?.results.length ? (
+                <PrintTable
+                  headers={[
+                    { key: "medicine" },
+                    { key: "status" },
+                    { key: "dosage" },
+                    { key: "frequency" },
+                    { key: "duration" },
+                    { key: "instructions" },
+                  ]}
+                  rows={medications?.results.map((medication) => {
+                    const instruction = medication.dosage_instruction[0];
+                    const frequency = getFrequencyDisplay(instruction?.timing);
+                    const dosage = formatDosage(instruction);
+                    const duration =
+                      instruction?.timing?.repeat?.bounds_duration;
+                    const remarks = formatSig(instruction);
+                    const notes = medication.note;
+                    return {
+                      medicine: medication.medication?.display,
+                      status: t(medication.status),
+                      dosage: dosage,
+                      frequency: instruction?.as_needed_boolean
+                        ? `${t("as_needed_prn")} (${instruction?.as_needed_for?.display ?? "-"})`
+                        : (frequency?.meaning ?? "-") +
+                          (instruction?.additional_instruction?.[0]?.display
+                            ? `, ${instruction.additional_instruction[0].display}`
+                            : ""),
+                      duration: duration
+                        ? `${duration.value} ${duration.unit}`
+                        : "-",
+                      instructions: `${remarks || "-"}${notes ? ` (${t("note")}: ${notes})` : ""}`,
+                    };
+                  })}
+                />
+              ) : (
+                <EmptyState message={t("no_medication_recorded")} />
+              )}
+            </SectionLayout>
 
-          {/* Medication Statements */}
-          <MedicationStatementList
-            patientId={encounter.patient.id}
-            className="border-none shadow-none"
-            isPrintPreview={true}
-          />
+            {/* Medication Statements */}
+            <SectionLayout title={t("ongoing_medications")}>
+              {medicationStatement?.results.length ? (
+                <PrintTable
+                  headers={[
+                    { key: "medication" },
+                    { key: "dosage" },
+                    { key: "status" },
+                    {
+                      key: "medication_taken_between",
+                    },
+                    { key: "reason" },
+                    { key: "notes" },
+                    { key: "logged_by" },
+                  ]}
+                  rows={medicationStatement?.results.map((medication) => ({
+                    medication:
+                      medication.medication.display ??
+                      medication.medication.code,
+                    dosage: medication.dosage_text,
+                    status: medication.status,
+                    medication_taken_between: [
+                      medication.effective_period?.start,
+                      medication.effective_period?.end,
+                    ]
+                      .map((date) => formatDateTime(date))
+                      .join(" - "),
+                    reason: medication.reason,
+                    notes: medication.note,
+                    logged_by: formatName(medication.created_by),
+                  }))}
+                />
+              ) : (
+                <EmptyState message={t("no_ongoing_medications")} />
+              )}
+            </SectionLayout>
+          </div>
 
           {/* Questionnaire Responses Section */}
           <div>
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index 62695fe02e8..4e4fe877a90 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -50,7 +50,7 @@ interface AllergyListProps {
   patientId: string;
   encounterId?: string;
   className?: string;
-  isPrintPreview?: boolean;
+
   encounterStatus?: Encounter["status"];
 }
 
@@ -72,10 +72,9 @@ export function AllergyList({
   patientId,
   encounterId,
   className,
-  isPrintPreview = false,
   encounterStatus,
 }: AllergyListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: allergies, isLoading } = useQuery({
     queryKey: ["allergies", patientId, encounterId, encounterStatus],
@@ -178,28 +177,22 @@ export function AllergyList({
         <TableCell className="text-sm text-gray-950">
           {allergy.note && (
             <div className="flex items-center gap-2">
-              {isPrintPreview ? (
-                <span className="text-gray-950 max-w-[200px]">
-                  {allergy.note}
-                </span>
-              ) : (
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      className="h-7 text-xs shrink-0"
-                    >
-                      {t("see_note")}
-                    </Button>
-                  </PopoverTrigger>
-                  <PopoverContent className="w-80 p-4">
-                    <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                      {allergy.note}
-                    </p>
-                  </PopoverContent>
-                </Popover>
-              )}
+              <Popover>
+                <PopoverTrigger asChild>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="h-7 text-xs shrink-0"
+                  >
+                    {t("see_note")}
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent className="w-80 p-4">
+                  <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                    {allergy.note}
+                  </p>
+                </PopoverContent>
+              </Popover>
             </div>
           )}
         </TableCell>
@@ -223,7 +216,6 @@ export function AllergyList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
       <Table className="border-separate border-spacing-y-0.5">
         <TableHeader>
@@ -295,24 +287,16 @@ const AllergyListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
     <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn(
-          "flex justify-between flex-row",
-          !isPrintPreview && "px-4 pt-4 pb-2 ",
-          isPrintPreview && "px-0 py-2 ",
-        )}
-      >
+      <CardHeader className="flex justify-between flex-row px-4 pt-4 pb-2">
         <CardTitle>{t("allergies")}</CardTitle>
         {facilityId && encounterId && (
           <Link
@@ -324,14 +308,7 @@ const AllergyListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          !isPrintPreview && "px-2 pb-2",
-          isPrintPreview && "px-0 py-0",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/diagnosis/DiagnosisTable.tsx b/src/components/Patient/diagnosis/DiagnosisTable.tsx
index ac9d93cc878..b80e0b6062a 100644
--- a/src/components/Patient/diagnosis/DiagnosisTable.tsx
+++ b/src/components/Patient/diagnosis/DiagnosisTable.tsx
@@ -26,13 +26,9 @@ import {
 
 interface DiagnosisTableProps {
   diagnoses: Diagnosis[];
-  isPrintPreview?: boolean;
 }
 
-export function DiagnosisTable({
-  diagnoses,
-  isPrintPreview = false,
-}: DiagnosisTableProps) {
+export function DiagnosisTable({ diagnoses }: DiagnosisTableProps) {
   return (
     <Table className="border-separate border-spacing-y-0.5">
       <TableHeader>
@@ -100,26 +96,22 @@ export function DiagnosisTable({
             <TableCell className="max-w-[200px]">
               {diagnosis.note ? (
                 <div className="flex items-center gap-2">
-                  {isPrintPreview ? (
-                    <span className="text-gray-950">{diagnosis.note}</span>
-                  ) : (
-                    <Popover>
-                      <PopoverTrigger asChild>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="h-7 text-xs shrink-0"
-                        >
-                          {t("see_note")}
-                        </Button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-80 p-4">
-                        <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                          {diagnosis.note}
-                        </p>
-                      </PopoverContent>
-                    </Popover>
-                  )}
+                  <Popover>
+                    <PopoverTrigger asChild>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        className="h-7 text-xs shrink-0"
+                      >
+                        {t("see_note")}
+                      </Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-80 p-4">
+                      <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                        {diagnosis.note}
+                      </p>
+                    </PopoverContent>
+                  </Popover>
                 </div>
               ) : (
                 "-"
@@ -132,6 +124,7 @@ export function DiagnosisTable({
                   className="w-4 h-4"
                   imageUrl={diagnosis.created_by.profile_picture_url}
                 />
+
                 <span className="text-sm">{diagnosis.created_by.username}</span>
               </div>
             </TableCell>
diff --git a/src/components/Patient/diagnosis/list.tsx b/src/components/Patient/diagnosis/list.tsx
index 4695f5900f9..cb682456b02 100644
--- a/src/components/Patient/diagnosis/list.tsx
+++ b/src/components/Patient/diagnosis/list.tsx
@@ -21,7 +21,6 @@ interface DiagnosisListProps {
   encounterId?: string;
   facilityId?: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 export function DiagnosisList({
@@ -29,9 +28,8 @@ export function DiagnosisList({
   encounterId,
   facilityId,
   className,
-  isPrintPreview = false,
 }: DiagnosisListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: diagnoses, isLoading } = useQuery({
     queryKey: ["diagnosis", patientId, encounterId],
@@ -47,6 +45,7 @@ export function DiagnosisList({
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
+        className={className}
       >
         <CardContent className="px-2 pb-2">
           <Skeleton className="h-[100px] w-full" />
@@ -71,6 +70,7 @@ export function DiagnosisList({
         facilityId={facilityId}
         patientId={patientId}
         encounterId={encounterId}
+        className={className}
       >
         <CardContent className="px-2 pb-3 pt-2">
           <p className="text-gray-500">{t("no_diagnoses_recorded")}</p>
@@ -85,38 +85,39 @@ export function DiagnosisList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
-      <DiagnosisTable
-        diagnoses={[
-          ...filteredDiagnoses.filter(
-            (diagnosis) => diagnosis.verification_status !== "entered_in_error",
-          ),
-          ...(showEnteredInError
-            ? filteredDiagnoses.filter(
-                (diagnosis) =>
-                  diagnosis.verification_status === "entered_in_error",
-              )
-            : []),
-        ]}
-        isPrintPreview={isPrintPreview}
-      />
+      <>
+        <DiagnosisTable
+          diagnoses={[
+            ...filteredDiagnoses.filter(
+              (diagnosis) =>
+                diagnosis.verification_status !== "entered_in_error",
+            ),
+            ...(showEnteredInError
+              ? filteredDiagnoses.filter(
+                  (diagnosis) =>
+                    diagnosis.verification_status === "entered_in_error",
+                )
+              : []),
+          ]}
+        />
 
-      {hasEnteredInErrorRecords && !showEnteredInError && (
-        <>
-          <div className="border-b border-dashed border-gray-200 my-2" />
-          <div className="flex justify-center">
-            <Button
-              variant="ghost"
-              size="xs"
-              onClick={() => setShowEnteredInError(true)}
-              className="text-xs underline text-gray-950"
-            >
-              {t("view_all")}
-            </Button>
-          </div>
-        </>
-      )}
+        {hasEnteredInErrorRecords && !showEnteredInError && (
+          <>
+            <div className="border-b border-dashed border-gray-200 my-2" />
+            <div className="flex justify-center">
+              <Button
+                variant="ghost"
+                size="xs"
+                onClick={() => setShowEnteredInError(true)}
+                className="text-xs underline text-gray-950"
+              >
+                {t("view_all")}
+              </Button>
+            </div>
+          </>
+        )}
+      </>
     </DiagnosisListLayout>
   );
 }
@@ -127,22 +128,17 @@ const DiagnosisListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
-    <Card className={cn("border-none rounded-sm", className)}>
+    <Card className={cn("rounded-sm ", className)}>
       <CardHeader
-        className={cn(
-          "px-4 pt-4 pb-2 flex justify-between flex-row",
-          isPrintPreview && "px-0 py-2",
-        )}
+        className={cn("px-4 pt-4 pb-2 flex justify-between flex-row")}
       >
         <CardTitle>{t("diagnoses")}</CardTitle>
         {facilityId && encounterId && (
@@ -155,14 +151,7 @@ const DiagnosisListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          isPrintPreview && "px-0 py-0",
-          !isPrintPreview && "px-2 pb-2",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Patient/symptoms/SymptomTable.tsx b/src/components/Patient/symptoms/SymptomTable.tsx
index 407a3300749..e3b3ec76cbc 100644
--- a/src/components/Patient/symptoms/SymptomTable.tsx
+++ b/src/components/Patient/symptoms/SymptomTable.tsx
@@ -27,13 +27,9 @@ import {
 
 interface SymptomTableProps {
   symptoms: Symptom[];
-  isPrintPreview?: boolean;
 }
 
-export function SymptomTable({
-  symptoms,
-  isPrintPreview = false,
-}: SymptomTableProps) {
+export function SymptomTable({ symptoms }: SymptomTableProps) {
   return (
     <Table className="border-separate border-spacing-y-0.5">
       <TableHeader>
@@ -118,26 +114,22 @@ export function SymptomTable({
             <TableCell className="max-w-[200px]">
               {symptom.note ? (
                 <div className="flex items-center gap-2">
-                  {isPrintPreview ? (
-                    <span className="text-gray-950">{symptom.note}</span>
-                  ) : (
-                    <Popover>
-                      <PopoverTrigger asChild>
-                        <Button
-                          variant="outline"
-                          size="sm"
-                          className="h-7 text-xs shrink-0"
-                        >
-                          {t("see_note")}
-                        </Button>
-                      </PopoverTrigger>
-                      <PopoverContent className="w-80 p-4">
-                        <p className="text-sm text-gray-700 whitespace-pre-wrap">
-                          {symptom.note}
-                        </p>
-                      </PopoverContent>
-                    </Popover>
-                  )}
+                  <Popover>
+                    <PopoverTrigger asChild>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        className="h-7 text-xs shrink-0"
+                      >
+                        {t("see_note")}
+                      </Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-80 p-4">
+                      <p className="text-sm text-gray-700 whitespace-pre-wrap">
+                        {symptom.note}
+                      </p>
+                    </PopoverContent>
+                  </Popover>
                 </div>
               ) : (
                 "-"
@@ -150,6 +142,7 @@ export function SymptomTable({
                   className="w-4 h-4"
                   imageUrl={symptom.created_by.profile_picture_url}
                 />
+
                 <span className="text-sm">{symptom.created_by.username}</span>
               </div>
             </TableCell>
diff --git a/src/components/Patient/symptoms/list.tsx b/src/components/Patient/symptoms/list.tsx
index 0f4b558d6a9..891154584f1 100644
--- a/src/components/Patient/symptoms/list.tsx
+++ b/src/components/Patient/symptoms/list.tsx
@@ -21,7 +21,6 @@ interface SymptomsListProps {
   encounterId?: string;
   facilityId?: string;
   className?: string;
-  isPrintPreview?: boolean;
 }
 
 export function SymptomsList({
@@ -29,9 +28,8 @@ export function SymptomsList({
   encounterId,
   facilityId,
   className,
-  isPrintPreview = false,
 }: SymptomsListProps) {
-  const [showEnteredInError, setShowEnteredInError] = useState(isPrintPreview);
+  const [showEnteredInError, setShowEnteredInError] = useState(false);
 
   const { data: symptoms, isLoading } = useQuery({
     queryKey: ["symptoms", patientId, encounterId],
@@ -84,7 +82,6 @@ export function SymptomsList({
       patientId={patientId}
       encounterId={encounterId}
       className={className}
-      isPrintPreview={isPrintPreview}
     >
       <SymptomTable
         symptoms={[
@@ -97,7 +94,6 @@ export function SymptomsList({
               )
             : []),
         ]}
-        isPrintPreview={isPrintPreview}
       />
 
       {hasEnteredInErrorRecords && !showEnteredInError && (
@@ -125,24 +121,16 @@ const SymptomListLayout = ({
   encounterId,
   children,
   className,
-  isPrintPreview = false,
 }: {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
   children: ReactNode;
   className?: string;
-  isPrintPreview?: boolean;
 }) => {
   return (
     <Card className={cn("border-none rounded-sm", className)}>
-      <CardHeader
-        className={cn(
-          "flex justify-between flex-row",
-          !isPrintPreview && "px-4 pt-4 pb-2",
-          isPrintPreview && "px-0 py-2",
-        )}
-      >
+      <CardHeader className="flex justify-between flex-row px-4 pt-4 pb-2">
         <CardTitle>{t("symptoms")}</CardTitle>
         {facilityId && encounterId && (
           <Link
@@ -154,14 +142,7 @@ const SymptomListLayout = ({
           </Link>
         )}
       </CardHeader>
-      <CardContent
-        className={cn(
-          isPrintPreview && "px-0 py-0",
-          !isPrintPreview && "px-2 pb-2",
-        )}
-      >
-        {children}
-      </CardContent>
+      <CardContent className="px-2 pb-2">{children}</CardContent>
     </Card>
   );
 };
diff --git a/src/components/Resource/ResourceForm.tsx b/src/components/Resource/ResourceForm.tsx
index bc4981b2ab9..fa443f489e0 100644
--- a/src/components/Resource/ResourceForm.tsx
+++ b/src/components/Resource/ResourceForm.tsx
@@ -202,7 +202,7 @@ export default function ResourceForm({ facilityId, id }: ResourceProps) {
   }));
 
   const handleUserChange = (user: UserBase) => {
-    form.setValue("assigned_to", user.id);
+    form.setValue("assigned_to", user.id, { shouldDirty: true });
     setAssignedToUser(user);
   };
 
@@ -210,9 +210,14 @@ export default function ResourceForm({ facilityId, id }: ResourceProps) {
     form.setValue(
       "referring_facility_contact_name",
       `${authUser.first_name} ${authUser.last_name}`.trim(),
+      { shouldDirty: true },
     );
     if (authUser.phone_number) {
-      form.setValue("referring_facility_contact_number", authUser.phone_number);
+      form.setValue(
+        "referring_facility_contact_number",
+        authUser.phone_number,
+        { shouldDirty: true },
+      );
     }
   };
 
@@ -292,7 +297,9 @@ export default function ResourceForm({ facilityId, id }: ResourceProps) {
                                   facilities?.results.find(
                                     (f) => f.id === value,
                                   ) ?? null;
-                                form.setValue("assigned_facility", facility);
+                                form.setValue("assigned_facility", facility, {
+                                  shouldDirty: true,
+                                });
                               }}
                             />
                           </FormControl>
@@ -551,7 +558,15 @@ export default function ResourceForm({ facilityId, id }: ResourceProps) {
                   >
                     {t("cancel")}
                   </Button>
-                  <Button type="submit" variant="default" disabled={isPending}>
+                  <Button
+                    type="submit"
+                    variant="primary"
+                    disabled={
+                      id
+                        ? isUpdatePending || !form.formState.isDirty
+                        : isPending
+                    }
+                  >
                     {isPending && (
                       <CareIcon
                         icon="l-spinner"
diff --git a/src/components/ui/sidebar/facility-switcher.tsx b/src/components/ui/sidebar/facility-switcher.tsx
index 8cbb974d1ec..51bc2c72b9a 100644
--- a/src/components/ui/sidebar/facility-switcher.tsx
+++ b/src/components/ui/sidebar/facility-switcher.tsx
@@ -40,6 +40,7 @@ export function FacilitySwitcher({
             <SidebarMenuButton
               size="lg"
               className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground hover:bg-white"
+              tooltip={selectedFacility?.name}
             >
               <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-primary text-sidebar-primary-foreground">
                 <Hospital className="size-4" />
diff --git a/src/components/ui/sidebar/organization-switcher.tsx b/src/components/ui/sidebar/organization-switcher.tsx
index ff766f12b21..7bbf1ff8e53 100644
--- a/src/components/ui/sidebar/organization-switcher.tsx
+++ b/src/components/ui/sidebar/organization-switcher.tsx
@@ -42,6 +42,11 @@ export function OrganizationSwitcher({
             <SidebarMenuButton
               size="lg"
               className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground hover:bg-white"
+              tooltip={
+                selectedOrganization
+                  ? t("my_organizations")
+                  : t("select_organization")
+              }
             >
               <div className="flex aspect-square size-8 items-center justify-center rounded-lg bg-primary text-sidebar-primary-foreground">
                 <Globe className="size-4" />
diff --git a/src/components/ui/sidebar/patient-switcher.tsx b/src/components/ui/sidebar/patient-switcher.tsx
index 97810946b03..ce7f393b2da 100644
--- a/src/components/ui/sidebar/patient-switcher.tsx
+++ b/src/components/ui/sidebar/patient-switcher.tsx
@@ -10,6 +10,11 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { useSidebar } from "@/components/ui/sidebar";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 
 import { Avatar } from "@/components/Common/Avatar";
 
@@ -48,43 +53,56 @@ export function PatientSwitcher({ className }: PatientSwitcherProps) {
           }
         }}
       >
-        <SelectTrigger>
-          <SelectValue
-            asChild
-            placeholder={
-              patientUserContext.patients?.length === 0
-                ? t("no_patients")
-                : t("select_patient")
-            }
-          >
-            <>
-              {open && (
-                <div className="flex flex-row justify-between items-center gap-2 w-full text-primary-800">
-                  <Avatar
-                    name={patientUserContext.selectedPatient?.name || "User"}
-                    className="h-5 w-5"
-                  />
-                  <div className="flex flex-row items-center justify-between w-full gap-2">
-                    <span className="font-semibold truncate max-w-32">
-                      {patientUserContext.selectedPatient?.name}
-                    </span>
-                    <span className="text-xs text-secondary-600">
-                      {t("switch")}
-                    </span>
-                  </div>
-                </div>
-              )}
-              {!open && (
-                <div className="flex flex-row items-center -ml-1.5">
-                  <Avatar
-                    name={patientUserContext.selectedPatient?.name || "User"}
-                    className="h-4 w-4"
-                  />
-                </div>
-              )}
-            </>
-          </SelectValue>
-        </SelectTrigger>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <SelectTrigger>
+              <SelectValue
+                asChild
+                placeholder={
+                  patientUserContext.patients?.length === 0
+                    ? t("no_patients")
+                    : t("select_patient")
+                }
+              >
+                <>
+                  {open && (
+                    <div className="flex flex-row justify-between items-center gap-2 w-full text-primary-800">
+                      <Avatar
+                        name={
+                          patientUserContext.selectedPatient?.name || "User"
+                        }
+                        className="h-5 w-5"
+                      />
+                      <div className="flex flex-row items-center justify-between w-full gap-2">
+                        <span className="font-semibold truncate max-w-32">
+                          {patientUserContext.selectedPatient?.name}
+                        </span>
+                        <span className="text-xs text-secondary-600">
+                          {t("switch")}
+                        </span>
+                      </div>
+                    </div>
+                  )}
+                  {!open && (
+                    <div className="flex flex-row items-center -ml-1.5">
+                      <Avatar
+                        name={
+                          patientUserContext.selectedPatient?.name || "User"
+                        }
+                        className="h-4 w-4"
+                      />
+                    </div>
+                  )}
+                </>
+              </SelectValue>
+            </SelectTrigger>
+          </TooltipTrigger>
+          {!open && (
+            <TooltipContent side="right" align="center">
+              <p>{patientUserContext.selectedPatient?.name}</p>
+            </TooltipContent>
+          )}
+        </Tooltip>
         <SelectContent>
           {patientUserContext.patients?.map((patient) => (
             <SelectItem key={patient.id} value={patient.id}>
diff --git a/src/pages/Facility/FacilityDetailsPage.tsx b/src/pages/Facility/FacilityDetailsPage.tsx
index 228d203f61f..b1c5f8497f4 100644
--- a/src/pages/Facility/FacilityDetailsPage.tsx
+++ b/src/pages/Facility/FacilityDetailsPage.tsx
@@ -10,6 +10,7 @@ import { Markdown } from "@/components/ui/markdown";
 
 import { Avatar } from "@/components/Common/Avatar";
 import { LoginHeader } from "@/components/Common/LoginHeader";
+import { FacilityMapsLink } from "@/components/Facility/FacilityMapLink";
 import { FacilityModel } from "@/components/Facility/models";
 import { UserAssignedModel } from "@/components/Users/models";
 
@@ -115,6 +116,12 @@ export function FacilityDetailsPage({ id }: Props) {
               <h1 className="text-3xl font-bold">{facility.name}</h1>
               <p className="text-lg text-gray-500">
                 {[facility.address].filter(Boolean).join(", ")}
+                {facility.latitude && facility.longitude && (
+                  <FacilityMapsLink
+                    latitude={facility.latitude.toString()}
+                    longitude={facility.longitude.toString()}
+                  />
+                )}
               </p>
             </div>
 
diff --git a/src/pages/Facility/components/FacilityCard.tsx b/src/pages/Facility/components/FacilityCard.tsx
index 2ba7c030ad7..227b9ca892c 100644
--- a/src/pages/Facility/components/FacilityCard.tsx
+++ b/src/pages/Facility/components/FacilityCard.tsx
@@ -6,6 +6,7 @@ import { Button } from "@/components/ui/button";
 import { Card } from "@/components/ui/card";
 
 import { Avatar } from "@/components/Common/Avatar";
+import { FacilityMapsLink } from "@/components/Facility/FacilityMapLink";
 
 import { FeatureBadge } from "@/pages/Facility/Utils";
 import { FacilityData } from "@/types/facility/facility";
@@ -36,6 +37,12 @@ export function FacilityCard({ facility, className }: Props) {
               {facility.facility_type?.name}
               <p className="text-sm text-gray-500 truncate">
                 {[facility.address].filter(Boolean).join(", ")}
+                {facility.latitude && facility.longitude && (
+                  <FacilityMapsLink
+                    latitude={facility.latitude.toString()}
+                    longitude={facility.longitude.toString()}
+                  />
+                )}
               </p>
 
               <div className="mt-2 flex flex-wrap gap-2">
diff --git a/src/pages/Facility/settings/locations/LocationForm.tsx b/src/pages/Facility/settings/locations/LocationForm.tsx
index 5232ca5053f..be54c81955c 100644
--- a/src/pages/Facility/settings/locations/LocationForm.tsx
+++ b/src/pages/Facility/settings/locations/LocationForm.tsx
@@ -275,7 +275,12 @@ export default function LocationForm({
           />
         </div>
 
-        <Button type="submit" disabled={isPending}>
+        <Button
+          type="submit"
+          disabled={Boolean(
+            isPending || (location?.id && !form.formState.isDirty),
+          )}
+        >
           {isPending ? (
             <>{location?.id ? t("updating") : t("creating")}</>
           ) : (
diff --git a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
index d98b82c6e09..b1d7b2f25a6 100644
--- a/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
+++ b/src/pages/Scheduling/components/EditScheduleTemplateSheet.tsx
@@ -319,7 +319,7 @@ const ScheduleTemplateEditor = ({
             <Button
               variant="primary"
               type="submit"
-              disabled={isUpdating}
+              disabled={isUpdating || !form.formState.isDirty}
               size="sm"
             >
               <SaveIcon />
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 5e2066155a8..e6fdceb00b6 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -33,6 +33,7 @@ interface ImportMetaEnv {
   readonly REACT_ENABLE_ABDM?: string;
   readonly REACT_ENABLE_SCRIBE?: string;
   readonly REACT_DEFAULT_COUNTRY?: string;
+  readonly REACT_MAPS_FALLBACK_URL_TEMPLATE?: string;
 }
 
 interface ImportMeta {