diff --git a/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js b/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
index b1d3d33..1e44824 100755
--- a/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
+++ b/Watcher/Watcher/frontend/src/components/SiteMonitoring/SuspiciousSites.js
@@ -10,9 +10,9 @@ import Col from "react-bootstrap/Col";
 import Form from "react-bootstrap/Form";
 import DayPickerInput from "react-day-picker/DayPickerInput";
 import {formatDate, parseDate} from 'react-day-picker/moment';
-
+ 
 export class SuspiciousSites extends Component {
-
+ 
     constructor(props) {
         super(props);
         this.state = {
@@ -41,7 +41,7 @@ export class SuspiciousSites extends Component {
         this.webContentMonitoringRef = React.createRef();
         this.emailMonitoringRef = React.createRef();
     }
-
+ 
     static propTypes = {
         sites: PropTypes.array.isRequired,
         getSites: PropTypes.func.isRequired,
@@ -53,11 +53,11 @@ export class SuspiciousSites extends Component {
         auth: PropTypes.object.isRequired,
         error: PropTypes.object.isRequired,
     };
-
+ 
     componentDidMount() {
         this.props.getSites();
     }
-
+ 
     componentDidUpdate(prevProps) {
         if (this.props.sites !== prevProps.sites) {
             this.setState({
@@ -74,7 +74,7 @@ export class SuspiciousSites extends Component {
             }
         }
     }
-
+ 
     displayDeleteModal = (id, domainName) => {
         this.setState({
             showDeleteModal: true,
@@ -82,7 +82,7 @@ export class SuspiciousSites extends Component {
             domainName: domainName,
         });
     };
-
+ 
     deleteModal = () => {
         let handleClose;
         handleClose = () => {
@@ -90,7 +90,7 @@ export class SuspiciousSites extends Component {
                 showDeleteModal: false
             });
         };
-
+ 
         let onSubmit;
         onSubmit = e => {
             e.preventDefault();
@@ -101,7 +101,7 @@ export class SuspiciousSites extends Component {
             });
             handleClose();
         };
-
+ 
         return (
             <Modal show={this.state.showDeleteModal} onHide={handleClose} centered>
                 <Modal.Header closeButton>
@@ -123,7 +123,7 @@ export class SuspiciousSites extends Component {
             </Modal>
         );
     };
-
+ 
     displayEditModal = (site) => {
         site.expiry = site.expiry ? new Date(site.expiry) : null;
         this.setState({
@@ -138,7 +138,7 @@ export class SuspiciousSites extends Component {
             emailMonitoring: site.mail_monitoring
         });
     };
-
+ 
     editModal = () => {
         let handleClose;
         handleClose = () => {
@@ -146,7 +146,7 @@ export class SuspiciousSites extends Component {
                 showEditModal: false
             });
         };
-
+ 
         let onSubmit;
         onSubmit = e => {
             e.preventDefault();
@@ -157,9 +157,9 @@ export class SuspiciousSites extends Component {
             const ip_monitoring = this.ipMonitoringRef.current.checked;
             const content_monitoring = this.webContentMonitoringRef.current.checked;
             const mail_monitoring = this.emailMonitoringRef.current.checked;
-
+ 
             const site = {domain_name, ticket_id, rtir, expiry, ip_monitoring, content_monitoring, mail_monitoring};
-
+ 
             this.props.patchSite(this.state.id, site);
             this.setState({
                 day: "",
@@ -167,12 +167,12 @@ export class SuspiciousSites extends Component {
             });
             handleClose();
         };
-
+ 
         let handleOnChange;
         handleOnChange = e => {
             e.preventDefault();
         };
-
+ 
         return (
             <Modal show={this.state.showEditModal} onHide={handleClose} centered>
                 <Modal.Header closeButton>
@@ -276,38 +276,19 @@ export class SuspiciousSites extends Component {
             </Modal>
         );
     };
-
+ 
     displayAddModal = () => {
         this.setState({
             showAddModal: true
         });
     };
-
+ 
     addModal = () => {
-        let handleClose;
-        handleClose = () => {
-            this.setState({
-                showAddModal: false
-            });
+        let handleClose = () => {
+            this.setState({ showAddModal: false });
         };
-
-        let getMax;
-        getMax = (arr, prop) => {
-            var max;
-            if (arr.length !== 0) {
-                for (var i=0 ; i<arr.length ; i++) {
-                    if (max == null || parseInt(arr[i][prop]) > parseInt(max[prop]))
-                        max = arr[i];
-                }
-                max=max.rtir
-            } else {
-                max=0;
-            }
-            return max;
-        };
-
-        let onSubmit;
-        onSubmit = e => {
+    
+        let onSubmit = e => {
             e.preventDefault();
             const domain_name = this.inputDomainRef.current.value;
             const ticket_id = this.inputTicketRef.current.value;
@@ -315,18 +296,14 @@ export class SuspiciousSites extends Component {
             const ip_monitoring = this.ipMonitoringRef.current.checked;
             const content_monitoring = this.webContentMonitoringRef.current.checked;
             const mail_monitoring = this.emailMonitoringRef.current.checked;
-            const site = expiry ? {domain_name, ticket_id, expiry, ip_monitoring, content_monitoring, mail_monitoring} : {domain_name, ticket_id, ip_monitoring, content_monitoring, mail_monitoring};
-
+    
+            const site = { domain_name, ticket_id, expiry, ip_monitoring, content_monitoring, mail_monitoring };
+    
             this.props.addSite(site);
-            this.setState({
-                domainName: "",
-                day: "",
-                id: 0,
-                ticketId: "",
-                addLoading: true
-            });
+            this.setState({ domainName: "", day: "", ticketId: "", addLoading: true });
             handleClose();
         };
+    
         return (
             <Modal show={this.state.showAddModal} onHide={handleClose} centered>
                 <Modal.Header closeButton>
@@ -335,7 +312,7 @@ export class SuspiciousSites extends Component {
                 <Modal.Body>
                     <Container>
                         <Row className="show-grid">
-                            <Col md={{span: 12}}>
+                            <Col md={{ span: 12 }}>
                                 <Form onSubmit={onSubmit}>
                                     <Form.Group as={Row}>
                                         <Form.Label column sm="4">Domain name</Form.Label>
@@ -347,65 +324,42 @@ export class SuspiciousSites extends Component {
                                         </Col>
                                         <Form.Label column sm="4">Ticket ID</Form.Label>
                                         <Col sm="8">
-                                            <Form.Control
-                                                ref={this.inputTicketRef}
-                                                size="md"
-                                                type="text"
-                                                pattern="(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]"
-                                                placeholder="230509-200a2"
-                                                defaultValue={this.state.ticketId}/>
+                                            <Form.Control ref={this.inputTicketRef} size="md" type="text"
+                                                          pattern="(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]"
+                                                          placeholder="230509-200a2"
+                                                          defaultValue={this.state.ticketId}/>
                                         </Col>
                                         <Form.Label column sm="4">Expiry Date</Form.Label>
                                         <Col sm="8">
-                                            <DayPickerInput
-                                                style={{color: "black"}}
-                                                formatDate={formatDate}
-                                                parseDate={parseDate}
-                                                placeholder={`${formatDate(new Date())}`}
-                                                dayPickerProps={{
-                                                    disabledDays: {before: new Date()},
-                                                    fromMonth: new Date(),
-                                                    firstDayOfWeek: 1,
-                                                    fixedWeeks: true,
-                                                    showWeekNumbers: true
-                                                }}
-                                                onDayChange={day => this.setState({day})}/>
+                                            <DayPickerInput style={{ color: "black" }} formatDate={formatDate}
+                                                            parseDate={parseDate}
+                                                            placeholder={`${formatDate(new Date())}`}
+                                                            dayPickerProps={{
+                                                                disabledDays: { before: new Date() },
+                                                                fromMonth: new Date(),
+                                                                firstDayOfWeek: 1,
+                                                                fixedWeeks: true,
+                                                                showWeekNumbers: true
+                                                            }}
+                                                            onDayChange={day => this.setState({ day })}/>
                                         </Col>
                                         <Form.Label column sm="6">Ip Monitoring</Form.Label>
                                         <Col sm="6">
-                                            <Form.Check
-                                                ref={this.ipMonitoringRef}
-                                                defaultChecked={true}
-                                                className="mt-2"
-                                                type="switch"
-                                                id="custom-switch"
-                                                label=""
-                                            />
+                                            <Form.Check ref={this.ipMonitoringRef} defaultChecked={true}
+                                                        className="mt-2" type="switch" id="custom-switch" label=""/>
                                         </Col>
                                         <Form.Label column sm="6">Web Content Monitoring</Form.Label>
                                         <Col sm="6">
-                                            <Form.Check
-                                                ref={this.webContentMonitoringRef}
-                                                defaultChecked={true}
-                                                className="mt-2"
-                                                type="switch"
-                                                id="custom-switch-2"
-                                                label=""
-                                            />
+                                            <Form.Check ref={this.webContentMonitoringRef} defaultChecked={true}
+                                                        className="mt-2" type="switch" id="custom-switch-2" label=""/>
                                         </Col>
                                         <Form.Label column sm="6">Email Monitoring</Form.Label>
                                         <Col sm="6">
-                                            <Form.Check
-                                                ref={this.emailMonitoringRef}
-                                                defaultChecked={true}
-                                                className="mt-2"
-                                                type="switch"
-                                                id="custom-switch-3"
-                                                label=""
-                                            />
+                                            <Form.Check ref={this.emailMonitoringRef} defaultChecked={true}
+                                                        className="mt-2" type="switch" id="custom-switch-3" label=""/>
                                         </Col>
                                     </Form.Group>
-                                    <Col md={{span: 5, offset: 8}}>
+                                    <Col md={{ span: 5, offset: 8 }}>
                                         <Button variant="secondary" className="mr-2" onClick={handleClose}>
                                             Close
                                         </Button>
@@ -421,8 +375,9 @@ export class SuspiciousSites extends Component {
             </Modal>
         );
     };
-
-
+    
+ 
+ 
     displayExportModal = (id, domainName, ticketId, theHiveCaseId, mispEventId) => {
         this.setState({
             showExportModal: true,
@@ -433,7 +388,7 @@ export class SuspiciousSites extends Component {
             mispEventId: mispEventId
         });
     };
-
+ 
     exportModal = () => {
         let handleClose;
         handleClose = () => {
@@ -441,13 +396,13 @@ export class SuspiciousSites extends Component {
                 showExportModal: false
             });
         };
-
+ 
         let onSubmitTheHive;
         onSubmitTheHive = e => {
             e.preventDefault();
             const id = this.state.id;
             const site = {id};
-
+ 
             this.props.exportToTheHive(site);
             this.setState({
                 domainName: "",
@@ -457,13 +412,13 @@ export class SuspiciousSites extends Component {
             });
             handleClose();
         };
-
+ 
         let onSubmitMisp;
         onSubmitMisp = e => {
             e.preventDefault();
             const id = this.state.id;
             const site = {id};
-
+ 
             this.props.exportToMISP(site);
             this.setState({
                 domainName: "",
@@ -473,7 +428,7 @@ export class SuspiciousSites extends Component {
             });
             handleClose();
         };
-
+ 
         const theHiveExportButton = (
             <Button type="submit" className="btn-thehive">
                 Export to TheHive
@@ -490,7 +445,7 @@ export class SuspiciousSites extends Component {
             <Button type="submit" className="btn-misp">
                 Update MISP IOCs
             </Button>);
-
+ 
         return (
             <Modal show={this.state.showExportModal} onHide={handleClose} centered>
                 <Modal.Header closeButton>
@@ -525,8 +480,8 @@ export class SuspiciousSites extends Component {
             </Modal>
         );
     };
-
-
+ 
+ 
     render() {
         const yes_monitoring = (
             <i className="material-icons text-success mt-1 col-lg-12"
@@ -554,7 +509,7 @@ export class SuspiciousSites extends Component {
                     data-placement="top" title="Export" onClick={() => {
                 this.displayExportModal(site.id, site.domain_name, site.ticket_id, site.the_hive_case_id, site.misp_event_id)
             }} disabled={this.state.exportLoading === site.id}>
-
+ 
                 {this.state.exportLoading === site.id && (
                     <div className="loader">Loading...</div>
                 )}
@@ -564,7 +519,7 @@ export class SuspiciousSites extends Component {
                 )}
             </button>
         );
-
+ 
         return (
             <Fragment>
                 <div className="row">
@@ -654,13 +609,13 @@ export class SuspiciousSites extends Component {
         )
     }
 }
-
+ 
 const mapStateToProps = state => ({
     sites: state.SiteMonitoring.sites,
     auth: state.auth,
     error: state.errors
 });
-
+ 
 export default connect(mapStateToProps, {
     getSites,
     deleteSite,