diff --git a/src/components/Common/Charts/ObservationChart.tsx b/src/components/Common/Charts/ObservationChart.tsx
index 9d1abfd9cc5..f79d529abb4 100644
--- a/src/components/Common/Charts/ObservationChart.tsx
+++ b/src/components/Common/Charts/ObservationChart.tsx
@@ -51,6 +51,7 @@ interface ObservationVisualizerProps {
   codeGroups: CodeGroup[];
   height?: number;
   gridCols?: number;
+  encounterId: string;
 }
 
 interface ChartData {
@@ -98,6 +99,7 @@ const formatChartDate = (
 export const ObservationVisualizer = ({
   patientId,
   codeGroups,
+  encounterId,
   height = 300,
   gridCols = 2,
 }: ObservationVisualizerProps) => {
@@ -108,10 +110,14 @@ export const ObservationVisualizer = ({
     queryKey: [
       "observations",
       patientId,
+      encounterId,
       allCodes.map((c) => c.code).join(","),
     ],
     queryFn: query(routes.observationsAnalyse, {
       pathParams: { patientId },
+      queryParams: {
+        encounter: encounterId,
+      },
       body: {
         codes: allCodes,
       },
@@ -380,6 +386,7 @@ export const ObservationVisualizer = ({
             <TabsContent value="history">
               <ObservationHistoryTable
                 patientId={patientId}
+                encounterId={encounterId}
                 codes={group.codes}
               />
             </TabsContent>
diff --git a/src/components/Common/Charts/ObservationHistoryTable.tsx b/src/components/Common/Charts/ObservationHistoryTable.tsx
index e698309de4c..9e3940bff17 100644
--- a/src/components/Common/Charts/ObservationHistoryTable.tsx
+++ b/src/components/Common/Charts/ObservationHistoryTable.tsx
@@ -28,6 +28,7 @@ interface PaginatedResponse<T> {
 
 interface ObservationHistoryTableProps {
   patientId: string;
+  encounterId: string;
   codes: Code[];
 }
 
@@ -45,6 +46,7 @@ const formatDate = (dateString: string) => {
 
 export const ObservationHistoryTable = ({
   patientId,
+  encounterId,
   codes,
 }: ObservationHistoryTableProps) => {
   const { ref, inView } = useInView();
@@ -57,6 +59,7 @@ export const ObservationHistoryTable = ({
       const response = await query(routes.listObservations, {
         pathParams: { patientId },
         queryParams: {
+          encounter: encounterId,
           limit: String(LIMIT),
           codes: codes.map((c) => c.code).join(","),
           offset: String(pageParam),
diff --git a/src/components/Facility/ConsultationDetails/ObservationsList.tsx b/src/components/Facility/ConsultationDetails/ObservationsList.tsx
index 9a98c2a73fa..a71c2a0fbfa 100644
--- a/src/components/Facility/ConsultationDetails/ObservationsList.tsx
+++ b/src/components/Facility/ConsultationDetails/ObservationsList.tsx
@@ -1,15 +1,22 @@
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { useInView } from "react-intersection-observer";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
-import PaginatedList from "@/CAREUI/misc/PaginatedList";
 
 import { Card } from "@/components/ui/card";
 
 import routes from "@/Utils/request/api";
+import query from "@/Utils/request/query";
+import { HTTPError } from "@/Utils/request/types";
+import { PaginatedResponse } from "@/Utils/request/types";
 import { formatDateTime } from "@/Utils/utils";
 import { Encounter } from "@/types/emr/encounter";
 import { Observation } from "@/types/emr/observation";
 
+const LIMIT = 20;
+
 interface Props {
   encounter: Encounter;
 }
@@ -18,63 +25,96 @@ export default function ObservationsList(props: Props) {
   const { t } = useTranslation();
   const patientId = props.encounter.patient.id;
   const encounterId = props.encounter.id;
+  const { ref, inView } = useInView();
+
+  const { data, fetchNextPage, hasNextPage, isLoading, isFetchingNextPage } =
+    useInfiniteQuery<PaginatedResponse<Observation>, HTTPError>({
+      queryKey: ["observations", patientId, encounterId],
+      queryFn: async ({ pageParam = 0 }) => {
+        const response = await query(routes.listObservations, {
+          pathParams: { patientId },
+          queryParams: {
+            encounter: encounterId,
+            ignore_group: true,
+            limit: String(LIMIT),
+            offset: String(pageParam),
+          },
+        })({ signal: new AbortController().signal });
+        return response as PaginatedResponse<Observation>;
+      },
+      initialPageParam: 0,
+      getNextPageParam: (lastPage, allPages) => {
+        const currentOffset = allPages.length * LIMIT;
+        return currentOffset < lastPage.count ? currentOffset : null;
+      },
+    });
+
+  useEffect(() => {
+    if (inView && hasNextPage && !isFetchingNextPage) {
+      fetchNextPage();
+    }
+  }, [inView, hasNextPage, isFetchingNextPage, fetchNextPage]);
+
+  if (isLoading) {
+    return (
+      <Card className="p-6">
+        <div className="text-lg font-medium text-muted-foreground">
+          {t("loading")}
+        </div>
+      </Card>
+    );
+  }
+
+  const observations = data?.pages.flatMap((page) => page.results) ?? [];
+
+  if (observations.length === 0) {
+    return (
+      <Card className="p-6">
+        <div className="text-lg font-medium text-muted-foreground">
+          {t("no_observations")}
+        </div>
+      </Card>
+    );
+  }
 
   return (
-    <PaginatedList
-      route={routes.listObservations}
-      pathParams={{ patientId }}
-      query={{ encounter: encounterId, ignore_group: true }}
-    >
-      {() => (
-        <div className="mt-4 flex w-full flex-col gap-4">
-          <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
-            <PaginatedList.WhenEmpty>
-              <Card className="p-6">
-                <div className="text-lg font-medium text-muted-foreground">
-                  {t("no_observations")}
+    <div className="mt-4 flex w-full flex-col gap-4">
+      <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
+        {observations.map((item: Observation) => (
+          <Card key={item.id} className="flex items-center justify-between p-4">
+            <div>
+              <div className="text-xs flex items-center gap-1 text-muted-foreground">
+                <CareIcon icon="l-calender" />
+                <span>{formatDateTime(item.effective_datetime)}</span>
+              </div>
+              <div className="font-medium">
+                {item.main_code.display || item.main_code.code}
+              </div>
+              {item.value.value_quantity && (
+                <div className="mt-1 font-medium">
+                  {item.value.value_quantity.value}{" "}
+                  {item.value.value_quantity.code.display}
                 </div>
-              </Card>
-            </PaginatedList.WhenEmpty>
-
-            <PaginatedList.Items<Observation> className="grid gap-4">
-              {(item) => (
-                <Card
-                  key={item.id}
-                  className="flex items-center justify-between p-4"
-                >
-                  <div>
-                    <div className="text-xs flex items-center gap-1 text-muted-foreground">
-                      <CareIcon icon="l-calender" />
-                      <span>{formatDateTime(item.effective_datetime)}</span>
-                    </div>
-                    <div className="font-medium">
-                      {item.main_code.display || item.main_code.code}
-                    </div>
-                    {item.value.value_quantity && (
-                      <div className="mt-1 font-medium">
-                        {item.value.value_quantity.value}{" "}
-                        {item.value.value_quantity.code.display}
-                      </div>
-                    )}
-                    {item.value.value && (
-                      <div className="mt-1 font-medium">{item.value.value}</div>
-                    )}
-                    {item.note && (
-                      <div className="mt-1 text-sm text-muted-foreground">
-                        {item.note}
-                      </div>
-                    )}
-                  </div>
-                </Card>
               )}
-            </PaginatedList.Items>
-
-            <div className="flex w-full items-center justify-center">
-              <PaginatedList.Paginator hideIfSinglePage />
+              {item.value.value && (
+                <div className="mt-1 font-medium">{item.value.value}</div>
+              )}
+              {item.note && (
+                <div className="mt-1 text-sm text-muted-foreground">
+                  {item.note}
+                </div>
+              )}
+            </div>
+          </Card>
+        ))}
+        {hasNextPage && (
+          <div ref={ref} className="flex justify-center p-4">
+            <div className="text-sm text-muted-foreground">
+              {isFetchingNextPage ? t("loading_more") : t("load_more")}
             </div>
           </div>
-        </div>
-      )}
-    </PaginatedList>
+        )}
+      </div>
+    </div>
   );
 }
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
index b82b37aaca5..11f9ea4529b 100644
--- a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
+++ b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -149,7 +149,9 @@ export default function QuestionnaireResponsesList({ encounter }: Props) {
       route={routes.getQuestionnaireResponses}
       pathParams={{
         patientId: encounter.patient.id,
-        encounterId: encounter.id,
+      }}
+      query={{
+        encounter: encounter.id,
       }}
     >
       {() => (
@@ -264,6 +266,7 @@ export default function QuestionnaireResponsesList({ encounter }: Props) {
                                 type={type}
                                 id={response.id}
                                 patientId={encounter.patient.id}
+                                encounterId={encounter.id}
                               />
                             );
                           },
diff --git a/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx b/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx
index ba4e3ba2e98..9d6b06ae2b8 100644
--- a/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx
+++ b/src/components/Facility/ConsultationDetails/StructuredResponseView.tsx
@@ -16,9 +16,15 @@ interface Props {
   type: string;
   id: string;
   patientId: string;
+  encounterId: string;
 }
 
-export function StructuredResponseView({ type, id, patientId }: Props) {
+export function StructuredResponseView({
+  type,
+  id,
+  patientId,
+  encounterId,
+}: Props) {
   const getRouteAndParams = () => {
     const params: Record<string, string> = { patientId };
     switch (type) {
@@ -26,19 +32,20 @@ export function StructuredResponseView({ type, id, patientId }: Props) {
         return {
           route: symptomApi.retrieveSymptom,
           pathParams: { ...params, symptomId: id },
+          queryParams: { encounter: encounterId },
         };
       case "diagnosis":
         return {
           route: diagnosisApi.retrieveDiagnosis,
           pathParams: { ...params, diagnosisId: id },
+          queryParams: { encounter: encounterId },
         };
       case "allergy_intolerance":
         return {
           route: allergyApi.retrieveAllergy,
           pathParams: { ...params, allergyId: id },
+          queryParams: { encounter: encounterId },
         };
-      default:
-        return null;
     }
   };
 
@@ -47,7 +54,8 @@ export function StructuredResponseView({ type, id, patientId }: Props) {
   const { data, isLoading, error } = useQuery({
     queryKey: [type, id],
     queryFn: query(routeConfig?.route as any, {
-      pathParams: routeConfig?.pathParams || { patientId },
+      pathParams: routeConfig?.pathParams,
+      queryParams: routeConfig?.queryParams,
     }),
     enabled: !!id && !!routeConfig,
   });
diff --git a/src/pages/Encounters/tabs/EncounterPlotsTab.tsx b/src/pages/Encounters/tabs/EncounterPlotsTab.tsx
index c0857b2d000..cc9c6d57689 100644
--- a/src/pages/Encounters/tabs/EncounterPlotsTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterPlotsTab.tsx
@@ -55,6 +55,7 @@ export const EncounterPlotsTab = (props: EncounterTabProps) => {
           <TabsContent key={tab.id} value={tab.id}>
             <ObservationVisualizer
               patientId={props.patient.id}
+              encounterId={props.encounter.id}
               codeGroups={tab.groups}
               gridCols={2}
             />
diff --git a/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx b/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
index f8eab9f6743..fb49046d1cb 100644
--- a/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
+++ b/src/pages/Encounters/tabs/EncounterUpdatesTab.tsx
@@ -5,372 +5,35 @@ import { SymptomsList } from "@/components/Patient/symptoms/list";
 
 import { EncounterTabProps } from "@/pages/Encounters/EncounterShow";
 
-export const EncounterUpdatesTab = (props: EncounterTabProps) => {
+export const EncounterUpdatesTab = ({
+  encounter,
+  patient,
+}: EncounterTabProps) => {
   return (
-    <div className="flex flex-col gap-2">
-      <div className="flex flex-col xl:flex-row w-full">
-        <div className="mt-4 grid gap-4 lg:grid-cols-2 w-full">
-          <div className="md:col-span-2">
-            <SymptomsList
-              patientId={props.patient.id}
-              encounterId={props.encounter.id}
-            />
+    <div className="flex flex-col gap-4">
+      {/* Main Content Area */}
+      <div className="flex flex-col xl:flex-row gap-4">
+        {/* Left Column - Symptoms, Diagnoses, and Questionnaire Responses */}
+        <div className="flex-1 space-y-4">
+          {/* Symptoms Section */}
+          <div>
+            <SymptomsList patientId={patient.id} encounterId={encounter.id} />
           </div>
-          <div className="md:col-span-2">
-            <DiagnosisList
-              patientId={props.patient.id}
-              encounterId={props.encounter.id}
-            />
-          </div>
-          <div className="md:col-span-2">
-            <QuestionnaireResponsesList encounter={props.encounter} />
-          </div>
-        </div>
-        {/* <div className="w-full xl:w-2/3" id="basic-information">
-          <PageTitle
-            title="Basic Information"
-            hideBack={true}
-            breadcrumbs={false}
-          />
-
-
-
-            {props.consultationData.history_of_present_illness && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6" id="history-presentillness">
-                  <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                    History of Present Illness
-                  </h3>
-                  <div className="mt-2">
-                    <ReadMore
-                      text={props.consultationData.history_of_present_illness}
-                      minChars={250}
-                    />
-                  </div>
-                </div>
-              </div>
-            )}
-
-            {props.consultationData.examination_details && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6" id="examination-details">
-                  <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                    Examination details and Clinical conditions:{" "}
-                  </h3>
-                  <div className="mt-2">
-                    <ReadMore
-                      text={props.consultationData.examination_details}
-                      minChars={250}
-                    />
-                  </div>
-                </div>
-              </div>
-            )}
-            {props.consultationData.treatment_plan && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6" id="treatment-summary">
-                  <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                    Treatment Summary
-                  </h3>
-                  <div className="mt-2">
-                    <ReadMore
-                      text={props.consultationData.treatment_plan}
-                      minChars={250}
-                    />
-                  </div>
-                </div>
-              </div>
-            )}
-            {props.consultationData.consultation_notes && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6" id="general-instructions">
-                  <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                    General Instructions
-                  </h3>
-                  <div className="mt-2">
-                    <ReadMore
-                      text={props.consultationData.consultation_notes}
-                      minChars={250}
-                    />
-                  </div>
-                </div>
-              </div>
-            )}
 
-            {(props.consultationData.operation ??
-              props.consultationData.special_instruction) && (
-              <div className="overflow-hidden rounded-lg bg-white shadow">
-                <div className="px-4 py-5 sm:p-6" id="consultation-notes">
-                  <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                    Notes
-                  </h3>
-                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                    {props.consultationData.operation && (
-                      <div className="mt-4">
-                        <h5>Operation</h5>
-                        <ReadMore
-                          text={props.consultationData.operation}
-                          minChars={250}
-                        />
-                      </div>
-                    )}
-
-                    {props.consultationData.special_instruction && (
-                      <div className="mt-4">
-                        <h5>Special Instruction</h5>
-                        <ReadMore
-                          text={props.consultationData.special_instruction}
-                          minChars={250}
-                        />
-                      </div>
-                    )}
-                  </div>
-                </div>
-              </div>
-            )}
+          {/* Diagnoses Section */}
+          <div>
+            <DiagnosisList patientId={patient.id} encounterId={encounter.id} />
           </div>
-          {props.consultationData.procedure &&
-            props.consultationData.procedure.length > 0 && (
-              <div className="my-4 rounded-lg bg-white p-4 shadow">
-                <div className="overflow-x-auto" id="consultation-procedure">
-                  <table className="min-w-full divide-y divide-secondary-200">
-                    <thead>
-                      <tr>
-                        <th className="bg-secondary-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-secondary-600">
-                          Procedure
-                        </th>
-                        <th className="bg-secondary-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-secondary-600">
-                          Notes
-                        </th>
-                        <th className="bg-secondary-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-secondary-600">
-                          Repetitive
-                        </th>
-                        <th className="bg-secondary-100 px-4 py-3 text-left text-sm font-medium uppercase tracking-wider text-secondary-600">
-                          Time / Frequency
-                        </th>
-                      </tr>
-                    </thead>
-                    <tbody className="divide-y divide-secondary-200 bg-white">
-                      {props.consultationData.procedure?.map(
-                        (procedure, index) => (
-                          <tr key={index}>
-                            <td className="overflow-hidden whitespace-nowrap p-4">
-                              {procedure.procedure}
-                            </td>
-                            <td className="overflow-hidden whitespace-normal p-4">
-                              {procedure.notes}
-                            </td>
-                            <td className="overflow-hidden whitespace-normal p-4">
-                              {procedure.repetitive ? "Yes" : "No"}
-                            </td>
-                            <td className="whitespace-nowrap p-4">
-                              {procedure.repetitive
-                                ? procedure.frequency
-                                : formatDateTime(String(procedure.time))}
-                            </td>
-                          </tr>
-                        ),
-                      )}
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            )}
-          {props.consultationData.intubation_start_date && (
-            <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
-              <div className="px-4 py-5 sm:p-6">
-                <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                  Date/Size/LL:{" "}
-                </h3>
-                <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
-                  <div className="">
-                    Intubation Date{" - "}
-                    <span className="font-semibold">
-                      {formatDateTime(
-                        props.consultationData.intubation_start_date,
-                      )}
-                    </span>
-                  </div>
-                  <div className="">
-                    Extubation Date{" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.intubation_end_date &&
-                        formatDateTime(
-                          props.consultationData.intubation_end_date,
-                        )}
-                    </span>
-                  </div>
-                  <div className="">
-                    ETT/TT (mmid){" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.ett_tt}
-                    </span>
-                  </div>
-                  <div className="">
-                    Cuff Pressure (mmhg){" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.cuff_pressure}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          )}
-
-          {props.consultationData.lines?.length > 0 && (
-            <div className="mt-4 overflow-hidden rounded-lg bg-white shadow">
-              <div className="px-4 py-5 sm:p-6">
-                <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                  Lines and Catheters
-                </h3>
-                <div className="mt-2 grid grid-cols-1 gap-4 md:grid-cols-2">
-                  {props.consultationData.lines?.map(
-                    (line: any, idx: number) => (
-                      <div key={idx} className="mt-4">
-                        <h5>{line.type}</h5>
-                        <p className="break-word text-justify">
-                          Details:
-                          <br />
-                          <span>{line.other_type}</span>
-                        </p>
-                        <p>
-                          Insertion Date:{" "}
-                          <span className="font-semibold">
-                            {formatDateTime(line.start_date)}
-                          </span>
-                        </p>
-                        <p>
-                          Site/Level of Fixation: <br />
-                          <span className="break-word text-justify">
-                            {line.site}
-                          </span>
-                        </p>
-                      </div>
-                    ),
-                  )}
-                </div>
-              </div>
-            </div>
-          )}
-          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-            <div className="col-span-1 mt-4 overflow-hidden rounded-lg bg-white shadow">
-              <div className="px-4 py-5 sm:p-6">
-                <h3 className="text-lg font-semibold leading-relaxed text-secondary-900">
-                  Body Details
-                </h3>
-                <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                  <div>
-                    Gender {" - "}
-                    <span className="font-semibold">
-                      {props.patientData.gender ?? "-"}
-                    </span>
-                  </div>
-                  <div>
-                    Age {" - "}
-                    <span className="font-semibold">
-                      {formatPatientAge(props.patientData)}
-                    </span>
-                  </div>
-                  <div id="patient-weight">
-                    Weight {" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.weight
-                        ? `${props.consultationData.weight} kg`
-                        : "Unspecified"}
-                    </span>
-                  </div>
-                  <div id="patient-height">
-                    Height {" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.height
-                        ? `${props.consultationData.height} cm`
-                        : "Unspecified"}
-                    </span>
-                  </div>
-                  <div>
-                    Body Surface Area {" - "}
-                    <span className="font-semibold">
-                      {props.consultationData.weight &&
-                      props.consultationData.height ? (
-                        <>
-                          {Math.sqrt(
-                            (Number(props.consultationData.weight) *
-                              Number(props.consultationData.height)) /
-                              3600,
-                          ).toFixed(2)}
-                          m<sup>2</sup>
-                        </>
-                      ) : (
-                        "Unspecified"
-                      )}
-                    </span>
-                  </div>
-                  <div>
-                    Blood Group {" - "}
-                    <span className="font-semibold">
-                      {props.patientData.blood_group ?? "-"}
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </div>
-            {((props.patientData.is_antenatal &&
-              isAntenatal(props.patientData.last_menstruation_start_date)) ||
-              isPostPartum(props.patientData.date_of_delivery)) && (
-              <div className="mt-4 rounded-lg bg-white px-4 py-5 shadow sm:p-6">
-                <h3 className="mb-4 text-lg font-semibold leading-relaxed text-secondary-900">
-                  Perinatal Status
-                </h3>
-
-                <div className="flex gap-2 pb-2">
-                  {props.patientData.is_antenatal &&
-                    isAntenatal(
-                      props.patientData.last_menstruation_start_date,
-                    ) && (
-                      <Chip
-                        variant="custom"
-                        className="border-pink-300 bg-pink-100 text-pink-600"
-                        startIcon="l-baby-carriage"
-                        text="Antenatal"
-                      />
-                    )}
-                  {isPostPartum(props.patientData.date_of_delivery) && (
-                    <Chip
-                      variant="custom"
-                      className="border-pink-300 bg-pink-100 text-pink-600"
-                      startIcon="l-baby-carriage"
-                      text="Post-partum"
-                    />
-                  )}
-                </div>
 
-                {props.patientData.last_menstruation_start_date && (
-                  <p className="space-x-2 p-2 text-sm">
-                    <CareIcon className="text-base" icon="l-calendar-alt" />
-                    <span>Last Menstruation:</span>
-                    <span className="font-semibold">
-                      {formatDate(
-                        props.patientData.last_menstruation_start_date,
-                      )}
-                    </span>
-                  </p>
-                )}
-
-                {props.patientData.date_of_delivery && (
-                  <p className="space-x-2 p-2 text-sm">
-                    <CareIcon className="text-base" icon="l-calendar-alt" />
-                    <span>Date of Delivery:</span>
-                    <span className="font-semibold">
-                      {formatDate(props.patientData.date_of_delivery)}
-                    </span>
-                  </p>
-                )}
-              </div>
-            )}
+          {/* Questionnaire Responses Section */}
+          <div>
+            <QuestionnaireResponsesList encounter={encounter} />
           </div>
-        </div> */}
-        <div className="w-full pl-0 md:pl-4 xl:w-1/3">
-          <ObservationsList encounter={props.encounter} />
+        </div>
+
+        {/* Right Column - Observations */}
+        <div className="xl:w-1/3">
+          <ObservationsList encounter={encounter} />
         </div>
       </div>
     </div>