diff --git a/src/components/EmailDeliveryReport/EmailDeliveryReport.tsx b/src/components/EmailDeliveryReport/EmailDeliveryReport.tsx
index 817bb6a7..cebe47b5 100644
--- a/src/components/EmailDeliveryReport/EmailDeliveryReport.tsx
+++ b/src/components/EmailDeliveryReport/EmailDeliveryReport.tsx
@@ -1,8 +1,10 @@
-import { Tag, Button, Row, Col } from "antd";
-import { useState, Key } from "react";
+import { Tag, Button, Row, Col, message } from "antd";
+import { useState, Key, useEffect } from "react";
 import { StyledTable, StyledTag } from "./EmailDeliveryReport.styled";
 
 import { ColumnType } from "antd/es/table";
+import { ClearOutlined, ReloadOutlined } from "@ant-design/icons";
+import { getEmailDeliveryReportEnumerator } from "../../redux/emails/apiService";
 
 interface EnumeratorStatus {
   enumerator_id: string;
@@ -14,93 +16,205 @@ interface EnumeratorStatus {
   supervisor_email: string;
 }
 
-const columns: ColumnType<EnumeratorStatus>[] = [
-  {
-    title: "Enumerator ID",
-    dataIndex: "enumerator_id",
-    key: "enumerator_id",
-    sorter: (a, b) => a.enumerator_id.localeCompare(b.enumerator_id),
-  },
-  {
-    title: "Enumerator Name",
-    dataIndex: "enumerator_name",
-    key: "enumerator_name",
-    sorter: (a, b) => a.enumerator_name.localeCompare(b.enumerator_name),
-  },
-  {
-    title: "Enumerator Email",
-    dataIndex: "enumerator_email",
-    key: "enumerator_email",
-    sorter: (a, b) => a.enumerator_email.localeCompare(b.enumerator_email),
-  },
-  {
-    title: "Status",
-    dataIndex: "status",
-    key: "status",
-    filters: [
-      { text: "Sent", value: "sent" },
-      { text: "Failed", value: "failed" },
-    ],
-    onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
-      typeof value === "boolean"
-        ? false
-        : record.status.includes(value.toString()),
-    sorter: (a, b) => a.status.localeCompare(b.status),
-    render: (status: string) => {
-      let color = "green";
-      if (status === "failed") {
-        color = "red";
-      }
-      return (
-        <Tag color={color} key={status}>
-          {status.toUpperCase()}
-        </Tag>
-      );
-    },
-  },
-  {
-    title: "Error",
-    dataIndex: "error_message",
-    key: "error_message",
-    sorter: (a, b) => a.error_message.localeCompare(b.error_message),
-  },
-  {
-    title: "Supervisor Name",
-    dataIndex: "supervisor_name",
-    key: "supervisor_name",
-    sorter: (a, b) => a.supervisor_name.localeCompare(b.supervisor_name),
-  },
-  {
-    title: "Supervisor Email",
-    dataIndex: "supervisor_email",
-    key: "supervisor_email",
-    sorter: (a, b) => a.supervisor_email.localeCompare(b.supervisor_email),
-  },
-];
-
-const formatDateTime = (date: string) => {
-  return new Date(date).toLocaleString();
-};
-
-const combineSlotDateTime = (slot_date: string, slot_time: string) => {
-  const cleanedSlotDate = new Date(slot_date).toDateString();
-  const combinedDateTime = new Date(
-    `${cleanedSlotDate} ${slot_time}`
-  ).toLocaleString();
-  return combinedDateTime;
-};
-
 function EmailDeliveryReport({
   deliveryReportData,
   slot_type,
+  email_config_uid,
 }: {
   deliveryReportData: any;
   slot_type: string;
+  email_config_uid?: string;
 }) {
   const [selectedReportUID, setSelectedReportUID] = useState<null | string>(
     deliveryReportData[0].email_delivery_report_uid
   );
   const [tableKey, setTableKey] = useState<number>(0);
+  const [enumeratorData, setEnumeratorData] = useState<EnumeratorStatus[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+
+  const selectedReport = deliveryReportData.find(
+    (report: any) => report.email_delivery_report_uid === selectedReportUID
+  );
+
+  // Function to fetch enumerator data for selected report
+  const fetchEnumeratorData = async (reportUID: string) => {
+    if (!reportUID) return;
+
+    const configUID = email_config_uid || selectedReport?.email_config_uid;
+    if (!configUID) return;
+
+    setLoading(true);
+    try {
+      const response = await getEmailDeliveryReportEnumerator(
+        configUID,
+        reportUID
+      );
+
+      if ((response as any)?.data?.success) {
+        const responseData = (response as any).data.data;
+        // Find the matching delivery report and extract enumerator_status
+        const matchingReport = responseData.find(
+          (report: any) =>
+            report.email_delivery_report_uid.toString() == reportUID
+        );
+        setEnumeratorData(matchingReport?.enumerator_status || []);
+      } else {
+        setEnumeratorData([]);
+        message.error("Failed to fetch enumerator data");
+      }
+    } catch (error) {
+      console.error("Error fetching enumerator data:", error);
+      setEnumeratorData([]);
+      message.error("Error occurred while fetching enumerator data");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // Effect to fetch enumerator data when selectedReportUID changes
+  useEffect(() => {
+    if (selectedReportUID) {
+      fetchEnumeratorData(selectedReportUID);
+    }
+  }, [selectedReportUID, selectedReport]);
+  useEffect(() => {
+    if (deliveryReportData.length > 0 && selectedReportUID) {
+      fetchEnumeratorData(selectedReportUID);
+    }
+  }, []);
+
+  const columns: ColumnType<EnumeratorStatus>[] = [
+    {
+      title: "Enumerator ID",
+      dataIndex: "enumerator_id",
+      key: "enumerator_id",
+      sorter: (a, b) => a.enumerator_id.localeCompare(b.enumerator_id),
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.enumerator_id
+          ) || []
+        )
+      ).map((id) => ({ text: String(id), value: String(id) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        record.enumerator_id === value,
+    },
+    {
+      title: "Enumerator Name",
+      dataIndex: "enumerator_name",
+      key: "enumerator_name",
+      sorter: (a, b) => a.enumerator_name.localeCompare(b.enumerator_name),
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.enumerator_name
+          ) || []
+        )
+      ).map((name) => ({ text: String(name), value: String(name) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        record.enumerator_name === value,
+    },
+    {
+      title: "Enumerator Email",
+      dataIndex: "enumerator_email",
+      key: "enumerator_email",
+      sorter: (a, b) => a.enumerator_email.localeCompare(b.enumerator_email),
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.enumerator_email
+          ) || []
+        )
+      ).map((email) => ({ text: String(email), value: String(email) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        record.enumerator_email === value,
+    },
+    {
+      title: "Status",
+      dataIndex: "status",
+      key: "status",
+      filters: [
+        { text: "Sent", value: "sent" },
+        { text: "Failed", value: "failed" },
+      ],
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        typeof value === "boolean"
+          ? false
+          : record.status.includes(value.toString()),
+      sorter: (a, b) => a.status.localeCompare(b.status),
+      render: (status: string) => {
+        let color = "green";
+        if (status === "failed") {
+          color = "red";
+        }
+        return (
+          <Tag color={color} key={status}>
+            {status.toUpperCase()}
+          </Tag>
+        );
+      },
+    },
+    {
+      title: "Error",
+      dataIndex: "error_message",
+      key: "error_message",
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.error_message || "No Error"
+          ) || []
+        )
+      ).map((error) => ({ text: String(error), value: String(error) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        (record.error_message || "No Error") === value,
+      sorter: (a, b) =>
+        (a.error_message || "").localeCompare(b.error_message || ""),
+    },
+    {
+      title: "Supervisor Name",
+      dataIndex: "supervisor_name",
+      key: "supervisor_name",
+      sorter: (a, b) => a.supervisor_name.localeCompare(b.supervisor_name),
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.supervisor_name
+          ) || []
+        )
+      ).map((name) => ({ text: String(name), value: String(name) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        record.supervisor_name === value,
+    },
+    {
+      title: "Supervisor Email",
+      dataIndex: "supervisor_email",
+      key: "supervisor_email",
+      sorter: (a, b) => a.supervisor_email.localeCompare(b.supervisor_email),
+      filters: Array.from(
+        new Set(
+          enumeratorData.map(
+            (status: EnumeratorStatus) => status.supervisor_email
+          ) || []
+        )
+      ).map((email) => ({ text: String(email), value: String(email) })),
+      onFilter: (value: boolean | Key, record: EnumeratorStatus) =>
+        record.supervisor_email === value,
+    },
+  ];
+
+  const formatDateTime = (date: string) => {
+    return new Date(date).toLocaleString();
+  };
+
+  const combineSlotDateTime = (slot_date: string, slot_time: string) => {
+    const cleanedSlotDate = new Date(slot_date).toDateString();
+    const combinedDateTime = new Date(
+      `${cleanedSlotDate} ${slot_time}`
+    ).toLocaleString();
+    return combinedDateTime;
+  };
+
+  const tableData = enumeratorData || [];
 
   const resetTable = () => {
     setTableKey((prevKey) => prevKey + 1);
@@ -165,52 +279,37 @@ function EmailDeliveryReport({
           <Row style={{ marginTop: "20px", fontSize: "20px" }}>
             <Col span={8}>
               <StyledTag color="green">
-                Total Enumerators with emails Sent:{" "}
+                Emails Sent to Enumerators:{" "}
                 {
-                  deliveryReportData
-                    .find(
-                      (report: any) =>
-                        report.email_delivery_report_uid == selectedReportUID
-                    )
-                    ?.enumerator_status.filter(
-                      (status: EnumeratorStatus) => status.status === "sent"
-                    ).length
+                  enumeratorData.filter(
+                    (status: EnumeratorStatus) => status.status === "sent"
+                  ).length
                 }
               </StyledTag>
             </Col>
             <Col span={8}>
               <StyledTag color="red">
-                Total Enumerators with emails Failed:{" "}
+                Emails Failed for Enumerators:{" "}
                 {
-                  deliveryReportData
-                    .find(
-                      (report: any) =>
-                        report.email_delivery_report_uid == selectedReportUID
-                    )
-                    ?.enumerator_status.filter(
-                      (status: EnumeratorStatus) => status.status === "failed"
-                    ).length
+                  enumeratorData.filter(
+                    (status: EnumeratorStatus) => status.status === "failed"
+                  ).length
                 }
               </StyledTag>
             </Col>
-            <Col span={4} offset={4}>
-              <Button onClick={resetTable}>Clear Sort and Filters</Button>
+            <Col span={1} offset={7}>
+              <Button onClick={resetTable} icon={<ClearOutlined />} />
             </Col>
           </Row>
-          <span style={{ width: "100%" }}>
-            <StyledTable
-              key={tableKey}
-              columns={columns as any}
-              dataSource={
-                deliveryReportData.find(
-                  (report: any) =>
-                    report.email_delivery_report_uid == selectedReportUID
-                )?.enumerator_status
-              }
-              rowKey="enumerator_id"
-              style={{ width: "100%", marginTop: "40px" }}
-            />
-          </span>
+          <StyledTable
+            key={tableKey}
+            bordered={true}
+            columns={columns as any}
+            dataSource={tableData}
+            rowKey="enumerator_id"
+            style={{ width: "100%", marginTop: "40px" }}
+            loading={loading}
+          />
         </>
       )}
     </div>
diff --git a/src/modules/Assignments/AssignmentsTab/CreateAssignments/CreateAssignments.tsx b/src/modules/Assignments/AssignmentsTab/CreateAssignments/CreateAssignments.tsx
index b0638280..a1819d86 100644
--- a/src/modules/Assignments/AssignmentsTab/CreateAssignments/CreateAssignments.tsx
+++ b/src/modules/Assignments/AssignmentsTab/CreateAssignments/CreateAssignments.tsx
@@ -762,7 +762,9 @@ function CreateAssignments() {
                           >
                             Email configuration: <b>{email.config_name}</b>,
                             Date: <b>{email.schedule_time}</b>, Time:{" "}
-                            <b>{email.time}</b>
+                            <b>
+                              {dayjs(email.time, "HH:mm").format("hh:mm A")}
+                            </b>
                           </li>
                         )
                       )}
@@ -917,6 +919,9 @@ function CreateAssignments() {
                               size="middle"
                               format="YYYY-MM-DD"
                               style={{ width: 250 }}
+                              disabledDate={(current) =>
+                                current && current < dayjs().startOf("day")
+                              }
                               onChange={handleDateChange}
                             />
                           </Form.Item>
@@ -933,7 +938,7 @@ function CreateAssignments() {
                           >
                             <TimePicker
                               placeholder="Select Time"
-                              format="HH:mm"
+                              format="hh:mm A"
                               minuteStep={30}
                               style={{ width: 250 }}
                               showNow={false}
diff --git a/src/modules/Assignments/AssignmentsTab/UploadAssignments/EmailSchedule.tsx b/src/modules/Assignments/AssignmentsTab/UploadAssignments/EmailSchedule.tsx
index d260f20f..be7a8b7b 100644
--- a/src/modules/Assignments/AssignmentsTab/UploadAssignments/EmailSchedule.tsx
+++ b/src/modules/Assignments/AssignmentsTab/UploadAssignments/EmailSchedule.tsx
@@ -198,7 +198,8 @@ function EmailSchedule({
               }}
             >
               Email configuration: <b>{email.config_name}</b>, Date:{" "}
-              <b>{email.schedule_time}</b>, Time: <b>{email.time}</b>
+              <b>{email.schedule_time}</b>, Time:{" "}
+              <b> {dayjs(email.time, "HH:mm").format("hh:mm A")}</b>
             </li>
           ))}
           <p
@@ -338,6 +339,9 @@ function EmailSchedule({
                   size="middle"
                   style={{ width: 250 }}
                   onChange={handleDateChange}
+                  disabledDate={(current) =>
+                    current && current < dayjs().startOf("day")
+                  }
                 />
               </Form.Item>
               <Form.Item
@@ -352,8 +356,9 @@ function EmailSchedule({
                 tooltip="Time at which the email will be sent, actual email delivery time will be after 10 minutes or more since the email is queued for delivery after surveycto data refreshes."
               >
                 <TimePicker
+                  use12Hours={true}
                   placeholder="Select Time"
-                  format="HH:mm"
+                  format="hh:mm A"
                   minuteStep={30}
                   style={{ width: 250 }}
                   showNow={false}
diff --git a/src/modules/Emails/ConfigureEmails/ConfigureEmails.tsx b/src/modules/Emails/ConfigureEmails/ConfigureEmails.tsx
index bb905840..f5220329 100644
--- a/src/modules/Emails/ConfigureEmails/ConfigureEmails.tsx
+++ b/src/modules/Emails/ConfigureEmails/ConfigureEmails.tsx
@@ -144,12 +144,8 @@ function ConfigureEmails() {
         />
         <Title>Survey email configuration</Title>
         <div style={{ display: "flex", marginLeft: "auto" }}>
-          <Button
-            onClick={() => navigate(-1)}
-            style={{ marginLeft: 20 }}
-            icon={<CloseCircleOutlined />}
-          >
-            Dismiss
+          <Button onClick={() => navigate(-1)} style={{ marginLeft: 20 }}>
+            Cancel
           </Button>
         </div>
       </HeaderContainer>
diff --git a/src/modules/Emails/ConfigureEmails/EmailConfigForm.tsx b/src/modules/Emails/ConfigureEmails/EmailConfigForm.tsx
index 25613a0b..b6a7944b 100644
--- a/src/modules/Emails/ConfigureEmails/EmailConfigForm.tsx
+++ b/src/modules/Emails/ConfigureEmails/EmailConfigForm.tsx
@@ -11,6 +11,7 @@ import { useNavigate, useParams } from "react-router-dom";
 import { getAllUsers } from "../../../redux/userManagement/userManagementActions";
 import FullScreenLoader from "../../../components/Loaders/FullScreenLoader";
 import { set } from "lodash";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const { Option } = Select;
 
@@ -527,19 +528,16 @@ const EmailConfigForm = ({ handleContinue, configNames, sctoForms }: any) => {
           )}
         </>
       )}
-      <Button
+      <CustomBtn
         type="primary"
         style={{
-          display: "flex",
-          backgroundColor: "#597EF7",
-          color: "white",
           float: "right",
         }}
         loading={loading}
         onClick={handleSubmit}
       >
         Continue
-      </Button>
+      </CustomBtn>
     </Form>
   );
 };
diff --git a/src/modules/Emails/ConfigureEmails/EmailScheduleForm.tsx b/src/modules/Emails/ConfigureEmails/EmailScheduleForm.tsx
index c2beb9e3..cc68933f 100644
--- a/src/modules/Emails/ConfigureEmails/EmailScheduleForm.tsx
+++ b/src/modules/Emails/ConfigureEmails/EmailScheduleForm.tsx
@@ -19,6 +19,7 @@ import dayjs from "dayjs";
 import EmailScheduleFilter from "../../../components/EmailScheduleFilter";
 import EmailScheduleFilterCard from "../../../components/EmailScheduleFilterCard";
 import { getEmailSchedules } from "../../../redux/emails/apiService";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const EmailScheduleForm = ({
   handleBack,
@@ -276,8 +277,9 @@ const EmailScheduleForm = ({
                         ]}
                       >
                         <TimePicker
+                          use12Hours={true}
                           placeholder="Select Time"
-                          format="HH:mm"
+                          format="hh:mm A"
                           minuteStep={30}
                           showNow={false}
                           needConfirm={false}
@@ -375,19 +377,17 @@ const EmailScheduleForm = ({
           Skip
         </Button>
 
-        <Button
+        <CustomBtn
           type="primary"
           style={{
             display: "flex",
-            backgroundColor: "#597EF7",
-            color: "white",
             float: "right",
           }}
           loading={loading}
           onClick={handleSubmit}
         >
           Continue
-        </Button>
+        </CustomBtn>
       </div>
     </Form>
   );
diff --git a/src/modules/Emails/ConfigureEmails/EmailTemplateForm.tsx b/src/modules/Emails/ConfigureEmails/EmailTemplateForm.tsx
index 34ee3907..f4b4224b 100644
--- a/src/modules/Emails/ConfigureEmails/EmailTemplateForm.tsx
+++ b/src/modules/Emails/ConfigureEmails/EmailTemplateForm.tsx
@@ -21,6 +21,7 @@ import EmailTableCard from "../../../components/EmailTableCard";
 import ReactQuill from "react-quill";
 import React from "react";
 import { getEmailTemplates } from "../../../redux/emails/apiService";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const { Option } = Select;
 
@@ -651,11 +652,9 @@ const EmailTemplateForm = ({
           Skip
         </Button>
 
-        <Button
+        <CustomBtn
           type="primary"
           style={{
-            backgroundColor: "#597EF7",
-            color: "white",
             marginLeft: "auto",
             marginRight: "5$",
           }}
@@ -663,7 +662,7 @@ const EmailTemplateForm = ({
           onClick={handleSubmit}
         >
           Continue
-        </Button>
+        </CustomBtn>
       </div>
       {currentFormIndex !== null && (
         <EmailTableModel
diff --git a/src/modules/Emails/EmailSchedules/EmailConfigEditForm.tsx b/src/modules/Emails/EmailSchedules/EmailConfigEditForm.tsx
index a0f6e205..3f5656b2 100644
--- a/src/modules/Emails/EmailSchedules/EmailConfigEditForm.tsx
+++ b/src/modules/Emails/EmailSchedules/EmailConfigEditForm.tsx
@@ -9,6 +9,7 @@ import { useAppDispatch, useAppSelector } from "../../../redux/hooks";
 import { useNavigate, useParams } from "react-router-dom";
 import { getAllUsers } from "../../../redux/userManagement/userManagementActions";
 import FullScreenLoader from "../../../components/Loaders/FullScreenLoader";
+import { CustomBtn } from "../../../shared/Global.styled";
 const { Option } = Select;
 
 const EmailConfigEditForm = ({
@@ -158,7 +159,7 @@ const EmailConfigEditForm = ({
     <Form form={form} layout="vertical" initialValues={initialValues}>
       <Form.Item
         name="form_uid"
-        label="SCTO form ID"
+        label="SCTO Form ID"
         tooltip="Select the SCTO form to be used for the email configuration"
         rules={[
           {
@@ -237,7 +238,7 @@ const EmailConfigEditForm = ({
       </Form.Item>
       <Form.Item
         name="email_source"
-        label="Select the source of Emails"
+        label="Select the Email Source"
         rules={[
           { required: true, message: "Please select the source of Emails" },
         ]}
@@ -388,19 +389,9 @@ const EmailConfigEditForm = ({
           )}
         </>
       )}
-      <Button
-        type="primary"
-        style={{
-          display: "flex",
-          backgroundColor: "#597EF7",
-          color: "white",
-          float: "right",
-        }}
-        loading={loading}
-        onClick={handleSubmit}
-      >
-        Continue
-      </Button>
+      <CustomBtn type="primary" loading={loading} onClick={handleSubmit}>
+        Save
+      </CustomBtn>
     </Form>
   );
 };
diff --git a/src/modules/Emails/EmailSchedules/EmailScheduleEditForm.tsx b/src/modules/Emails/EmailSchedules/EmailScheduleEditForm.tsx
index f1459d21..6c1614cf 100644
--- a/src/modules/Emails/EmailSchedules/EmailScheduleEditForm.tsx
+++ b/src/modules/Emails/EmailSchedules/EmailScheduleEditForm.tsx
@@ -2,11 +2,11 @@ import { useState, useEffect } from "react";
 import {
   Form,
   Input,
-  Button,
   Select,
   message,
   DatePicker,
   TimePicker,
+  Button,
 } from "antd";
 import { useAppDispatch, useAppSelector } from "../../../redux/hooks";
 import { updateEmailSchedule } from "../../../redux/emails/emailsActions";
@@ -16,6 +16,7 @@ import FullScreenLoader from "../../../components/Loaders/FullScreenLoader";
 import EmailScheduleFilter from "../../../components/EmailScheduleFilter";
 import EmailScheduleFilterCard from "../../../components/EmailScheduleFilterCard";
 import dayjs from "dayjs";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const { Option } = Select;
 const { RangePicker } = DatePicker;
@@ -99,6 +100,7 @@ const EmailScheduleEditForm = ({
       message.success("Email schedule updated successfully");
       fetchEmailSchedules();
     } catch (error) {
+      console.log("Error updating email schedule:", error);
       message.error("Failed to update email schedule");
     }
     setLoading(false);
@@ -113,6 +115,10 @@ const EmailScheduleEditForm = ({
       };
       if (initialValues.filter_list) {
         setTableList(initialValues.filter_list);
+        console.log(
+          "Filter list in EmailScheduleEditForm:",
+          initialValues.filter_list
+        );
       }
       setEmailConfigUID(initialValues.email_config_uid);
       form.setFieldsValue({ ...formValues });
@@ -168,8 +174,9 @@ const EmailScheduleEditForm = ({
         tooltip="Time the email will be sent, actual email delivery time will be after 10 minutes or more since the email is queued for delivery after surveycto data refreshes."
       >
         <TimePicker
+          use12Hours
           placeholder="Select Time"
-          format="HH:mm"
+          format="hh:mm A"
           minuteStep={30}
           showNow={false}
           needConfirm={false}
@@ -180,6 +187,10 @@ const EmailScheduleEditForm = ({
           setEditingIndex(null);
           setScheduleFilterOpen(true);
         }}
+        style={{
+          backgroundColor: "white",
+          color: "black",
+        }}
       >
         Add Filters for Schedule
       </Button>
@@ -189,20 +200,20 @@ const EmailScheduleEditForm = ({
         configUID={initialValues.email_config_uid}
         tableList={tableList}
         setTableList={(value: any) => {
-          setTableList(value);
+          setTableList([value]);
         }}
         editingIndex={editingIndex}
         setEditingIndex={setEditingIndex}
       />
 
       <div style={{ display: "flex", marginTop: "40px" }}>
-        <Button
+        <CustomBtn
           type="primary"
           onSubmit={() => form.validateFields()}
           onClick={handleSubmit}
         >
-          Submit
-        </Button>
+          Save
+        </CustomBtn>
       </div>
       <div style={{ display: "flex", marginTop: "10px" }}>
         <EmailScheduleFilterCard
diff --git a/src/modules/Emails/EmailSchedules/EmailSchedules.tsx b/src/modules/Emails/EmailSchedules/EmailSchedules.tsx
index b1ad75eb..970c5134 100644
--- a/src/modules/Emails/EmailSchedules/EmailSchedules.tsx
+++ b/src/modules/Emails/EmailSchedules/EmailSchedules.tsx
@@ -115,42 +115,41 @@ function EmailSchedules({ data, fetchEmailSchedules, sctoForms }: any) {
           }}
         >
           <p>
-            <span style={{ marginBottom: 10 }}>{record?.config_name}</span>
-            <span
-              style={{
-                position: "relative",
-                top: "5px",
-              }}
-            >
-              <Tooltip title="Edit Config">
-                <Button
-                  type="link"
-                  icon={<EditOutlined />}
-                  disabled={!record?.email_config_uid}
-                  onClick={() => handleEditConfig(record)}
-                >
-                  Edit Config
-                </Button>
-              </Tooltip>
-
-              <Tooltip title="Delete">
-                <Popconfirm
-                  title="Are you sure you want to delete this config type?"
-                  onConfirm={() => handleDeleteConfig(record?.email_config_uid)}
-                  okText="Yes"
-                  cancelText="No"
-                >
+            <div style={{ display: "flex", flexDirection: "column" }}>
+              <span style={{ marginBottom: 10 }}>{record?.config_name}</span>
+              <span>
+                <Tooltip title="Edit Config">
                   <Button
-                    disabled={!record?.email_config_uid}
                     type="link"
-                    icon={<DeleteOutlined />}
-                    danger
+                    icon={<EditOutlined />}
+                    disabled={!record?.email_config_uid}
+                    onClick={() => handleEditConfig(record)}
                   >
-                    Delete Config
+                    Edit Config
                   </Button>
-                </Popconfirm>
-              </Tooltip>
-            </span>
+                </Tooltip>
+
+                <Tooltip title="Delete">
+                  <Popconfirm
+                    title="Are you sure you want to delete this config type?"
+                    onConfirm={() =>
+                      handleDeleteConfig(record?.email_config_uid)
+                    }
+                    okText="Yes"
+                    cancelText="No"
+                  >
+                    <Button
+                      disabled={!record?.email_config_uid}
+                      type="link"
+                      icon={<DeleteOutlined />}
+                      danger
+                    >
+                      Delete Config
+                    </Button>
+                  </Popconfirm>
+                </Tooltip>
+              </span>
+            </div>
           </p>
         </div>
       ),
@@ -205,7 +204,9 @@ function EmailSchedules({ data, fetchEmailSchedules, sctoForms }: any) {
                 >
                   <div style={{ marginRight: "10px", width: "30%" }}>
                     <p>Schedule Name : {email_schedule_name}</p>
-                    <p>Time : {dayjs(`1970-01-01T${time}`).format("HH:mm")}</p>
+                    <p>
+                      Time : {dayjs(`1970-01-01T${time}`).format("hh:mm A")}
+                    </p>
                   </div>
                   <div
                     style={{
@@ -242,8 +243,10 @@ function EmailSchedules({ data, fetchEmailSchedules, sctoForms }: any) {
                         onCancel={() => setIsDeliveryReportModalVisible(-1)}
                         style={{
                           fontFamily: "Lato",
-                          overflowY: "scroll",
-                          maxHeight: "500px",
+                          ...(deliveryReportData?.length > 10 && {
+                            overflowY: "scroll",
+                            maxHeight: "500px",
+                          }),
                         }}
                         width={"80%"}
                         height={"80%"}
@@ -260,6 +263,7 @@ function EmailSchedules({ data, fetchEmailSchedules, sctoForms }: any) {
                           <EmailDeliveryReport
                             deliveryReportData={deliveryReportData}
                             slot_type="schedule"
+                            email_config_uid={email_config_uid}
                           />
                         ) : (
                           <p>
@@ -381,13 +385,19 @@ function EmailSchedules({ data, fetchEmailSchedules, sctoForms }: any) {
         <SchedulesTable
           dataSource={data}
           columns={scheduleColumns}
-          pagination={{
-            pageSize: paginationPageSize,
-            pageSizeOptions: [10, 25, 50, 100],
-            showSizeChanger: true,
-            showQuickJumper: true,
-            onShowSizeChange: (_, size) => setPaginationPageSize(size),
-          }}
+          pagination={
+            data.length > 10
+              ? {
+                  position: ["topRight"],
+                  pageSize: paginationPageSize,
+                  pageSizeOptions: [10, 25, 50, 100],
+                  showSizeChanger: true,
+                  showQuickJumper: true,
+                  onShowSizeChange: (_, size) => setPaginationPageSize(size),
+                }
+              : false
+          }
+          bordered={true}
         />
       ) : (
         <div
diff --git a/src/modules/Emails/EmailTemplates/EmailTemplateEditing.tsx b/src/modules/Emails/EmailTemplates/EmailTemplateEditing.tsx
index 7b1c5c8a..a3cb52f2 100644
--- a/src/modules/Emails/EmailTemplates/EmailTemplateEditing.tsx
+++ b/src/modules/Emails/EmailTemplates/EmailTemplateEditing.tsx
@@ -8,6 +8,7 @@ import { getEmailTemplates } from "../../../redux/emails/apiService";
 import FullScreenLoader from "../../../components/Loaders/FullScreenLoader";
 import EmailTableModel from "../../../components/EmailTableModel";
 import { updateEmailTemplate } from "../../../redux/emails/emailsActions";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const { Option } = Select;
 
@@ -380,21 +381,9 @@ function EmailTemplateEditing({
         </Col>
       </Row>
       <div style={{ marginTop: 16 }}>
-        <Button loading={loading} onClick={() => setIsDrawerOpen(false)}>
-          Cancel
-        </Button>
-        <Button
-          type="primary"
-          style={{
-            backgroundColor: "#597EF7",
-            color: "white",
-            marginLeft: 8,
-          }}
-          loading={loading}
-          onClick={handleSubmit}
-        >
-          Save Changes
-        </Button>
+        <CustomBtn type="primary" loading={loading} onClick={handleSubmit}>
+          Save
+        </CustomBtn>
       </div>
 
       {insertTableModelOpen && (
diff --git a/src/modules/Emails/EmailTemplates/EmailTemplates.tsx b/src/modules/Emails/EmailTemplates/EmailTemplates.tsx
index 7a7e3f2e..d6651ca2 100644
--- a/src/modules/Emails/EmailTemplates/EmailTemplates.tsx
+++ b/src/modules/Emails/EmailTemplates/EmailTemplates.tsx
@@ -154,14 +154,20 @@ const EmailTemplates = ({
         <EmailTemplatesTable
           dataSource={templatesData}
           columns={templateColumns}
-          pagination={{
-            pageSize: paginationPageSize,
-            pageSizeOptions: [10, 25, 50, 100],
-            showSizeChanger: true,
-            showQuickJumper: true,
-            onShowSizeChange: (_, size) => setPaginationPageSize(size),
-          }}
+          pagination={
+            templatesData.length > 10
+              ? {
+                  position: ["topRight"],
+                  pageSize: paginationPageSize,
+                  pageSizeOptions: [10, 25, 50, 100],
+                  showSizeChanger: true,
+                  showQuickJumper: true,
+                  onShowSizeChange: (_, size) => setPaginationPageSize(size),
+                }
+              : false
+          }
           rowKey={(record: any) => record.config_type}
+          bordered={true}
         />
       ) : (
         <div
diff --git a/src/modules/Emails/Emails.tsx b/src/modules/Emails/Emails.tsx
index 68c9fcd8..b19430d2 100644
--- a/src/modules/Emails/Emails.tsx
+++ b/src/modules/Emails/Emails.tsx
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import FullScreenLoader from "../../components/Loaders/FullScreenLoader";
 import { RootState } from "../../redux/store";
-import { GlobalStyle } from "../../shared/Global.styled";
+import { CustomBtn, GlobalStyle } from "../../shared/Global.styled";
 import EmailSchedules from "./EmailSchedules/EmailSchedules";
 import { BodyWrapper } from "./Emails.styled";
 import { HeaderContainer, Title } from "../../shared/Nav.styled";
@@ -19,7 +19,7 @@ import { getEnumerators } from "../../redux/enumerators/enumeratorsActions";
 import ManualEmailTriggerForm from "./ManualTriggers/ManualTriggerForm";
 import EmailTemplates from "./EmailTemplates/EmailTemplates";
 
-const { Content } = Layout;
+const { Content, Sider } = Layout;
 function Emails() {
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
@@ -220,63 +220,65 @@ function Emails() {
       <GlobalStyle />
 
       <Container surveyPage={true} />
-      <HeaderContainer>
-        <Title>Emails</Title>
-        <div style={{ marginLeft: "auto" }}>
-          <Button
-            type="primary"
-            style={{
-              marginLeft: "25px",
-              backgroundColor: "#2F54EB",
-            }}
-            icon={<MailOutlined />}
-            loading={loading || isLoading}
-            onClick={
-              tabId === "manual"
-                ? handleCreateManualTrigger
-                : tabId === "templates"
-                ? handleConfigureEmails
-                : handleConfigureEmails
-            }
-          >
-            {tabId === "manual"
-              ? "Create Manual Email Trigger"
-              : tabId === "templates"
-              ? "Create Email Template"
-              : "Configure Emails"}
-          </Button>
-        </div>
-      </HeaderContainer>
-
       {isLoading || loading ? (
         <FullScreenLoader />
       ) : (
-        <Layout>
-          <SideMenu></SideMenu>
-          <Content>
-            <BodyWrapper>
-              {tabId === "manual" ? (
-                <ManualTriggers
-                  data={manualTriggersData}
-                  surveyEnumerators={surveyEnumerators}
-                  emailConfigData={emailConfigData}
-                  fetchManualTriggers={fetchManualTriggers}
-                />
-              ) : tabId === "templates" ? (
-                <EmailTemplates
-                  templatesData={templatesData}
-                  fetchEmailTemplates={fetchEmailTemplates}
-                />
-              ) : (
-                <EmailSchedules
-                  data={schedulesData}
-                  fetchEmailSchedules={fetchEmailSchedules}
-                  sctoForms={sctoForms}
-                />
-              )}
-            </BodyWrapper>
-          </Content>
-        </Layout>
+        <>
+          <HeaderContainer>
+            <Title>Emails</Title>
+            <div style={{ marginLeft: "auto" }}>
+              <CustomBtn
+                type="primary"
+                style={{
+                  marginRight: "15px",
+                }}
+                loading={loading || isLoading}
+                onClick={
+                  tabId === "manual"
+                    ? handleCreateManualTrigger
+                    : tabId === "templates"
+                    ? handleConfigureEmails
+                    : handleConfigureEmails
+                }
+              >
+                {tabId === "manual"
+                  ? "Create Manual Email Trigger"
+                  : tabId === "templates"
+                  ? "Create Email Template"
+                  : "Configure Emails"}
+              </CustomBtn>
+            </div>
+          </HeaderContainer>
+
+          <Layout>
+            <Sider width={250} theme="light">
+              <SideMenu />
+            </Sider>
+            <Content>
+              <BodyWrapper>
+                {tabId === "manual" ? (
+                  <ManualTriggers
+                    data={manualTriggersData}
+                    surveyEnumerators={surveyEnumerators}
+                    emailConfigData={emailConfigData}
+                    fetchManualTriggers={fetchManualTriggers}
+                  />
+                ) : tabId === "templates" ? (
+                  <EmailTemplates
+                    templatesData={templatesData}
+                    fetchEmailTemplates={fetchEmailTemplates}
+                  />
+                ) : (
+                  <EmailSchedules
+                    data={schedulesData}
+                    fetchEmailSchedules={fetchEmailSchedules}
+                    sctoForms={sctoForms}
+                  />
+                )}
+              </BodyWrapper>
+            </Content>
+          </Layout>
+        </>
       )}
 
       <Drawer
diff --git a/src/modules/Emails/ManualTriggers/ManualTriggerForm.tsx b/src/modules/Emails/ManualTriggers/ManualTriggerForm.tsx
index 4a9054cb..a98c03af 100644
--- a/src/modules/Emails/ManualTriggers/ManualTriggerForm.tsx
+++ b/src/modules/Emails/ManualTriggers/ManualTriggerForm.tsx
@@ -6,6 +6,7 @@ import {
 } from "../../../redux/emails/emailsActions";
 import { useAppDispatch } from "../../../redux/hooks";
 import dayjs from "dayjs";
+import { CustomBtn } from "../../../shared/Global.styled";
 
 const { Option } = Select;
 
@@ -172,10 +173,11 @@ const ManualEmailTriggerForm = ({
         rules={[{ required: true, message: "Please select the time" }]}
       >
         <TimePicker
-          format="HH:mm"
+          format="hh:mm A"
           minuteStep={30}
           showNow={false}
           needConfirm={false}
+          use12Hours={true}
         />
       </Form.Item>
       <Form.Item
@@ -197,9 +199,9 @@ const ManualEmailTriggerForm = ({
         </Select>
       </Form.Item>
       <Form.Item>
-        <Button type="primary" onClick={handleSubmit} loading={loading}>
-          {isEditMode ? "Update" : "Submit"}
-        </Button>
+        <CustomBtn type="primary" onClick={handleSubmit} loading={loading}>
+          Save
+        </CustomBtn>
       </Form.Item>
     </Form>
   );
diff --git a/src/modules/Emails/ManualTriggers/ManualTriggers.tsx b/src/modules/Emails/ManualTriggers/ManualTriggers.tsx
index 673577ef..f5424384 100644
--- a/src/modules/Emails/ManualTriggers/ManualTriggers.tsx
+++ b/src/modules/Emails/ManualTriggers/ManualTriggers.tsx
@@ -1,7 +1,11 @@
 import { useState } from "react";
 import { Button, Drawer, Popconfirm, Tooltip, message, Tag } from "antd";
 import { Modal } from "antd";
-import { EditOutlined, DeleteOutlined } from "@ant-design/icons";
+import {
+  EditOutlined,
+  DeleteOutlined,
+  ReconciliationOutlined,
+} from "@ant-design/icons";
 import NotebooksImg from "../../../assets/notebooks.svg";
 import { ManualTriggersTable } from "./ManualTriggers.styled";
 import ManualEmailTriggerForm from "./ManualTriggerForm";
@@ -44,6 +48,15 @@ function ManualTriggers({
     };
     return new Date(date).toLocaleDateString("en-US", options);
   };
+
+  const format12HourTime = (time: string) => {
+    const [hours, minutes] = time.split(":");
+    const hour = parseInt(hours, 10);
+    const period = hour >= 12 ? "PM" : "AM";
+    const adjustedHour = hour % 12 || 12;
+    return `${adjustedHour}:${minutes} ${period}`;
+  };
+
   const handleDeleteTrigger = async (trigger: any) => {
     try {
       const result = await dispatch(
@@ -96,21 +109,32 @@ function ManualTriggers({
       sorter: (a: any, b: any) => a.config_name.localeCompare(b.config_name),
     },
     {
-      title: "Trigger Time(UTC)",
+      title: "Trigger Date",
       dataIndex: "date",
-      render: (text: any, record: any) => (
-        <span>
-          {formatDate(record.date)} {record.time}
-        </span>
-      ),
+      render: (text: any, record: any) => {
+        const options: Intl.DateTimeFormatOptions = {
+          year: "numeric",
+          month: "2-digit",
+          day: "2-digit",
+        };
+        const date = new Date(record.date);
+        const year = date.getFullYear();
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
+        return `${year}-${month}-${day}`;
+      },
       sorter: (a: any, b: any) => {
         const dateA = a.date ? new Date(a.date).getTime() : 0;
         const dateB = b.date ? new Date(b.date).getTime() : 0;
-        if (dateA === dateB) {
-          return a.time.localeCompare(b.time);
-        } else return dateA - dateB;
+        return dateA - dateB;
       },
     },
+    {
+      title: "Trigger Time",
+      dataIndex: "time",
+      render: (text: any) => format12HourTime(text),
+      sorter: (a: any, b: any) => a.time.localeCompare(b.time),
+    },
     {
       title: "Status",
       dataIndex: "status",
@@ -125,62 +149,64 @@ function ManualTriggers({
       },
       sorter: (a: any, b: any) => a.status.localeCompare(b.status),
     },
-    {
-      title: "Recipients",
-      dataIndex: "recipients",
-      render: (text: any, record: any) => (
-        <>
-          <Button
-            type="link"
-            onClick={() => {
-              fetchDeliveryReport(
-                record.email_config_uid,
-                record.manual_email_trigger_uid
-              );
-              handleShow(record.manual_email_trigger_uid);
-            }}
-          >
-            View Recipients
-          </Button>
-          <Modal
-            style={{
-              fontFamily: "Lato",
-              overflowY: "scroll",
-              maxHeight: "500px",
-            }}
-            width={"80%"}
-            height={"80%"}
-            open={showModal === record.manual_email_trigger_uid}
-            onOk={handleOk}
-            onCancel={handleClose}
-            key={record.manual_email_trigger_uid}
-          >
-            {deliveryReportData && deliveryReportData.length > 0 ? (
-              <EmailDeliveryReport
-                deliveryReportData={deliveryReportData}
-                slot_type="trigger"
-              />
-            ) : (
-              <p>
-                No Emails sent yet, delivery reports will be visible after
-                trigger time.
-              </p>
-            )}
-          </Modal>
-        </>
-      ),
-    },
+
     {
       title: "Action",
       key: "action",
       render: (text: any, record: any) => (
         <div>
+          <>
+            <Button
+              type="link"
+              icon={<ReconciliationOutlined />}
+              style={{ color: "green" }}
+              onClick={() => {
+                fetchDeliveryReport(
+                  record.email_config_uid,
+                  record.manual_email_trigger_uid
+                );
+                handleShow(record.manual_email_trigger_uid);
+              }}
+            >
+              View Delivery Report
+            </Button>
+            <Modal
+              style={{
+                fontFamily: "Lato",
+                ...(deliveryReportData?.length > 10 && {
+                  overflowY: "scroll",
+                  maxHeight: "500px",
+                }),
+              }}
+              width={"80%"}
+              height={"80%"}
+              open={showModal === record.manual_email_trigger_uid}
+              onOk={handleOk}
+              onCancel={handleClose}
+              key={record.manual_email_trigger_uid}
+            >
+              {deliveryReportData && deliveryReportData.length > 0 ? (
+                <EmailDeliveryReport
+                  deliveryReportData={deliveryReportData}
+                  slot_type="trigger"
+                  email_config_uid={record.email_config_uid}
+                />
+              ) : (
+                <p>
+                  No Emails sent yet, delivery reports will be visible after
+                  trigger time.
+                </p>
+              )}
+            </Modal>
+          </>
           <Tooltip title="Edit">
             <Button
               type="link"
               icon={<EditOutlined />}
               onClick={() => handleEditTrigger(record)}
-            />
+            >
+              Edit
+            </Button>
           </Tooltip>
           <Popconfirm
             title="Are you sure you want to delete this trigger?"
@@ -189,7 +215,9 @@ function ManualTriggers({
             cancelText="No"
           >
             <Tooltip title="Delete">
-              <Button type="link" icon={<DeleteOutlined />} danger />
+              <Button type="link" icon={<DeleteOutlined />} danger>
+                Delete
+              </Button>
             </Tooltip>
           </Popconfirm>
         </div>
@@ -203,14 +231,20 @@ function ManualTriggers({
         <ManualTriggersTable
           dataSource={data}
           columns={manualTriggerColumns}
-          pagination={{
-            pageSize: paginationPageSize,
-            pageSizeOptions: [10, 25, 50, 100],
-            showSizeChanger: true,
-            showQuickJumper: true,
-            onShowSizeChange: (_, size) => setPaginationPageSize(size),
-          }}
+          pagination={
+            data.length > 10
+              ? {
+                  position: ["topRight"],
+                  pageSize: paginationPageSize,
+                  pageSizeOptions: [10, 25, 50, 100],
+                  showSizeChanger: true,
+                  showQuickJumper: true,
+                  onShowSizeChange: (_, size) => setPaginationPageSize(size),
+                }
+              : false
+          }
           rowKey={(record: any) => record.manual_email_trigger_uid}
+          bordered={true}
         />
       ) : (
         <div
diff --git a/src/modules/Emails/SideMenu.tsx b/src/modules/Emails/SideMenu.tsx
index 2bcd438f..45f602ab 100644
--- a/src/modules/Emails/SideMenu.tsx
+++ b/src/modules/Emails/SideMenu.tsx
@@ -3,26 +3,18 @@ import {
   CalendarOutlined,
   MailOutlined,
   SendOutlined,
-  RightOutlined,
-  LeftOutlined,
 } from "@ant-design/icons";
-import { Menu, MenuProps, Layout, Button } from "antd";
-import { Link, useSearchParams } from "react-router-dom";
+import { Menu, MenuProps } from "antd";
 import { useEffect, useState } from "react";
-import { StyledSlider } from "./Emails.styled";
+import {
+  SideMenuWrapper,
+  MenuItem,
+  IconWrapper,
+} from "../../shared/SideMenu.styled";
 
-const { Sider } = Layout;
 function SideMenu() {
   const location = useLocation();
 
-  const [searchParams, setSearchParams] = useSearchParams();
-  const [collapsed, setCollapsed] = useState(
-    searchParams.get("collapsed") === "true"
-  );
-  useEffect(() => {
-    setSearchParams({ collapsed: collapsed + "" });
-  }, [collapsed]);
-
   const { survey_uid } = useParams<{ survey_uid?: string }>() ?? {
     survey_uid: "",
   };
@@ -34,56 +26,62 @@ function SideMenu() {
 
   const items: MenuProps["items"] = [
     {
-      icon: <CalendarOutlined />,
       label: (
-        <Link
-          className={`${isActive(
-            isActive(`/module-configuration/emails/${survey_uid}/schedules`) ||
-              isActive(`/module-configuration/emails/${survey_uid}`)
-          )}`}
-          to={`/module-configuration/emails/${survey_uid}/schedules?collapsed=${collapsed}`}
+        <MenuItem
+          className={isActive(
+            `/module-configuration/emails/${survey_uid}/schedules`
+          )}
+          to={`/module-configuration/emails/${survey_uid}/schedules`}
         >
+          <IconWrapper>
+            <CalendarOutlined />
+          </IconWrapper>
           Email Schedules
-        </Link>
+        </MenuItem>
       ),
       key: "emailSchedules",
     },
     {
-      icon: <SendOutlined />,
       label: (
-        <Link
-          className={`${isActive(
+        <MenuItem
+          className={isActive(
             `/module-configuration/emails/${survey_uid}/manual`
-          )}`}
-          to={`/module-configuration/emails/${survey_uid}/manual?collapsed=${collapsed}`}
+          )}
+          to={`/module-configuration/emails/${survey_uid}/manual`}
         >
+          <IconWrapper>
+            <SendOutlined />
+          </IconWrapper>
           Manual Triggers
-        </Link>
+        </MenuItem>
       ),
       key: "manualTriggers",
     },
     {
-      icon: <MailOutlined />,
       label: (
-        <Link
-          className={`${isActive(
+        <MenuItem
+          className={isActive(
             `/module-configuration/emails/${survey_uid}/templates`
-          )}`}
-          to={`/module-configuration/emails/${survey_uid}/templates?collapsed=${collapsed}`}
+          )}
+          to={`/module-configuration/emails/${survey_uid}/templates`}
         >
+          <IconWrapper>
+            <MailOutlined />
+          </IconWrapper>
           Email Templates
-        </Link>
+        </MenuItem>
       ),
       key: "emailTemplates",
     },
   ];
-  const [currentKey, setCurrentKey] = useState("emailSchedules");
+
+  const [current, setCurrent] = useState<string>("emailSchedules");
 
   const onClick: MenuProps["onClick"] = (e) => {
-    setCurrentKey(e.key);
+    setCurrent(e.key);
   };
 
-  const getCurrentKey = () => {
+  const getPossibleKey = () => {
     const path = location.pathname;
     if (path.includes("/manual")) return "manualTriggers";
     if (path.includes("/schedules")) return "emailSchedules";
@@ -93,38 +91,19 @@ function SideMenu() {
   };
 
   useEffect(() => {
-    const key = getCurrentKey();
-    setCurrentKey(key);
+    const key: string = getPossibleKey();
+    setCurrent(key);
   }, []);
 
-  const toggle = () => {
-    setCollapsed(!collapsed);
-  };
-
   return (
-    <StyledSlider
-      collapsible
-      collapsed={collapsed}
-      onCollapse={(value) => setCollapsed(value)}
-      theme="light"
-      trigger={null}
-    >
-      <div className="my-sider-button-container">
-        <Button
-          type="text"
-          color="primary"
-          onClick={toggle}
-          shape="circle"
-          icon={collapsed ? <RightOutlined /> : <LeftOutlined />}
-        />
-      </div>
+    <SideMenuWrapper>
       <Menu
         onClick={onClick}
-        selectedKeys={[currentKey]}
+        selectedKeys={[current]}
         mode="inline"
         items={items}
       />
-    </StyledSlider>
+    </SideMenuWrapper>
   );
 }
 
diff --git a/src/redux/emails/apiService.ts b/src/redux/emails/apiService.ts
index 53b07b17..fd4e915b 100644
--- a/src/redux/emails/apiService.ts
+++ b/src/redux/emails/apiService.ts
@@ -610,6 +610,31 @@ export const getEmailDeliveryReportSchedule = async (
   }
 };
 
+export const getEmailDeliveryReportEnumerator = async (
+  email_config_uid: string,
+  email_delivery_report_uid: string
+) => {
+  try {
+    await getCSRFToken();
+    const csrfToken = await getCookie("CSRF-TOKEN");
+
+    const response = await axios.get(
+      `${API_BASE_URL}/emails/enumerator_report?email_config_uid=${email_config_uid}&email_delivery_report_uid=${email_delivery_report_uid}`,
+      {
+        headers: {
+          "X-CSRF-Token": csrfToken,
+          "Content-Type": "application/json",
+        },
+        withCredentials: true,
+      }
+    );
+
+    return response;
+  } catch (error) {
+    return error;
+  }
+};
+
 export const getEmailDeliveryReportTrigger = async (
   email_config_uid: string,
   manual_email_trigger_uid: string
@@ -656,5 +681,6 @@ export const api = {
   getEmailTemplates,
   getEmailGsheetHeaders,
   getEmailDeliveryReportSchedule,
+  getEmailDeliveryReportEnumerator,
   getEmailDeliveryReportTrigger,
 };