diff --git a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js
index e71ea88a3aa39d7c44338f076f636ecadc3fd444..92c443ada67873437c3f2b7cf6a5ddb41de9d9d5 100644
--- a/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js
+++ b/src/componets/SignupEventComponents/SignupEventHistory/SignupEventHistoryMiddlePanel/SignupEventHistoryMiddlePanel.js
@@ -174,7 +174,7 @@ class SignupEventHistoryMiddlePanel extends React.Component {
                   <div className={classes.eventStatus}>{this.getEventStatusText(currentEventProfile.eventProfile.savedPhase)}</div>
                 </div>
 
-                <p className={classes.eventName} style={{ margin: "5px 0" }}>{currentEventProfile.eventProfile.description}</p>
+                <p className={classes.eventName} style={{ margin: "5px 0",wordBreak: "break-all" }}>{currentEventProfile.eventProfile.description}</p>
                 <p className={classes.eventName}><span style={{ marginRight: "5px" }}><i className="undefined one-line icon-location"></i></span>{currentEventProfile.eventProfile.location.address}</p>
               </div>
             </div>
diff --git a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
index 01c265ca1800d07e959f90d2946360d54d8642d4..11857f48e54a11307adeded70866b5b0636087a9 100644
--- a/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
+++ b/src/componets/SignupEventComponents/SignupEventInvitation/SignupEventInvitationRightPanel/SignupEventInvitationRightPanel.js
@@ -61,19 +61,19 @@ class SignupEventInvitationRightPanel extends React.Component {
 
                 <div>
                   <ul>
-                    <li className={classes.historyInfoList}>
+                    <li className={classes.historyListLi}>
                       <div className={classes.historyInfoItem} >
                         <div>{t('eventSignup.timezone')}</div>
                         <div className={classes.historyInfoContent}>{currentEventInvitation.event.timezone}</div>
                       </div>
                     </li>
-                    <li className={classes.historyInfoList}>
+                    <li className={classes.historyListLi}>
                       <div className={classes.historyInfoItem} >
                         <div>{t('eventSignup.slotTable.startDateTime')}</div>
                         <div className={classes.historyInfoContent}>{moment(slotList[0].startDate + " " + slotList[0].startTime).format("DD-MMM-YYYY hh:mm A")}</div>
                       </div>
                     </li>
-                    <li className={classes.historyInfoList}>
+                    <li className={classes.historyListLi}>
                       <div className={classes.historyInfoItem} >
                         <div>{t('eventSignup.slotTable.endDateTime')}</div>
                         <div className={classes.historyInfoContent}>{moment(slotList[0].endDate + " " + slotList[0].endTime).format("DD-MMM-YYYY hh:mm A")}</div>
diff --git a/src/containers/EventInvitation/InvitationScreen.js b/src/containers/EventInvitation/InvitationScreen.js
index 6673666ae0aa9b0d6b6acd3bf2ec33996a5981df..e6729cd101b40432dca943ed2f588782667d18c9 100644
--- a/src/containers/EventInvitation/InvitationScreen.js
+++ b/src/containers/EventInvitation/InvitationScreen.js
@@ -181,7 +181,7 @@ class InvitationScreen extends PureComponent {
         this.props.actions.showToast({
           text: this.props.t("eventSignup.updateInvitationErrorMsg"),
           duration: 5000,
-          position: "bottom"
+          position: "top"
         });
       }
     }
@@ -554,7 +554,7 @@ function TimeslotRows(props) {
             {props.datalist.length > 1 &&
               <>
                 <div className={`${props.classes.slotButton} ${props.state[v.eventSlotId] ? props.classes.checkedSlot : props.classes.uncheckedSlot}`}>
-                  <label> <span>Signup</span>
+                  <label style={{userSelect: "none"}}> <span>Signup</span>
                     <Checkbox
                       className={props.classes.checkboxSize}
                       checked={props.state[v.eventSlotId]}
diff --git a/src/layouts/EventSignupHistory/EventSignupHistory.js b/src/layouts/EventSignupHistory/EventSignupHistory.js
index b7c36f39fed3042e1cab45f4ee218cdf997f4b37..bf06ee37054edc0ff77f40cd24528b12675df19a 100644
--- a/src/layouts/EventSignupHistory/EventSignupHistory.js
+++ b/src/layouts/EventSignupHistory/EventSignupHistory.js
@@ -214,13 +214,13 @@ class EventSignupHistory extends Component {
           this.props.actions.showToast({
             text: this.props.t("err") + ":" + nextProps.cancelEventResError.data.error.message,
             duration: 2000,
-            position: "bottom"
+            position: "top"
           });
         } else {
           this.props.actions.showToast({
             text: this.props.t("err") + ":" + nextProps.cancelEventResError.error.status,
             duration: 2000,
-            position: "bottom"
+            position: "top"
           });
         }
       }
@@ -240,9 +240,15 @@ class EventSignupHistory extends Component {
       console.log(eventProfileData);
       console.log("");
 
+      this.props.actions.showToast({
+        text: this.props.t('eventSignup.cancelEventMsg'),
+        duration: 2000,
+        position: "top"
+      });
+
       this.setState({
-        msgText: this.props.t('eventSignup.cancelEventMsg'),
-        isConfirmationModalOpen: true,
+        // msgText: this.props.t('eventSignup.cancelEventMsg'),
+        // isConfirmationModalOpen: true,
         isCancelCall: false,
         displayCancelModal: false,
         eventHistoryRes: {
@@ -259,10 +265,15 @@ class EventSignupHistory extends Component {
 
     if (nextProps.removeEventProfileRes !== null && this.state.isDeleteCall) {
 
-      // alert("delete called");
+      this.props.actions.showToast({
+        text: this.props.t('eventSignup.deleteEventMsg'),
+        duration: 2000,
+        position: "top"
+      });
+
       this.setState({
-        msgText: this.props.t('eventSignup.deleteEventMsg'),
-        isConfirmationModalOpen: true,
+        // msgText: this.props.t('eventSignup.deleteEventMsg'),
+        // isConfirmationModalOpen: true,
         isDeleteCall: false,
         displayDeleteModal: false
       });
@@ -292,13 +303,13 @@ class EventSignupHistory extends Component {
           this.props.actions.showToast({
             text: this.props.t("err") + ":" + nextProps.removeEventProfileResError.data.error.message,
             duration: 5000,
-            position: "bottom"
+            position: "top"
           });
         } else {
           this.props.actions.showToast({
             text: this.props.t("err") + ":" + nextProps.removeEventProfileResError.error.status,
             duration: 5000,
-            position: "bottom"
+            position: "top"
           });
         }
       }
@@ -370,8 +381,8 @@ class EventSignupHistory extends Component {
             {t('eventSignup.cancelEventConfirmMsg')}
           </Modal.Content>
           <Modal.Buttons>
-            <button onClick={() => this.handleCancelEvent()}>{t('yes')}</button>
             <button onClick={() => this.toggleCancelConfirmModal(null, false)}>{t('no')}</button>
+            <button onClick={() => this.handleCancelEvent()}>{t('yes')}</button>
           </Modal.Buttons>
         </Modal>
 
@@ -381,8 +392,8 @@ class EventSignupHistory extends Component {
             {t('eventSignup.deleteEventConfirmMsg')}
           </Modal.Content>
           <Modal.Buttons>
-            <button onClick={() => this.handleDeleteEvent()}>{t('yes')}</button>
             <button onClick={() => this.toggleDeleteConfirmModal(null, false)}>{t('no')}</button>
+            <button onClick={() => this.handleDeleteEvent()}>{t('yes')}</button>
           </Modal.Buttons>
         </Modal>
 
diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.js
index 0a8599172c8a2e0cf78b0bab9719b7b92180bccb..36cfae35789e64509f1dfddda40ef70d97e14a26 100644
--- a/src/layouts/EventSignupInvitation/EventSignupInvitation.js
+++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.js
@@ -219,14 +219,14 @@ class EventSignupInvitation extends React.Component {
         this.props.actions.showToast({
           text: this.props.t("err") + ":" + nextProps.updateInvitationResError.data.error.message,
           duration: 5000,
-          position: "bottom"
+          position: "top"
         });
 
       } else {
         this.props.actions.showToast({
           text: this.props.t("eventSignup.updateInvitationErrorMsg"),
           duration: 5000,
-          position: "bottom"
+          position: "top"
         });
       }
     }
@@ -366,8 +366,8 @@ class EventSignupInvitation extends React.Component {
             {t('eventSignup.cancelInvitationMsg')}
           </Modal.Content>
           <Modal.Buttons>
-            <button onClick={() => this.handleEditEventInvitation(1, true)}>{t('yes')}</button>
             <button onClick={() => this.setState({ isShowCancel: false })}>{t('no')}</button>
+            <button onClick={() => this.handleEditEventInvitation(1, true)}>{t('yes')}</button>
           </Modal.Buttons>
         </Modal>
 
diff --git a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
index 346336d6722cbef3262fd71030d79aab03bccacf..2e54b5ac3c7d4b6d9a15f07c3c1d6771255e8971 100644
--- a/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
+++ b/src/layouts/EventSignupInvitation/EventSignupInvitation.styles.js
@@ -120,7 +120,7 @@ export default (theme, contactAvatarImg) => ({
         display: "flex",
         justifyContent: "space-around",
         alignItems: "center",
-        paddingRight:'12px',
+        paddingRight: '12px',
         "& li": {
             width: "30%",
             textAlign: "center",
@@ -186,8 +186,8 @@ export default (theme, contactAvatarImg) => ({
         '&:hover': {
             background: theme.palette.themeColors.contactList.hoverBackground
         },
-        '&.active': {            
-            background:theme.palette.themeColors.selectedContent.background,
+        '&.active': {
+            background: theme.palette.themeColors.selectedContent.background,
         },
         '&:nth-child(3) [class*="avatar-box"]': {
             background: `url(${contactAvatarImg}) 0 no-repeat`,
@@ -246,8 +246,8 @@ export default (theme, contactAvatarImg) => ({
         background: theme.palette.themeColors.createGroup.slideBackground,
         fontWeight: "600",
         fontSize: "12px",
-        lineHeight:'2.5',
-        width:'100%',
+        lineHeight: '2.5',
+        width: '100%',
     },
     historyCountBox: {
         display: "flex",
@@ -259,7 +259,7 @@ export default (theme, contactAvatarImg) => ({
     },
 
     invitationDetail: {
-        position : "relative",
+        position: "relative",
         color: theme.palette.themeColors.contactList.personNameColor,
         fontSize: "13px",
         fontWeight: "600",
@@ -270,15 +270,15 @@ export default (theme, contactAvatarImg) => ({
             fontWeight: "400"
         }
     },
-    menuOptions:{
-        position:"absolute",
-        top :"0",
-        right:"0",
-        padding:"0"
+    menuOptions: {
+        position: "absolute",
+        top: "0",
+        right: "0",
+        padding: "0"
     },
 
 
-   menuItem: {
+    menuItem: {
         // width: 180,
         fontSize: '0.9rem',
         height: "25px"
@@ -291,24 +291,24 @@ export default (theme, contactAvatarImg) => ({
         textOverflow: 'ellipsis',
     },
 
-   
+
     historyInfoList: {
         padding: "10px 5px",
         borderBottom: "1px solid #494949",
         textOverflow: "ellipsis",
-        cursor:'pointer',
+        cursor: 'pointer',
         '& .historyInfoItem': {
             display: "flex",
             justifyContent: "space-between",
             alignItems: "center",
             color: theme.palette.themeColors.contactList.personNameColor,
             fontSize: "12px",
-            '& .leftIcon':{
+            '& .leftIcon': {
                 color: "#4c4e52",
-                '& i':{
+                '& i': {
                     transform: "rotate(-92deg)",
                     marginRight: '3px',
-                    fontSize: '6px',                    
+                    fontSize: '6px',
                 }
             },
         },
@@ -316,16 +316,37 @@ export default (theme, contactAvatarImg) => ({
             background: theme.palette.themeColors.contactList.hoverBackground
         },
         '&.active': {
-            background:theme.palette.themeColors.selectedContent.darkActive,
+            background: theme.palette.themeColors.selectedContent.darkActive,
             '& .historyInfoItem': {
-                '& .leftIcon':{
-                    color:"#fff",
+                '& .leftIcon': {
+                    color: "#fff",
                 },
             },
         }
     },
 
-    liDisable:{
+    historyListLi: {
+        padding: "10px 5px",
+        borderBottom: "1px solid #494949",
+        textOverflow: "ellipsis",
+        '& .historyInfoItem': {
+            display: "flex",
+            justifyContent: "space-between",
+            alignItems: "center",
+            color: theme.palette.themeColors.contactList.personNameColor,
+            fontSize: "12px",
+            '& .leftIcon': {
+                color: "#4c4e52",
+                '& i': {
+                    transform: "rotate(-92deg)",
+                    marginRight: '3px',
+                    fontSize: '6px',
+                }
+            },
+        }
+    },
+
+    liDisable: {
         pointerEvents: 'none',
         opacity: 0.6
     },
@@ -348,9 +369,9 @@ export default (theme, contactAvatarImg) => ({
         '& .invitationInfoTitle': {
             color: theme.palette.themeColors.contactList.personNameColor
         },
-        '& .leftIcon':{
+        '& .leftIcon': {
             color: "#4c4e52",
-            '& i':{
+            '& i': {
                 transform: "rotate(-92deg)",
                 marginRight: '3px',
                 fontSize: '6px',
@@ -360,22 +381,22 @@ export default (theme, contactAvatarImg) => ({
             background: theme.palette.themeColors.contactList.hoverBackground
         },
         '&.active': {
-            background:theme.palette.themeColors.selectedContent.darkActive,
-            '& .leftIcon':{
-                color:"#fff",
+            background: theme.palette.themeColors.selectedContent.darkActive,
+            '& .leftIcon': {
+                color: "#fff",
             },
         }
     },
-    eventSlotHeading:{
+    eventSlotHeading: {
         color: theme.palette.themeColors.colors.text11,
         padding: "0px 12px 0px",
         background: theme.palette.themeColors.createGroup.slideBackground,
         fontSize: "12px",
         fontWeight: "600",
         // marginBottom:"20px",
-        width:'100%',
-        lineHeight:'2.6',
-        width:'100%',
+        width: '100%',
+        lineHeight: '2.6',
+        width: '100%',
     },
 
     invitationTextbox: {
@@ -389,9 +410,9 @@ export default (theme, contactAvatarImg) => ({
             color: theme.palette.themeColors.chatBottomPanel.inputColor,
         }
     },
-    inviteEventItems:{
-        display:"flex",
-        alignItems:"center",
+    inviteEventItems: {
+        display: "flex",
+        alignItems: "center",
     },
     invitationNoteHeading: {
         fontSize: "12px",
@@ -400,25 +421,25 @@ export default (theme, contactAvatarImg) => ({
         background: theme.palette.themeColors.createGroup.slideBackground,
         fontWeight: 600,
         marginTop: "20px",
-        overflow:'hidden',
+        overflow: 'hidden',
         wordBreak: 'break-word',
     },
-    eventStatus:{
+    eventStatus: {
         color: "#fff",
         backgroundColor: "#5cb85c",
         borderRadius: "15px",
         float: "right",
         padding: "3px 10px",
         fontSize: "12px",
-        textAlign:'center',
-        minWidth:'45px',
+        textAlign: 'center',
+        minWidth: '45px',
     },
-    inviteDetails:{
+    inviteDetails: {
         // display:"flex",
         alignItems: "center",
         cursor: "pointer",
     },
-    
+
     headerContainer: {
         position: 'relative'
     },
@@ -468,7 +489,7 @@ export default (theme, contactAvatarImg) => ({
     membersPanel: {
         //left: 490,
         left: 587,
-        width:382,
+        width: 382,
         zIndex: 7,
         background: theme.palette.themeColors.createGroup.membersPanelBackground,
         borderRight: '1px solid ' + theme.palette.themeColors.createGroup.membersPanelBackground,
@@ -901,7 +922,7 @@ export default (theme, contactAvatarImg) => ({
         fontSize: "13px",
         color: theme.palette.themeColors.table.color,
         border: "1px solid #454d55",
-        textAlign:'left',
+        textAlign: 'left',
         '& tr': {
             display: "table-row",
             '& td': {
@@ -910,7 +931,7 @@ export default (theme, contactAvatarImg) => ({
                 verticalAlign: "top",
                 borderBottomWidth: "1px",
                 maxWidth: '160px',
-                minWidth:'100px',
+                minWidth: '100px',
                 textOverflow: 'ellipsis',
                 overflow: 'hidden',
             },
@@ -927,43 +948,43 @@ export default (theme, contactAvatarImg) => ({
             '&:nth-of-type(odd)': {
                 backgroundColor: theme.palette.themeColors.tableDark.background
             },
-            '&:nth-of-type(even)': {                
+            '&:nth-of-type(even)': {
                 backgroundColor: theme.palette.themeColors.table.background
             }
         }
     },
-     
-    invitationNote:{
-        marginTop:"15px",
+
+    invitationNote: {
+        marginTop: "15px",
     },
-    invitationNoteTitle:{
-        fontSize:"12px",
-        marginBottom:'6px',
-        fontWeight:600
+    invitationNoteTitle: {
+        fontSize: "12px",
+        marginBottom: '6px',
+        fontWeight: 600
     },
-    invitationNoteComment:{
-        fontSize:'12px',
+    invitationNoteComment: {
+        fontSize: '12px',
         wordBreak: "break-word",
     },
-    hEventAction:{
-        '& button':{
-          // border: "1px solid #777",
-          fontSize: "12px",
-          borderRadius: "20px",
-          padding: "0px 10px",
-          background: theme.palette.themeColors.colors.background16,
-          color: theme.palette.themeColors.colors.text14,
-          marginLeft:'5px',
-          lineHeight:'1.5',
+    hEventAction: {
+        '& button': {
+            // border: "1px solid #777",
+            fontSize: "12px",
+            borderRadius: "20px",
+            padding: "0px 10px",
+            background: theme.palette.themeColors.colors.background16,
+            color: theme.palette.themeColors.colors.text14,
+            marginLeft: '5px',
+            lineHeight: '1.5',
             '&:hover': {
-              backgroundColor: theme.palette.themeColors.colors.background14,
-              color: theme.palette.themeColors.colors.text16,
+                backgroundColor: theme.palette.themeColors.colors.background14,
+                color: theme.palette.themeColors.colors.text16,
             },
             '&.active': {
-              background: theme.palette.themeColors.colors.background4
+                background: theme.palette.themeColors.colors.background4
             },
         }
-      },
+    },
     //   noResultIconWrapp: {
     //     display: 'flex',
     //     justifyContent: 'center',
diff --git a/src/layouts/EventSignupNew/EventSignupNew.js b/src/layouts/EventSignupNew/EventSignupNew.js
index a384c94f114a20314bfe48b6b31a85b787b8001c..1ca8c0735a350729befa8085960dc60758dbd172 100644
--- a/src/layouts/EventSignupNew/EventSignupNew.js
+++ b/src/layouts/EventSignupNew/EventSignupNew.js
@@ -134,7 +134,8 @@ class EventSignupNew extends Component {
       accountsDetails: this.props.accountsDetails,
       isGroupsMode: false,
       remindMeArr: RemindMeSettings,
-      displayEmailSmsMsgModel: false
+      displayEmailSmsMsgModel: false,
+      remindBeforeTmp: 0,
     };
   }
 
@@ -295,6 +296,8 @@ class EventSignupNew extends Component {
       eventAddFormStep: 1,
       backBtnStep: 0,
       isPublishTs: 0,
+      isScheduleTs: 0,
+      isReminderTs: 0,
       saveAndNxtBtn: false,
       isSelectedParticipents: false,
       isSchedule: false,
@@ -513,6 +516,7 @@ class EventSignupNew extends Component {
       Number(hours.value) >= 0
     ) {
       this.setState({ startTimeHours: hours });
+      this.updateTimeStamp('start');
     } else {
       this.setState({ startTimeHours: '' });
     }
@@ -571,6 +575,7 @@ class EventSignupNew extends Component {
     if (
       mode &&
       mode.value &&
+      mode.value.length <=2 &&
       (mode.value.toLowerCase() === "am" || mode.value.toLowerCase() === "pm")
     ) {
       this.setState({ endTimeMode: mode.value });
@@ -610,6 +615,7 @@ class EventSignupNew extends Component {
     if (
       mode &&
       mode.value &&
+      mode.value.length <=2 &&
       (mode.value.toLowerCase() === "am" || mode.value.toLowerCase() === "pm")
     ) {
       this.setState({ scheduleTimeMode: mode.value });
@@ -623,7 +629,6 @@ class EventSignupNew extends Component {
   handleCalendarOnFocus = () => {
     this.setState({ isClaendarOpen: true });
   };
-
   validateStartHours = (hours) => {
     let alowedvalues = this.getAllowedValues('hours');
     if (hours && hours !== '') {
@@ -638,7 +643,7 @@ class EventSignupNew extends Component {
   validateStartMinutes = (minutes) => {
     let alowedvalues = this.getAllowedValues();
     if (minutes && minutes !== '') {
-      if (alowedvalues.indexOf(Number(minutes)) !== -1) {
+      if (alowedvalues.indexOf(Number(minutes)) !== -1  || minutes == '00'){
         this.setState({ startTimeMinutes: { label: minutes, value: minutes } }, () => {
         });
       } else {
@@ -646,6 +651,19 @@ class EventSignupNew extends Component {
       }
     }
   }
+  validateStartTimeMode = (timeFormat) => {
+    if (timeFormat && timeFormat.length <= 2) {
+      let format = timeFormat.charAt(0).toUpperCase();
+      if (format === 'A') {
+        this.setState({ startTimeMode: 'AM' });
+      } else {
+        this.setState({ startTimeMode: 'PM' });
+      }
+    } else if (timeFormat && timeFormat.length > 2) {
+      this.setState({ startTimeMode: '' });
+    }
+  }
+
   validateEndHours = (hours) => {
     let alowedvalues = this.getAllowedValues('hours');
     if (hours && hours !== '') {
@@ -657,10 +675,10 @@ class EventSignupNew extends Component {
       }
     }
   }
-  validateEndMinutes = (minutes) => {
+  validateEndMinutes = (minutes) => {    
     let alowedvalues = this.getAllowedValues();
     if (minutes && minutes !== '') {
-      if (alowedvalues.indexOf(Number(minutes)) !== -1) {
+      if (alowedvalues.indexOf(Number(minutes)) !== -1  || minutes == '00') {
         this.setState({ endTimeMinutes: { label: minutes, value: minutes } }, () => {
         });
       } else {
@@ -668,6 +686,19 @@ class EventSignupNew extends Component {
       }
     }
   }
+  validateEndTimeMode = (timeFormat) => {
+    if (timeFormat && timeFormat.length <= 2) {
+      let format = timeFormat.charAt(0).toUpperCase();
+      if (format === 'A') {
+        this.setState({ endTimeMode: 'AM' });
+      } else {
+        this.setState({ endTimeMode: 'PM' });
+      }
+    } else if (timeFormat && timeFormat.length > 2) {
+      this.setState({ endTimeMode: '' });
+    }
+  }
+
   validateScheduleHours = (hours) => {
     let alowedvalues = this.getAllowedValues('hours');
     if (hours && hours !== '') {
@@ -682,14 +713,29 @@ class EventSignupNew extends Component {
   validateScheduleMinutes = (minutes) => {
     let alowedvalues = this.getAllowedValues();
     if (minutes && minutes !== '') {
-      if (alowedvalues.indexOf(Number(minutes)) !== -1) {
+      if (alowedvalues.indexOf(Number(minutes)) !== -1  || minutes == '00') {
         this.setState({ scheduleTimeMinutes: { label: minutes, value: minutes } }, () => {
         });
       } else {
         this.setState({ scheduleTimeMinutes: { label: '', value: '' } });
       }
     }
-  }  
+  } 
+  validateScheduleTimeMode = (timeFormat) => {
+    if (timeFormat && timeFormat.length <= 2) {
+      let format = timeFormat.charAt(0).toUpperCase();
+      if (format === 'A') {
+        this.setState({ scheduleTimeMode: 'AM' });
+      } else {
+        this.setState({ scheduleTimeMode: 'PM' });
+      }
+    } else if (timeFormat && timeFormat.length > 2) {
+      this.setState({ scheduleTimeMode: '' });
+    }
+  }
+
+  updateTimeStamp = (type) => {
+  }
   getAllowedValues = (type='min') =>{
     let values = ScheduleMinutesOptions;
     if(type=='hours'){
@@ -969,11 +1015,6 @@ class EventSignupNew extends Component {
 
       const phaseEnumArr = ["ONE", "TWO", "SAVED", "SCHEDULED", "PUBLISHED"];
       const ActionEnumArr = ["CREATE", "UPDATE", "SAVE", "SCHEDULE", "PUBLISH"];
-      let reminderBeforeSec = 0;
-      if (this.state.isReminder) {
-        reminderBeforeSec =
-          this.state.reminder.ms > 0 ? this.state.reminder.ms / 1000 : 0;
-      }
 
       // schedule time format
       let scheduleTimeArr = this.getHourMin(
@@ -982,6 +1023,39 @@ class EventSignupNew extends Component {
         this.state.scheduleTimeMode
       );
 
+      let isUpdateSchedule = this.state.isSchedule ? true : false;
+      // if(this.state.editModeInternalUse && this.state.isScheduleTs > 0){
+      //   isUpdateSchedule = !this.state.isSchedule ? true : false;
+      // }  
+      
+      let isUpdateReminder = this.state.isReminder; 
+      let reminderBeforeSec =  this.state.reminder.ms > 0 ? this.state.reminder.ms / 1000 : 0;
+      if(this.state.editModeInternalUse && this.state.isPublishTs>0){
+          if(this.state.isReminderTs > 0){
+            isUpdateReminder = false;
+            if(!this.state.isReminder){
+              isUpdateReminder = true;
+              reminderBeforeSec = 0;
+            } else {
+              isUpdateReminder = ( parseInt(reminderBeforeSec)===parseInt(this.state.remindBeforeTmp) ) ? false : true;
+              reminderBeforeSec = (isUpdateReminder) ? reminderBeforeSec : 0;
+            }            
+          } else {
+            if(this.state.isReminder){
+              isUpdateReminder = true;
+            }
+          }
+      } else {
+        isUpdateReminder = false;
+      }
+      console.log(
+        {
+          isUpdateSchedule: isUpdateSchedule,
+          isUpdateReminder: isUpdateReminder,
+          reminderBeforeSec: reminderBeforeSec,
+          state:this.state
+        }
+      );
       const eventId = this.state.eventId;
       const title = this.state.eventTitle;
       const inviterName = this.state.inviterName;
@@ -995,15 +1069,15 @@ class EventSignupNew extends Component {
       const nynjaGroupIds = groupsArr;
       const emailIds = emailsArr;
       const mobileNoArr = numbersArr;
+      const scheduleTimezone = this.state.scheduleTimezone.value;
       const scheduleDate = this.state.isSchedule ? this.state.scheduleDate.format("YYYY-MM-DD") : "";
       const scheduleTime = this.state.isSchedule ? scheduleTimeArr[1] + ":" + scheduleTimeArr[2] : "";
-      const isSendReminder = this.state.isReminder;
       const reminderDate = "";
       const reminderTime = "";
       const isNotifyAdmin = this.state.isNotifyAdmin;
-      const updateSchedule = this.state.isSchedule ? true : false;
-      const updateReminder = false;
-      const scheduleTimezone = this.state.scheduleTimezone.value;
+      const updateSchedule = isUpdateSchedule; //this.state.isSchedule ? true : false;
+      const isSendReminder = this.state.isReminder;
+      const updateReminder = isUpdateReminder;
       const remindBefore = reminderBeforeSec; //In seconds
       const notifyOnUpdate = this.state.notifyOnUpdate; //bool
       if (this.state.eventAddFormStep === 1) {
@@ -1041,9 +1115,6 @@ class EventSignupNew extends Component {
           return;
         }
 
-        console.log("emailIds.length ", emailIds.length);
-        console.log("mobileNoArr.length ", mobileNoArr.length);
-        console.log("isCalledByEmailSms ", isCalledByEmailSms);
         if (emailIds.length === 0 && mobileNoArr.length === 0 && !isCalledByEmailSms) {
           this.setState({ displayEmailSmsMsgModel: true, isLoader: false });
           return;
@@ -1094,11 +1165,6 @@ class EventSignupNew extends Component {
         //   usersArr = [];
         //   groupsArr = []; 
         // }
-        console.log('notifyOnUpdate::', usersArr,
-          groupsArr,
-          emailsArr,
-          numbersArr, this.state, notifyOnUpdate);
-
         this.saveEventApiCall(
           action,
           eventId,
@@ -1514,11 +1580,12 @@ class EventSignupNew extends Component {
     }
 
     /* ***** start set reminderBefore Obj ***** */
+    let reminderMs = 0;
     let isReminderFlag = false;
     let reminderObj = { value: "", label: "", ms: 0 };
     if (data.reminderTs > 0 && data.remindBefore >= 0) {
       isReminderFlag = true;
-      const reminderMs = data.remindBefore * 1000;
+      reminderMs = data.remindBefore * 1000;
       this.state.remindMeArr.map(function (v, k) {
         if (reminderMs == v.ms) {
           reminderObj = v;
@@ -1547,7 +1614,7 @@ class EventSignupNew extends Component {
       scheduleObj.scheduleTimezone = { value: data.scheduleTimezone, label: data.scheduleTimezone };
     }
     /* ***** end set schedules dateTime ***** */
-
+    
     /* ***** start set location obj ***** */
     let location = data.location;
     location.lat = data.location.latitude;
@@ -1602,6 +1669,7 @@ class EventSignupNew extends Component {
       // step 3
       isReminder: isReminderFlag,
       reminder: reminderObj,
+      remindBeforeTmp: reminderMs,
       isSchedule: scheduleObj.isSchedule,
       scheduleDate: scheduleObj.scheduleDate,
       scheduleStamp: ts.getTime(),
@@ -1611,6 +1679,8 @@ class EventSignupNew extends Component {
       scheduleTimezone: scheduleObj.scheduleTimezone,
       notifyOnUpdate: false,
       isPublishTs: data.publishedTs,
+      isReminderTs: data.reminderTs,
+      isScheduleTs: data.scheduledTs,
       backBtnStep: 0,
       isNotifyAdmin: data.isNotifyAdmin,
       inviterName: inviterName,
@@ -2001,7 +2071,7 @@ class EventSignupNew extends Component {
                       native={false}
                       children={CountryOptionsSettings}
                       onChange={timezone => {
-                        this.setState({ timezone });
+                        this.setState({ timezone: (timezone===null) ? { value: "", label: "" } : timezone });
                       }}
                       disabled={isDisabledTimes}
                     />
@@ -2068,6 +2138,7 @@ class EventSignupNew extends Component {
                           onChangeModes={this.handleChangeStartTimeMode}
                           validateHours={this.validateStartHours}
                           validateMinutes={this.validateStartMinutes}
+                          validateMode={this.validateStartTimeMode}
                           isDisabled={isDisabledTimes}
                         />
                       </div>
@@ -2098,6 +2169,7 @@ class EventSignupNew extends Component {
                           onChangeModes={this.handleChangeEndTimeMode}
                           validateHours={this.validateEndHours}
                           validateMinutes={this.validateEndMinutes}
+                          validateMode={this.validateEndTimeMode}
                           isDisabled={isDisabledTimes}
                         />
                       </div>
@@ -2163,6 +2235,7 @@ class EventSignupNew extends Component {
                         onChangeModes={this.handleChangeStartTimeMode}
                         validateHours={this.validateStartHours}
                         validateMinutes={this.validateStartMinutes}
+                        validateMode={this.validateStartTimeMode}
                         isDisabled={isDisabledTimes}
                       />
                     </div>
@@ -2198,6 +2271,7 @@ class EventSignupNew extends Component {
                         onChangeModes={this.handleChangeEndTimeMode}
                         validateHours={this.validateEndHours}
                         validateMinutes={this.validateEndMinutes}
+                        validateMode={this.validateEndTimeMode}
                         isDisabled={isDisabledTimes}
                       />
                     </div>
@@ -2611,7 +2685,7 @@ class EventSignupNew extends Component {
                               native={false}
                               children={CountryOptionsSettings}
                               onChange={scheduleTimezone => {
-                                this.setState({ scheduleTimezone });
+                                this.setState({ scheduleTimezone: (scheduleTimezone===null) ? { value: "", label: "" } : scheduleTimezone });
                               }}
                             />
                           </div>
@@ -2675,7 +2749,7 @@ class EventSignupNew extends Component {
                               className={`${classes.timePikerBox}`}
                               value={this.state.scheduleTimeMode}
                               onChange={this.handleChangeScheduleTimeMode}
-                              //onInputChange={validateTimeFormats}
+                              onInputChange={this.validateScheduleTimeMode}
                               //disabled={isDisabled}
                               options={[
                                 { value: "AM", label: "AM" },
diff --git a/src/layouts/EventSignupNew/subcomponents/TimePicker.js b/src/layouts/EventSignupNew/subcomponents/TimePicker.js
index 0c17156e8959b851a0eb9151bad5f26d2fa471cc..992a972746387825a448f1e6b109f442e03264a6 100644
--- a/src/layouts/EventSignupNew/subcomponents/TimePicker.js
+++ b/src/layouts/EventSignupNew/subcomponents/TimePicker.js
@@ -51,6 +51,7 @@ class TimePicker extends Component {
             className={`${this.props.classes.timePikerBox} ${this.props.isDisabled ? 'disableField' : ''}`}
             value={this.props.valueModes}
             onChange={this.props.onChangeModes}
+            onInputChange={this.props.validateMode}
             options={[
               { value: 'AM', label: 'AM' },
               { value: 'PM', label: 'PM' }