diff --git a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
index cf0ce7bd6af..ea0e466dffa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationABGTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationABGTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></ABGPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
index c3515a80953..43aaf627534 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationDialysisTab.tsx
@@ -8,7 +8,7 @@ export const ConsultationDialysisTab = (props: ConsultationTabProps) => {
   return (
     <div>
       <PageTitle title="Dialysis Plots" hideBack={true} breadcrumbs={false} />
-      <DialysisPlots consultationId={props.consultationId}></DialysisPlots>
+      <DialysisPlots consultationId={props.consultationId} />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
index 85f34f0ec63..5956071e5fa 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNeurologicalMonitoringTab.tsx
@@ -18,7 +18,7 @@ export const ConsultationNeurologicalMonitoringTab = (
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NeurologicalTable>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
index 721ee18d13e..f8d38b2adb3 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNursingTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNursingTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NursingPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
index 74e250f0577..75e0987cffd 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationNutritionTab.tsx
@@ -12,7 +12,7 @@ export const ConsultationNutritionTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></NutritionPlots>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
index 69d20dd64c9..09f6cb05a7b 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationSummaryTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationSummaryTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></PrimaryParametersPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
index d14b54cc096..36a72ab789e 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationVentilatorTab.tsx
@@ -16,7 +16,7 @@ export const ConsultationVentilatorTab = (props: ConsultationTabProps) => {
         facilityId={props.facilityId}
         patientId={props.patientId}
         consultationId={props.consultationId}
-      ></VentilatorPlot>
+      />
     </div>
   );
 };
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 2f6ca03ef06..54eee52878e 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -462,7 +462,6 @@ export const ConsultationDetails = (props: any) => {
             </div>
           </div>
         </div>
-
         <SelectedTab {...consultationTabProps} />
       </div>
 
diff --git a/src/Components/Facility/Consultations/NursingPlot.tsx b/src/Components/Facility/Consultations/NursingPlot.tsx
index 83444b6c50f..b141e18f987 100644
--- a/src/Components/Facility/Consultations/NursingPlot.tsx
+++ b/src/Components/Facility/Consultations/NursingPlot.tsx
@@ -121,7 +121,7 @@ export const NursingPlot = (props: any) => {
         </div>
       </div>
 
-      {totalCount > PAGINATION_LIMIT && (
+      {!areFieldsEmpty() && totalCount > PAGINATION_LIMIT && (
         <div className="mt-4 flex w-full justify-center">
           <Pagination
             cPage={currentPage}
diff --git a/src/Components/Facility/Investigations/ViewInvestigations.tsx b/src/Components/Facility/Investigations/ViewInvestigations.tsx
index a1381015963..7c420522c44 100644
--- a/src/Components/Facility/Investigations/ViewInvestigations.tsx
+++ b/src/Components/Facility/Investigations/ViewInvestigations.tsx
@@ -4,6 +4,7 @@ import ReportTable from "./Reports/ReportTable";
 import { formatDateTime } from "../../../Utils/utils";
 import { InvestigationSessionType } from "./investigationsTab";
 import { lazy } from "react";
+
 const Loading = lazy(() => import("../../Common/Loading"));
 
 export default function ViewInvestigations(props: {
@@ -26,7 +27,9 @@ export default function ViewInvestigations(props: {
   return (
     <div className="mx-auto max-w-7xl">
       {isLoading ? (
-        <Loading />
+        <div className="min-h-screen">
+          <Loading />
+        </div>
       ) : (
         <div className="mt-4 space-y-2 ">
           {investigations.length > 0 && (
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 9b37c53f599..e94d740c0db 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -117,7 +117,9 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           }
         >
           {loading ? (
-            <Loading />
+            <div className="min-h-screen">
+              <Loading />
+            </div>
           ) : (
             <>
               {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index f4d02404b7f..e1ea368af72 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -239,6 +239,7 @@ export const FileUpload = (props: FileUploadProps) => {
         setFacilityName("");
       }
     }
+
     fetchPatientName();
   }, [dispatch, patientId]);
 
@@ -898,7 +899,11 @@ export const FileUpload = (props: FileUploadProps) => {
   };
 
   if (isLoading) {
-    return <Loading />;
+    return (
+      <div className="min-h-screen">
+        <Loading />
+      </div>
+    );
   }
 
   const onFileChange = (e: ChangeEvent<HTMLInputElement>): any => {