diff --git a/Client/src/Components/Charts/ResponseTimeChart/index.jsx b/Client/src/Components/Charts/ResponseTimeChart/index.jsx
index 2121169b6..0518ebee8 100644
--- a/Client/src/Components/Charts/ResponseTimeChart/index.jsx
+++ b/Client/src/Components/Charts/ResponseTimeChart/index.jsx
@@ -54,7 +54,7 @@ const ResponseTimeChart = ({ checks = [] }) => {
     <div className="chart-container">
       <ResponsiveContainer width="100%" height="100%">
         <BarChart width={150} height={40} data={normalizedChecks}>
-          <Bar maxBarSize={10} dataKey="responseTime">
+          <Bar maxBarSize={10} dataKey="responseTime" isAnimationActive={false}>
             {normalizedChecks.map((check, index) => (
               <Cell
                 key={`cell-${index}`}
diff --git a/Client/src/Components/MonitorTable/index.jsx b/Client/src/Components/MonitorTable/index.jsx
index 4b7b3ab87..5e032f875 100644
--- a/Client/src/Components/MonitorTable/index.jsx
+++ b/Client/src/Components/MonitorTable/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { DataGrid } from "@mui/x-data-grid";
 import OpenIt from "../../assets/Images/Icon-open-in-tab-gray.png";
 import ResponseTimeChart from "../Charts/ResponseTimeChart";
-
+import { useState, useEffect } from "react";
 const Host = ({ params }) => {
   return (
     <div className="host-row">
@@ -22,7 +22,6 @@ const Host = ({ params }) => {
 };
 
 const Status = ({ params }) => {
-  console.log(params.value.status);
   return (
     <div className="host-status">
       <div
@@ -69,53 +68,52 @@ const cols = [
   },
 ];
 
-let rows = [];
-
 const MonitorTable = ({ monitors = [] }) => {
-  rows = monitors.map((monitor) => {
-    return {
-      id: monitor._id,
-      host: {
-        title: monitor.name,
-        url: monitor.url,
-        precentage: 100,
-        percentageColor:
-          monitor.status === true
-            ? "var(--env-var-color-17)"
-            : "var(--env-var-color-19)",
-      },
-      status: {
-        status: monitor.status === true ? "Up" : "Down",
-        backgroundColor:
-          monitor.status === true
-            ? "var(--env-var-color-20)"
-            : "var(--env-var-color-21)",
-        statusDotColor:
-          monitor.status === true
-            ? "var(--env-var-color-17)"
-            : "var(--env-var-color-19)",
-      },
-      response: {
-        checks: monitor.checks,
-      },
-    };
-  });
+  const [rows, setRows] = useState([]);
+  useEffect(() => {
+    const mappedRows = monitors.map((monitor) => {
+      return {
+        id: monitor._id,
+        host: {
+          title: monitor.name,
+          url: monitor.url,
+          precentage: 100,
+          percentageColor:
+            monitor.status === true
+              ? "var(--env-var-color-17)"
+              : "var(--env-var-color-19)",
+        },
+        status: {
+          status: monitor.status === true ? "Up" : "Down",
+          backgroundColor:
+            monitor.status === true
+              ? "var(--env-var-color-20)"
+              : "var(--env-var-color-21)",
+          statusDotColor:
+            monitor.status === true
+              ? "var(--env-var-color-17)"
+              : "var(--env-var-color-19)",
+        },
+        response: {
+          checks: monitor.checks,
+        },
+      };
+    });
+    setRows(mappedRows);
+  }, [monitors]);
 
   return (
-    <div style={{ border: "1px solid red" }}>
-      <h1>Monitor Table</h1>
-      <DataGrid
-        autoHeight
-        columns={cols}
-        rows={rows}
-        initialState={{
-          pagination: {
-            paginationModel: { page: 0, pageSize: 10 },
-          },
-        }}
-        pageSizeOptions={[5, 10]}
-      />
-    </div>
+    <DataGrid
+      autoHeight
+      columns={cols}
+      rows={rows}
+      initialState={{
+        pagination: {
+          paginationModel: { page: 0, pageSize: 10 },
+        },
+      }}
+      pageSizeOptions={[5, 10]}
+    />
   );
 };
 
diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx
index 7adfc13cd..a895ae47a 100644
--- a/Client/src/Pages/Monitors/index.jsx
+++ b/Client/src/Pages/Monitors/index.jsx
@@ -7,8 +7,6 @@ import { useNavigate } from "react-router-dom";
 import Button from "../../Components/Button";
 import ServerStatus from "../../Components/Charts/Servers/ServerStatus";
 import SearchTextField from "../../Components/TextFields/Search/SearchTextField";
-import HostsTable from "../../Components/HostsTable";
-import Pagination from "../../Components/Pagination";
 import MonitorTable from "../../Components/MonitorTable";
 
 const Monitors = () => {
@@ -26,10 +24,8 @@ const Monitors = () => {
   }, 0);
 
   const down = monitorState.monitors.length - up;
-
   return (
     <div className="monitors">
-      <MonitorTable monitors={monitorState.monitors} />
       <div className="monitors-bar">
         <div className="monitors-bar-title">
           Hello, {authState.user.firstname}
@@ -62,10 +58,9 @@ const Monitors = () => {
             <SearchTextField />
           </div>
         </div>
-        <div className="monitors-v-gaping"></div>
-        <HostsTable monitors={monitorState.monitors} />
-        <div className="monitors-v-gaping"></div>
-        <Pagination />
+        <div className="monitors-v-gaping" />
+        <MonitorTable monitors={monitorState.monitors} />
+        <div className="monitors-v-gaping" />
       </div>
     </div>
   );