diff --git a/src/Components/Facility/Investigations/InvestigationTable.tsx b/src/Components/Facility/Investigations/InvestigationTable.tsx
index 18c64108b6f..84198eea50c 100644
--- a/src/Components/Facility/Investigations/InvestigationTable.tsx
+++ b/src/Components/Facility/Investigations/InvestigationTable.tsx
@@ -5,8 +5,10 @@ import TextFormField from "../../Form/FormFields/TextFormField";
 import { classNames } from "../../../Utils/utils";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { navigate } from "raviger";
 
 const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => {
+  const { t } = useTranslation();
   return (
     <tr
       className={classNames(
@@ -15,10 +17,24 @@ const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => {
       )}
       x-description="Even row"
     >
-      <td className="whitespace-nowrap px-6 py-4 text-sm font-medium text-secondary-900">
-        {data?.investigation_object?.name || "---"}
+      <td className="whitespace-nowrap px-6 py-4 text-xs">
+        <p className="text-sm font-medium text-secondary-900">
+          {data?.investigation_object.name || "---"}
+        </p>
+        <p className="flex flex-row gap-x-2">
+          <span>
+            {t("investigations__range")}:{" "}
+            {data?.investigation_object.min_value || ""}
+            {data?.investigation_object.min_value ? " - " : ""}
+            {data?.investigation_object.max_value || ""}
+          </span>
+        </p>
+        <p className="text-secondary-600">
+          {t("investigations__unit")}:{" "}
+          {data?.investigation_object.unit || "---"}
+        </p>
       </td>
-      <td className="whitespace-nowrap px-6 py-4 text-sm text-secondary-700">
+      <td className="whitespace-nowrap px-3 py-4 text-center text-sm text-secondary-700 xl:px-6">
         {showForm ? (
           data?.investigation_object?.investigation_type === "Choice" ? (
             <SelectFormField
@@ -46,22 +62,44 @@ const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => {
           value || "---"
         )}
       </td>
-      <td className="whitespace-nowrap px-6 py-4 text-sm text-secondary-700">
-        {data.investigation_object.unit || "---"}
-      </td>
-      <td className="whitespace-nowrap px-6 py-4 text-sm text-secondary-700">
-        {data.investigation_object.min_value || "---"}
-      </td>
-      <td className="whitespace-nowrap px-6 py-4 text-sm text-secondary-700">
-        {data.investigation_object.max_value || "---"}
-      </td>
-      <td className="whitespace-nowrap px-6 py-4 text-sm text-secondary-700">
+      <td className="whitespace-nowrap px-6 py-4 text-center text-sm text-secondary-700">
         {data.investigation_object.ideal_value || "---"}
       </td>
     </tr>
   );
 };
 
+const HeadingRow = () => {
+  const { t } = useTranslation();
+  const commonClass =
+    "px-6 py-3 text-xs font-semibold uppercase tracking-wider text-secondary-800";
+  return (
+    <tr>
+      <th
+        key={t("investigations__name")}
+        scope="col"
+        className={`w-1/6 text-left md:w-1/6 ${commonClass}`}
+      >
+        {t("investigations__name")}
+      </th>
+      <th
+        key={t("investigations__result")}
+        scope="col"
+        className={`w-2/6 text-center md:w-1/6 ${commonClass}`}
+      >
+        {t("investigations__result")}
+      </th>
+      <th
+        key={t("investigations__ideal_value")}
+        scope="col"
+        className={`w-3/6 text-center md:w-4/6 ${commonClass}`}
+      >
+        {t("investigations__ideal_value")}
+      </th>
+    </tr>
+  );
+};
+
 export const InvestigationTable = ({
   title,
   data,
@@ -70,6 +108,10 @@ export const InvestigationTable = ({
   changedFields,
   handleUpdateCancel,
   handleSave,
+  facilityId,
+  patientId,
+  consultationId,
+  sessionId,
 }: any) => {
   const { t } = useTranslation();
   const [searchFilter, setSearchFilter] = useState("");
@@ -85,11 +127,9 @@ export const InvestigationTable = ({
 
   return (
     <div className="m-4 p-4">
-      <div className="mb flex flex-col items-center justify-between sm:flex-row">
-        {title && (
-          <div className="text-xl font-bold print:text-xs">{title}</div>
-        )}
-        <div className="flex flex-col py-2 sm:flex-row print:hidden">
+      <div className="mb flex flex-col items-center justify-between gap-x-3 sm:flex-row">
+        {title && <div className="text-xl font-bold">{title}</div>}
+        <div className="flex flex-col py-2 sm:flex-row">
           <ButtonV2
             disabled={isDischargedPatient}
             variant="primary"
@@ -105,83 +145,81 @@ export const InvestigationTable = ({
           {showForm && (
             <ButtonV2
               variant="primary"
-              onClick={() => handleSave()}
+              onClick={() => {
+                handleSave();
+                setShowForm((prev) => !prev);
+              }}
               className="my-2 mr-2"
             >
-              Save
+              {t("save")}
             </ButtonV2>
           )}
+          <ButtonV2
+            className="my-2 mr-2"
+            onClick={() =>
+              navigate(
+                `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${sessionId}/print`,
+              )
+            }
+          >
+            <CareIcon icon="l-print" className="text-lg" />
+            {t("print")}
+          </ButtonV2>
         </div>
       </div>
       <TextFormField
         name="test_search"
         label="Search Test"
-        className="mt-2 print:hidden"
+        className="mt-2"
         placeholder="Search test"
         value={searchFilter}
         onChange={(e) => setSearchFilter(e.value)}
       />
       <br />
-      <div className="print:w-full">
-        <div className="overflow-x-scroll border-b border-secondary-200 shadow sm:rounded-lg print:overflow-visible print:border-none print:shadow-none">
-          <table className="min-w-full divide-y divide-secondary-200 print:min-w-0 print:divide-none">
-            <thead className="bg-secondary-50 print:bg-white">
-              <tr>
-                {["Name", "Value", "Unit", "Min", "Max", "Ideal"].map(
-                  (heading) => (
-                    <th
-                      key={heading}
-                      scope="col"
-                      className="px-6 py-3 text-left text-xs font-semibold uppercase tracking-wider text-secondary-800 print:text-sm print:font-normal print:tracking-normal print:text-black"
-                    >
-                      {heading}
-                    </th>
-                  ),
-                )}
+      <div className="overflow-x-scroll border-b border-secondary-200 shadow sm:rounded-lg">
+        <table className="min-w-full divide-y divide-secondary-200">
+          <thead className="bg-secondary-50">
+            <HeadingRow />
+          </thead>
+          <tbody>
+            {filterTests.length > 0 ? (
+              filterTests.map((t: any, i) => {
+                const value =
+                  changedFields[t.id]?.notes ??
+                  changedFields[t.id]?.value ??
+                  null;
+                const isChanged = changedFields[t.id]?.initialValue !== value;
+                return (
+                  <TestRow
+                    data={t}
+                    key={t.id}
+                    i={i}
+                    showForm={showForm}
+                    value={value}
+                    isChanged={isChanged}
+                    onChange={(e: any) => {
+                      const { target, value } =
+                        t?.investigation_object?.investigation_type === "Float"
+                          ? {
+                              target: `${t.id}.value`,
+                              value: Number(e.value) || null,
+                            }
+                          : {
+                              target: `${t.id}.notes`,
+                              value: e.value,
+                            };
+                      handleValueChange(value, target);
+                    }}
+                  />
+                );
+              })
+            ) : (
+              <tr className="text-center text-secondary-500">
+                <td className="col-span-6">{t("no_tests_taken")}</td>
               </tr>
-            </thead>
-            <tbody className="print:divide-none">
-              {filterTests.length > 0 ? (
-                filterTests.map((t: any, i) => {
-                  const value =
-                    changedFields[t.id]?.notes ??
-                    changedFields[t.id]?.value ??
-                    null;
-                  const isChanged = changedFields[t.id]?.initialValue !== value;
-                  return (
-                    <TestRow
-                      data={t}
-                      key={t.id}
-                      i={i}
-                      showForm={showForm}
-                      value={value}
-                      isChanged={isChanged}
-                      onChange={(e: any) => {
-                        const { target, value } =
-                          t?.investigation_object?.investigation_type ===
-                          "Float"
-                            ? {
-                                target: `${t.id}.value`,
-                                value: Number(e.value) || null,
-                              }
-                            : {
-                                target: `${t.id}.notes`,
-                                value: e.value,
-                              };
-                        handleValueChange(value, target);
-                      }}
-                      className="print:text-black"
-                    />
-                  );
-                })
-              ) : (
-                <tr className="text-center text-secondary-500 print:text-black">
-                  <td className="col-span-6">{t("no_tests_taken")}</td>
-                </tr>
-              )}
-            </tbody>
-          </table>
-        </div>
+            )}
+          </tbody>
+        </table>
       </div>
     </div>
   );
diff --git a/src/Components/Facility/Investigations/InvestigationsPrintPreview.tsx b/src/Components/Facility/Investigations/InvestigationsPrintPreview.tsx
new file mode 100644
index 00000000000..97a5375fa28
--- /dev/null
+++ b/src/Components/Facility/Investigations/InvestigationsPrintPreview.tsx
@@ -0,0 +1,138 @@
+import * as _ from "lodash-es";
+import { lazy } from "react";
+import routes from "../../../Redux/api";
+import useQuery from "../../../Utils/request/useQuery";
+import PrintPreview from "../../../CAREUI/misc/PrintPreview";
+import { useTranslation } from "react-i18next";
+const Loading = lazy(() => import("../../Common/Loading"));
+import { Investigation } from "./Reports/types";
+import careConfig from "@careConfig";
+
+const InvestigationEntry = ({
+  investigation,
+}: {
+  investigation: Investigation;
+}) => {
+  const { t } = useTranslation();
+  return (
+    <tr className="border-y border-y-secondary-400 text-center text-xs transition-all duration-200 ease-in-out even:bg-secondary-100">
+      <td className="whitespace px-6 py-4 text-left">
+        <p className="text-sm font-medium text-secondary-900">
+          {investigation.investigation_object.name || "---"}
+        </p>
+        <p className="flex flex-row gap-x-2">
+          <span>
+            {t("investigations__range")}:{" "}
+            {investigation.investigation_object.min_value || ""}
+            {investigation.investigation_object.min_value ? " - " : ""}
+            {investigation.investigation_object.max_value || ""}
+          </span>
+        </p>
+        <p className="text-secondary-600">
+          {t("investigations__unit")}:{" "}
+          {investigation.investigation_object.unit || "---"}
+        </p>
+      </td>
+      <td className="whitespace-nowrap px-6 py-4 text-xs text-secondary-700">
+        {investigation.value || "---"}
+      </td>
+      <td className="whitespace-nowrap px-6 py-4 text-xs text-secondary-700">
+        {investigation.investigation_object.ideal_value || "---"}
+      </td>
+    </tr>
+  );
+};
+
+const InvestigationsPreviewTable = ({
+  investigations,
+}: {
+  investigations?: Investigation[];
+}) => {
+  const { t } = useTranslation();
+  if (!investigations) {
+    return (
+      <tr className="text-center text-secondary-500 print:text-black">
+        <td className="col-span-6">{t("no_tests_taken")}</td>
+      </tr>
+    );
+  }
+
+  return (
+    <table className="mb-8 mt-4 w-full border-collapse border-2 border-secondary-400">
+      <caption className="mb-2 caption-top text-lg font-bold">
+        {t("investigations")}
+      </caption>
+      <thead className="border-b-2 border-secondary-400 bg-secondary-50 px-6 text-center">
+        <tr>
+          <th className="max-w-52 px-6 py-1 text-left">
+            {t("investigations__name")}
+          </th>
+          <th className="p-1">{t("investigations__result")}</th>
+          <th className="max-w-32 p-1"> {t("investigations__ideal_value")}</th>
+        </tr>
+      </thead>
+      <tbody className="border-b-2 border-secondary-400">
+        {investigations.map((item) => (
+          <InvestigationEntry key={item.id} investigation={item} />
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+interface InvestigationPrintPreviewProps {
+  consultationId: string;
+  patientId: string;
+  sessionId: string;
+  facilityId: string;
+}
+export default function InvestigationPrintPreview(
+  props: InvestigationPrintPreviewProps,
+) {
+  const { consultationId, patientId, sessionId } = props;
+  const { t } = useTranslation();
+  const { loading: investigationLoading, data: investigations } = useQuery(
+    routes.getInvestigation,
+    {
+      pathParams: {
+        consultation_external_id: consultationId,
+      },
+      query: {
+        session: sessionId,
+      },
+    },
+  );
+
+  const { data: patient, loading: patientLoading } = useQuery(
+    routes.getPatient,
+    {
+      pathParams: { id: patientId },
+    },
+  );
+
+  const { data: consultation } = useQuery(routes.getConsultation, {
+    pathParams: { id: consultationId },
+    prefetch: !!consultationId,
+  });
+
+  if (patientLoading || investigationLoading) {
+    return <Loading />;
+  }
+  return (
+    <PrintPreview
+      title={t("investigation_report_for_{{name}}", {
+        name: patient?.name,
+      })}
+    >
+      <div className="mb-3 flex items-center justify-between p-4">
+        <h3>{consultation?.facility_name}</h3>
+        <img
+          className="h-10 w-auto"
+          src={careConfig.mainLogo?.dark}
+          alt="care logo"
+        />
+      </div>
+      <InvestigationsPreviewTable investigations={investigations?.results} />
+    </PrintPreview>
+  );
+}
diff --git a/src/Components/Facility/Investigations/ShowInvestigation.tsx b/src/Components/Facility/Investigations/ShowInvestigation.tsx
index bc0621af7d9..85f2fb1fd7d 100644
--- a/src/Components/Facility/Investigations/ShowInvestigation.tsx
+++ b/src/Components/Facility/Investigations/ShowInvestigation.tsx
@@ -1,13 +1,12 @@
 import * as _ from "lodash-es";
-import { navigate } from "raviger";
 import { useCallback, useReducer } from "react";
 import routes from "../../../Redux/api";
 import * as Notification from "../../../Utils/Notifications.js";
 import request from "../../../Utils/request/request";
 import useQuery from "../../../Utils/request/useQuery";
 import InvestigationTable from "./InvestigationTable";
-import PrintPreview from "../../../CAREUI/misc/PrintPreview";
 import { useTranslation } from "react-i18next";
+import Page from "../../Common/components/Page";
 import Loading from "@/Components/Common/Loading";
 const initialState = {
   changedFields: {},
@@ -40,7 +39,7 @@ interface ShowInvestigationProps {
   facilityId: string;
 }
 export default function ShowInvestigation(props: ShowInvestigationProps) {
-  const { consultationId, patientId, sessionId } = props;
+  const { consultationId, patientId, sessionId, facilityId } = props;
   const { t } = useTranslation();
   const [state, dispatch] = useReducer(updateFormReducer, initialState);
   const { loading: investigationLoading } = useQuery(routes.getInvestigation, {
@@ -116,9 +115,28 @@ export default function ShowInvestigation(props: ShowInvestigationProps) {
         Notification.Success({
           msg: "Investigation Updated successfully!",
         });
-        navigate(
-          `/facility/${props.facilityId}/patient/${props.patientId}/consultation/${props.consultationId}`,
+        const changedDict: any = {};
+        Object.values(state.changedFields).forEach(
+          (field: any) =>
+            (changedDict[field.id] = {
+              id: field.id,
+              value: field?.value || null,
+              notes: field?.notes || null,
+            }),
         );
+        const changedInitialValues: any = {};
+        Object.values(state.initialValues).forEach(
+          (field: any) =>
+            (changedInitialValues[field.id] = {
+              ...field,
+              value: changedDict[field.id].value,
+              notes: changedDict[field.id].notes,
+            }),
+        );
+        dispatch({
+          type: "set_initial_values",
+          initialValues: changedInitialValues,
+        });
       }
       return;
     } else {
@@ -145,22 +163,28 @@ export default function ShowInvestigation(props: ShowInvestigationProps) {
     return <Loading />;
   }
   return (
-    <PrintPreview
-      title={t("investigation_report_for_{{name}}", {
+    <Page
+      title={t("investigation_report", {
         name: patientData?.name,
       })}
     >
-      <InvestigationTable
-        title={t("investigation_report_of_{{name}}", {
-          name: patientData?.name,
-        })}
-        data={state.initialValues}
-        isDischargedPatient={!!consultation?.discharge_date}
-        changedFields={state.changedFields}
-        handleValueChange={handleValueChange}
-        handleUpdateCancel={handleUpdateCancel}
-        handleSave={handleSubmit}
-      />
-    </PrintPreview>
+      <div className="mx-auto flex w-full max-w-5xl flex-col gap-10 rounded bg-white p-6 transition-all sm:rounded-xl sm:p-12">
+        <InvestigationTable
+          title={t("investigation_report_for_{{name}}", {
+            name: patientData?.name,
+          })}
+          data={state.initialValues}
+          isDischargedPatient={!!consultation?.discharge_date}
+          changedFields={state.changedFields}
+          handleValueChange={handleValueChange}
+          handleUpdateCancel={handleUpdateCancel}
+          handleSave={handleSubmit}
+          consultationId={consultationId}
+          patientId={patientId}
+          sessionId={sessionId}
+          facilityId={facilityId}
+        />
+      </div>
+    </Page>
   );
 }
diff --git a/src/Components/Facility/Investigations/ViewInvestigations.tsx b/src/Components/Facility/Investigations/ViewInvestigations.tsx
index 22c811f41fa..e889fac4c01 100644
--- a/src/Components/Facility/Investigations/ViewInvestigations.tsx
+++ b/src/Components/Facility/Investigations/ViewInvestigations.tsx
@@ -5,6 +5,8 @@ import { useTranslation } from "react-i18next";
 import { formatDateTime } from "../../../Utils/utils";
 import { InvestigationResponse } from "./Reports/types";
 import { InvestigationSessionType } from "./investigationsTab";
+import ButtonV2 from "../../Common/components/ButtonV2";
+import CareIcon from "../../../CAREUI/icons/CareIcon";
 
 import Loading from "@/Components/Common/Loading";
 export default function ViewInvestigations(props: {
@@ -56,16 +58,31 @@ export default function ViewInvestigations(props: {
                 <div>
                   {formatDateTime(investigationSession.session_created_date)}
                 </div>
-                <button
-                  onClick={() =>
-                    navigate(
-                      `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}`,
-                    )
-                  }
-                  className="btn btn-default"
-                >
-                  View
-                </button>
+                <div className="space-x-2">
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}`,
+                      )
+                    }
+                    ghost
+                    border
+                  >
+                    {t("view")}
+                  </ButtonV2>
+                  <ButtonV2
+                    onClick={() =>
+                      navigate(
+                        `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}/print`,
+                      )
+                    }
+                    ghost
+                    border
+                  >
+                    <CareIcon icon="l-print" className="text-lg" />
+                    {t("print")}
+                  </ButtonV2>
+                </div>
               </div>
             );
           })}
diff --git a/src/Locale/en.json b/src/Locale/en.json
index 0369718ae28..2eb5d160287 100644
--- a/src/Locale/en.json
+++ b/src/Locale/en.json
@@ -1055,6 +1055,8 @@
   "live_patients_total_beds": "Live Patients / Total beds",
   "occupancy" : "Occupancy",
   "view_cns" : "View CNS",
+  "years": "years",
+  "investigation_report": "Investigation Report",
   "expand_sidebar": "Expand Sidebar",
   "collapse_sidebar": "Collapse Sidebar",
   "linked_skills": "Linked Skills"
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 77efe1081bc..7f1a7fecfb8 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -12,6 +12,7 @@ import CriticalCareEditor from "../../Components/LogUpdate/CriticalCareEditor";
 import PrescriptionsPrintPreview from "../../Components/Medicine/PrintPreview";
 import CriticalCarePreview from "../../Components/LogUpdate/CriticalCarePreview";
 import FileUploadPage from "../../Components/Patient/FileUploadPage";
+import InvestigationPrintPreview from "../../Components/Facility/Investigations/InvestigationsPrintPreview";
 import { AppRoutes } from "../AppRouter";
 
 const consultationRoutes: AppRoutes = {
@@ -70,6 +71,15 @@ const consultationRoutes: AppRoutes = {
         sessionId={sessionId}
       />
     ),
+  "/facility/:facilityId/patient/:patientId/consultation/:id/investigation/:sessionId/print":
+    ({ facilityId, patientId, id, sessionId }: any) => (
+      <InvestigationPrintPreview
+        consultationId={id}
+        facilityId={facilityId}
+        patientId={patientId}
+        sessionId={sessionId}
+      />
+    ),
   "/facility/:facilityId/patient/:patientId/consultation/:id/daily-rounds": ({
     facilityId,
     patientId,