diff --git a/Client/src/Components/BasicTable/index.css b/Client/src/Components/BasicTable/index.css
index a0b00015e..0f0bb7061 100644
--- a/Client/src/Components/BasicTable/index.css
+++ b/Client/src/Components/BasicTable/index.css
@@ -1,21 +1,25 @@
-.MuiTable-root .host-row {
-  display: flex;
-  align-items: center;
-}
-.MuiTable-root .host-row a {
+.MuiTable-root .host a {
   width: var(--env-var-img-width-2);
   height: var(--env-var-img-width-2);
   color: var(--env-var-color-5);
   margin-right: 10px;
   margin-bottom: 2px;
 }
-.MuiTable-root .host-row a svg {
+.MuiTable-root .host a svg {
   width: var(--env-var-font-size-large);
   height: var(--env-var-font-size-large);
 }
-.MuiTable-root .host-row .host-percentage {
+.MuiTable-root .host div:nth-child(3) {
   font-size: var(--env-var-font-size-small);
 }
+.MuiTable-root .host div:nth-child(2) {
+  width: fit-content;
+  margin-right: 10px;
+  font-weight: 700;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
 
 .MuiTable-root .label {
   line-height: 1;
@@ -24,15 +28,6 @@
   font-size: var(--env-var-font-size-small-plus);
 }
 
-.MuiTable-root .host-name {
-  width: fit-content;
-  margin-right: 10px;
-  font-weight: 700;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
 .MuiPaper-root:has(table.MuiTable-root) {
   box-shadow: none;
   border: solid 1px var(--env-var-color-16);
diff --git a/Client/src/Pages/Incidents/index.css b/Client/src/Pages/Incidents/index.css
index 9d2ba8ee0..1b1d2f364 100644
--- a/Client/src/Pages/Incidents/index.css
+++ b/Client/src/Pages/Incidents/index.css
@@ -1,12 +1,16 @@
-.incidents h1.MuiTypography-root {
+.incidents h1.MuiTypography-root,
+.incidents p.MuiTypography-root {
   color: var(--env-var-color-5);
 }
 .incidents h1.MuiTypography-root {
   font-size: var(--env-var-font-size-large);
   font-weight: 600;
 }
-.incidents button.MuiButtonBase-root {
+.incidents button.MuiButtonBase-root,
+.incidents p.MuiTypography-root {
   font-size: var(--env-var-font-size-medium);
+}
+.incidents button.MuiButtonBase-root {
   height: 34px;
   border-color: var(--env-var-color-16);
 }
@@ -14,4 +18,4 @@
 /* remove later */
 .incidents .MuiSelect-select {
   padding: 0 10px;
-}
\ No newline at end of file
+}
diff --git a/Client/src/Pages/Incidents/index.jsx b/Client/src/Pages/Incidents/index.jsx
index 72ecef9dd..e245e0b6c 100644
--- a/Client/src/Pages/Incidents/index.jsx
+++ b/Client/src/Pages/Incidents/index.jsx
@@ -1,18 +1,20 @@
 import { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
-import { Typography, ButtonGroup, Stack } from "@mui/material";
-
+import { Typography, ButtonGroup, Stack, Box } from "@mui/material";
+import WestRoundedIcon from "@mui/icons-material/WestRounded";
 import Button from "../../Components/Button";
 import axiosInstance from "../../Utils/axiosConfig";
 import BasicTable from "../../Components/BasicTable";
 import { StatusLabel } from "../../Components/Label";
 import { useTheme } from "@emotion/react";
+import { useNavigate } from "react-router";
+import Select from "../../Components/Inputs/Select";
 
 import "./index.css";
-import Select from "../../Components/Inputs/Select";
 
 const Incidents = () => {
   const theme = useTheme();
+  const navigate = useNavigate();
   const authState = useSelector((state) => state.auth);
   const [monitors, setMonitors] = useState({});
   const [selectedMonitor, setSelectedMonitor] = useState("0");
@@ -58,13 +60,19 @@ const Incidents = () => {
     setSelectedMonitor(event.target.value);
   };
   let incidents = [];
+  let hasAnyIncidents = false;
+  let hasSpecificIncidents = false;
   if (selectedMonitor === "0") {
     Object.values(monitors).forEach((monitor) => {
       incidents = incidents.concat(monitor.checks);
     });
+    if (incidents.length !== 0) hasAnyIncidents = true;
+    hasSpecificIncidents = hasAnyIncidents;
   } else {
     const monitor = monitors[selectedMonitor];
     incidents = monitor.checks;
+    if (incidents.length !== 0) hasSpecificIncidents = true;
+    hasAnyIncidents = true;
   }
   incidents = incidents
     .sort((a, b) => {
@@ -92,48 +100,83 @@ const Incidents = () => {
   data.rows = incidents;
 
   return (
-    <Stack className="incidents" gap={theme.gap.large}>
-      <Stack direction="row" alignItems="center" gap={theme.gap.medium}>
-        <Typography component="h1">Incident history for: </Typography>
-        <Select
-          id="incidents-select-monitor"
-          placeholder="All servers"
-          value={selectedMonitor}
-          onChange={handleSelect}
-          items={Object.values(monitors)}
-        />
-        <ButtonGroup sx={{ ml: "auto" }}>
-          <Button
-            level="secondary"
-            label="All"
-            onClick={() => setFilter("all")}
-            sx={{
-              backgroundColor:
-                filter === "all" && theme.palette.otherColors.fillGray,
-            }}
-          />
-          <Button
-            level="secondary"
-            label="Down"
-            onClick={() => setFilter("down")}
-            sx={{
-              backgroundColor:
-                filter === "down" && theme.palette.otherColors.fillGray,
-            }}
-          />
-          <Button
-            level="secondary"
-            label="Cannot Resolve"
-            onClick={() => setFilter("resolve")}
-            sx={{
-              backgroundColor:
-                filter === "resolve" && theme.palette.otherColors.fillGray,
-            }}
-          />
-        </ButtonGroup>
+    <>
+      <Stack className="incidents" gap={theme.gap.large}>
+        {hasAnyIncidents ? (
+          <>
+            <Stack direction="row" alignItems="center" gap={theme.gap.medium}>
+              <Typography component="h1">Incident history for: </Typography>
+              <Select
+                id="incidents-select-monitor"
+                placeholder="All servers"
+                value={selectedMonitor}
+                onChange={handleSelect}
+                items={Object.values(monitors)}
+              />
+              {hasAnyIncidents && hasSpecificIncidents && (
+                <ButtonGroup sx={{ ml: "auto" }}>
+                  <Button
+                    level="secondary"
+                    label="All"
+                    onClick={() => setFilter("all")}
+                    sx={{
+                      backgroundColor:
+                        filter === "all" && theme.palette.otherColors.fillGray,
+                    }}
+                  />
+                  <Button
+                    level="secondary"
+                    label="Down"
+                    onClick={() => setFilter("down")}
+                    sx={{
+                      backgroundColor:
+                        filter === "down" && theme.palette.otherColors.fillGray,
+                    }}
+                  />
+                  <Button
+                    level="secondary"
+                    label="Cannot Resolve"
+                    onClick={() => setFilter("resolve")}
+                    sx={{
+                      backgroundColor:
+                        filter === "resolve" &&
+                        theme.palette.otherColors.fillGray,
+                    }}
+                  />
+                </ButtonGroup>
+              )}
+            </Stack>
+            {hasAnyIncidents && hasSpecificIncidents ? (
+              <BasicTable data={data} paginated={true} rowsPerPage={12} />
+            ) : (
+              <Typography alignSelf="center" mt={theme.gap.xxl}>
+                The monitor you have selected, has no recorded incidents yet.
+              </Typography>
+            )}
+          </>
+        ) : (
+          <Stack alignItems="center" mt={theme.gap.xxl} gap={theme.gap.small}>
+            <Typography>No incidents, yet.</Typography>
+            <Button
+              level="tertiary"
+              label="Back"
+              animate="slideLeft"
+              img={<WestRoundedIcon />}
+              onClick={() => navigate(-1)}
+              sx={{
+                backgroundColor: theme.palette.otherColors.fillGray,
+                mb: theme.gap.medium,
+                px: theme.gap.ml,
+                "& svg.MuiSvgIcon-root": {
+                  mr: theme.gap.small,
+                  fill: theme.palette.otherColors.slateGray,
+                },
+              }}
+            />
+          </Stack>
+        )}
       </Stack>
-      <BasicTable data={data} paginated={true} rowsPerPage={12} />
-    </Stack>
+    </>
   );
 };
 
diff --git a/Client/src/Pages/Monitors/index.css b/Client/src/Pages/Monitors/index.css
index 28f4e1fc4..bce3bee72 100644
--- a/Client/src/Pages/Monitors/index.css
+++ b/Client/src/Pages/Monitors/index.css
@@ -31,3 +31,27 @@
   margin-left: 10px;
   line-height: 0.8;
 }
+
+body:has(.monitors) .actions-menu .MuiPaper-root {
+  box-shadow: var(--env-var-shadow-1);
+  border: solid 1px var(--env-var-color-6);
+  border-radius: var(--env-var-radius-1);
+  gap: 1px;
+}
+body:has(.monitors) .actions-menu .MuiList-root {
+  padding: 6px 8px;
+  min-width: 100px;
+}
+body:has(.monitors) .actions-menu li.MuiButtonBase-root {
+  font-size: var(--env-var-font-size-medium);
+  color: var(--env-var-color-5);
+  padding: 5px 8px;
+  border-radius: var(--env-var-radius-1);
+}
+body:has(.monitors) .actions-menu li.MuiButtonBase-root:last-of-type {
+  color: var(--env-var-color-26);
+}
+body:has(.monitors) .MuiModal-root p.MuiTypography-root {
+  font-size: var(--env-var-font-size-medium);
+  color: var(--env-var-color-2);
+}
diff --git a/Client/src/Pages/Monitors/index.jsx b/Client/src/Pages/Monitors/index.jsx
index b020ac47b..9c9f99d15 100644
--- a/Client/src/Pages/Monitors/index.jsx
+++ b/Client/src/Pages/Monitors/index.jsx
@@ -1,17 +1,30 @@
 import "./index.css";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
-import { getUptimeMonitorsByUserId } from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
+import {
+  deleteUptimeMonitor,
+  getUptimeMonitorsByUserId,
+} from "../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import { useNavigate } from "react-router-dom";
 import Button from "../../Components/Button";
 import ServerStatus from "../../Components/Charts/Servers/ServerStatus";
 import { useTheme } from "@emotion/react";
 import ArrowDownwardRoundedIcon from "@mui/icons-material/ArrowDownwardRounded";
 import OpenInNewPage from "../../assets/icons/open-in-new-page.svg?react";
+import Settings from "../../assets/icons/settings-bold.svg?react";
 import BasicTable from "../../Components/BasicTable";
 import { StatusLabel } from "../../Components/Label";
+import { createToast } from "../../Utils/toastUtils";
 import ResponseTimeChart from "../../Components/Charts/ResponseTimeChart";
-import { Box, Stack, Typography } from "@mui/material";
+import {
+  Box,
+  IconButton,
+  Menu,
+  MenuItem,
+  Modal,
+  Stack,
+  Typography,
+} from "@mui/material";
 
 /**
  * Host component.
@@ -27,18 +40,13 @@ import { Box, Stack, Typography } from "@mui/material";
  */
 const Host = ({ params }) => {
   return (
-    <div className="host-row">
+    <Stack direction="row" alignItems="center" className="host">
       <a href={params.url} target="_blank" rel="noreferrer">
         <OpenInNewPage />
       </a>
-      <div className="host-name">{params.title}</div>
-      <div
-        className="host-percentage"
-        style={{ color: params.percentageColor }}
-      >
-        {params.precentage}%
-      </div>
-    </div>
+      <Box>{params.title}</Box>
+      <Box sx={{ color: params.percentageColor }}>{params.precentage}%</Box>
+    </Stack>
   );
 };
 
@@ -47,7 +55,38 @@ const Monitors = () => {
   const navigate = useNavigate();
   const monitorState = useSelector((state) => state.uptimeMonitors);
   const authState = useSelector((state) => state.auth);
-  const dispatch = useDispatch();
+  const dispatch = useDispatch({});
+
+  const [anchorEl, setAnchorEl] = useState(null);
+  const [actions, setActions] = useState({});
+  const openMenu = (event, id, url) => {
+    setAnchorEl(event.currentTarget);
+    setActions({ id: id, url: url });
+  };
+  const closeMenu = () => {
+    setAnchorEl(null);
+    setActions({});
+  };
+
+  const [isOpen, setIsOpen] = useState(false);
+  const openRemove = () => {
+    setAnchorEl(null);
+    setIsOpen(true);
+  };
+  const handleRemove = async (event) => {
+    event.preventDefault();
+    let monitor = { _id: actions.id };
+    const action = await dispatch(
+      deleteUptimeMonitor({ authToken: authState.authToken, monitor })
+    );
+    if (action.meta.requestStatus === "fulfilled") {
+      setIsOpen(false); // close modal
+      dispatch(getUptimeMonitorsByUserId(authState.authToken));
+      createToast({ body: "Monitor deleted successfully." });
+    } else {
+      createToast({ body: "Failed to delete monitor." });
+    }
+  };
 
   useEffect(() => {
     dispatch(getUptimeMonitorsByUserId(authState.authToken));
@@ -65,12 +104,12 @@ const Monitors = () => {
       {
         id: 2,
         name: (
-          <>
+          <Box width="max-content">
             Status
             <span>
               <ArrowDownwardRoundedIcon />
             </span>
-          </>
+          </Box>
         ),
       },
       { id: 3, name: "Response Time" },
@@ -97,7 +136,8 @@ const Monitors = () => {
 
     return {
       id: monitor._id,
-      handleClick: () => navigate(`/monitors/${monitor._id}`),
+      // disabled for now
+      // handleClick: () => navigate(`/monitors/${monitor._id}`),
       data: [
         { id: idx, data: <Host params={params} /> },
         {
@@ -117,7 +157,24 @@ const Monitors = () => {
             <span style={{ textTransform: "uppercase" }}>{monitor.type}</span>
           ),
         },
-        { id: idx + 4, data: "TODO" },
+        {
+          id: idx + 4,
+          data: (
+            <>
+              <IconButton
+                aria-label="monitor actions"
+                onClick={(event) => openMenu(event, monitor._id, monitor.url)}
+                sx={{
+                  "&:focus": {
+                    outline: "none",
+                  },
+                }}
+              >
+                <Settings />
+              </IconButton>
+            </>
+          ),
+        },
       ],
     };
   });
@@ -163,6 +220,73 @@ const Monitors = () => {
         </Stack>
         <BasicTable data={data} paginated={true} />
       </Stack>
+      <Menu
+        className="actions-menu"
+        anchorEl={anchorEl}
+        open={Boolean(anchorEl)}
+        onClose={closeMenu}
+      >
+        <MenuItem
+          onClick={() => window.open(actions.url, "_blank", "noreferrer")}
+        >
+          Open site
+        </MenuItem>
+        <MenuItem onClick={() => navigate(`/monitors/${actions.id}`)}>
+          Details
+        </MenuItem>
+        {/* TODO - pass monitor id to Incidents page */}
+        <MenuItem disabled>Incidents</MenuItem>
+        <MenuItem onClick={() => navigate(`/monitors/configure/${actions.id}`)}>
+          Configure
+        </MenuItem>
+        <MenuItem onClick={openRemove}>Remove</MenuItem>
+      </Menu>
+      <Modal
+        aria-labelledby="modal-delete-monitor"
+        aria-describedby="delete-monitor-confirmation"
+        open={isOpen}
+        onClose={() => setIsOpen(false)}
+        disablePortal
+      >
+        <Stack
+          gap={theme.gap.xs}
+          sx={{
+            position: "absolute",
+            top: "50%",
+            left: "50%",
+            transform: "translate(-50%, -50%)",
+            width: 400,
+            bgcolor: "white",
+            border: "solid 1px #f2f2f2",
+            borderRadius: `${theme.shape.borderRadius}px`,
+            boxShadow: 24,
+            p: "30px",
+            "&:focus": {
+              outline: "none",
+            },
+          }}
+        >
+          <Typography id="modal-delete-monitor" component="h2">
+            Really delete this monitor?
+          </Typography>
+          <Typography id="delete-monitor-confirmation">
+            Once deleted, this monitor cannot be retrieved back.
+          </Typography>
+          <Stack
+            direction="row"
+            gap={theme.gap.small}
+            mt={theme.gap.large}
+            justifyContent="flex-end"
+          >
+            <Button
+              level="tertiary"
+              label="Cancel"
+              onClick={() => setIsOpen(false)}
+            />
+            <Button level="error" label="Delete" onClick={handleRemove} />
+          </Stack>
+        </Stack>
+      </Modal>
     </Stack>
   );
 };
diff --git a/Client/src/assets/icons/settings-bold.svg b/Client/src/assets/icons/settings-bold.svg
new file mode 100644
index 000000000..d8057286c
--- /dev/null
+++ b/Client/src/assets/icons/settings-bold.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 11.4C10.3255 11.4 11.4 10.3255 11.4 9C11.4 7.67452 10.3255 6.6 9 6.6C7.67452 6.6 6.6 7.67452 6.6 9C6.6 10.3255 7.67452 11.4 9 11.4Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.3818 11.1818C14.285 11.4012 14.2561 11.6445 14.2989 11.8804C14.3417 12.1164 14.4542 12.3341 14.6218 12.5055L14.6655 12.5491C14.8007 12.6842 14.908 12.8446 14.9812 13.0212C15.0544 13.1978 15.0921 13.387 15.0921 13.5782C15.0921 13.7693 15.0544 13.9586 14.9812 14.1352C14.908 14.3118 14.8007 14.4722 14.6655 14.6073C14.5304 14.7425 14.3699 14.8498 14.1934 14.923C14.0168 14.9962 13.8275 15.0339 13.6364 15.0339C13.4452 15.0339 13.2559 14.9962 13.0794 14.923C12.9028 14.8498 12.7424 14.7425 12.6073 14.6073L12.5636 14.5636C12.3922 14.396 12.1745 14.2835 11.9386 14.2407C11.7027 14.1979 11.4594 14.2268 11.24 14.3236C11.0249 14.4158 10.8414 14.5689 10.7122 14.764C10.583 14.9591 10.5137 15.1878 10.5127 15.4218V15.5455C10.5127 15.9312 10.3595 16.3012 10.0867 16.574C9.81392 16.8468 9.44395 17 9.05818 17C8.67241 17 8.30244 16.8468 8.02966 16.574C7.75688 16.3012 7.60364 15.9312 7.60364 15.5455V15.48C7.59801 15.2393 7.52009 15.0058 7.38001 14.81C7.23993 14.6141 7.04417 14.4649 6.81818 14.3818C6.59882 14.285 6.3555 14.2561 6.11957 14.2989C5.88365 14.3417 5.66595 14.4542 5.49455 14.6218L5.45091 14.6655C5.31582 14.8007 5.1554 14.908 4.97882 14.9812C4.80224 15.0544 4.61297 15.0921 4.42182 15.0921C4.23067 15.0921 4.04139 15.0544 3.86481 14.9812C3.68824 14.908 3.52782 14.8007 3.39273 14.6655C3.25749 14.5304 3.1502 14.3699 3.077 14.1934C3.00381 14.0168 2.96613 13.8275 2.96613 13.6364C2.96613 13.4452 3.00381 13.2559 3.077 13.0794C3.1502 12.9028 3.25749 12.7424 3.39273 12.6073L3.43636 12.5636C3.60403 12.3922 3.7165 12.1745 3.75928 11.9386C3.80205 11.7027 3.77317 11.4594 3.67636 11.24C3.58417 11.0249 3.4311 10.8414 3.23597 10.7122C3.04085 10.583 2.81221 10.5137 2.57818 10.5127H2.45455C2.06878 10.5127 1.69881 10.3595 1.42603 10.0867C1.15325 9.81392 1 9.44395 1 9.05818C1 8.67241 1.15325 8.30244 1.42603 8.02966C1.69881 7.75688 2.06878 7.60364 2.45455 7.60364H2.52C2.76072 7.59801 2.99419 7.52009 3.19004 7.38001C3.38589 7.23993 3.53507 7.04417 3.61818 6.81818C3.71499 6.59882 3.74387 6.3555 3.70109 6.11957C3.65832 5.88365 3.54585 5.66595 3.37818 5.49455L3.33455 5.45091C3.19931 5.31582 3.09202 5.1554 3.01882 4.97882C2.94562 4.80224 2.90795 4.61297 2.90795 4.42182C2.90795 4.23067 2.94562 4.04139 3.01882 3.86481C3.09202 3.68824 3.19931 3.52782 3.33455 3.39273C3.46963 3.25749 3.63005 3.1502 3.80663 3.077C3.98321 3.00381 4.17249 2.96613 4.36364 2.96613C4.55479 2.96613 4.74406 3.00381 4.92064 3.077C5.09722 3.1502 5.25764 3.25749 5.39273 3.39273L5.43636 3.43636C5.60777 3.60403 5.82547 3.7165 6.06139 3.75928C6.29731 3.80205 6.54064 3.77317 6.76 3.67636H6.81818C7.03329 3.58417 7.21674 3.4311 7.34596 3.23597C7.47518 3.04085 7.54452 2.81221 7.54545 2.57818V2.45455C7.54545 2.06878 7.6987 1.69881 7.97148 1.42603C8.24426 1.15325 8.61423 1 9 1C9.38577 1 9.75574 1.15325 10.0285 1.42603C10.3013 1.69881 10.4545 2.06878 10.4545 2.45455V2.52C10.4555 2.75403 10.5248 2.98267 10.654 3.17779C10.7833 3.37291 10.9667 3.52599 11.1818 3.61818C11.4012 3.71499 11.6445 3.74387 11.8804 3.70109C12.1164 3.65832 12.3341 3.54585 12.5055 3.37818L12.5491 3.33455C12.6842 3.19931 12.8446 3.09202 13.0212 3.01882C13.1978 2.94562 13.387 2.90795 13.5782 2.90795C13.7693 2.90795 13.9586 2.94562 14.1352 3.01882C14.3118 3.09202 14.4722 3.19931 14.6073 3.33455C14.7425 3.46963 14.8498 3.63005 14.923 3.80663C14.9962 3.98321 15.0339 4.17249 15.0339 4.36364C15.0339 4.55479 14.9962 4.74406 14.923 4.92064C14.8498 5.09722 14.7425 5.25764 14.6073 5.39273L14.5636 5.43636C14.396 5.60777 14.2835 5.82547 14.2407 6.06139C14.1979 6.29731 14.2268 6.54064 14.3236 6.76V6.81818C14.4158 7.03329 14.5689 7.21674 14.764 7.34596C14.9591 7.47518 15.1878 7.54452 15.4218 7.54545H15.5455C15.9312 7.54545 16.3012 7.6987 16.574 7.97148C16.8468 8.24426 17 8.61423 17 9C17 9.38577 16.8468 9.75574 16.574 10.0285C16.3012 10.3013 15.9312 10.4545 15.5455 10.4545H15.48C15.246 10.4555 15.0173 10.5248 14.8222 10.654C14.6271 10.7833 14.474 10.9667 14.3818 11.1818Z" stroke="#667085" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/CNAME b/docs/CNAME
new file mode 100644
index 000000000..05329a3ec
--- /dev/null
+++ b/docs/CNAME
@@ -0,0 +1 @@
+uptime.bluewavelabs.ca
\ No newline at end of file