diff --git a/ui/src/components/map/EnrichedLayerFeatures.tsx b/ui/src/components/map/EnrichedLayerFeatures.tsx
index 2ee987d4..0cfaf80b 100644
--- a/ui/src/components/map/EnrichedLayerFeatures.tsx
+++ b/ui/src/components/map/EnrichedLayerFeatures.tsx
@@ -122,7 +122,7 @@ const EnrichedSymbolSource = (props: EnrichedFeaturesProps) => {
         layout={{
           "icon-image": ["coalesce", ["get", "icon"], "default_marker"],
           "icon-allow-overlap": true,
-          "icon-size": ["interpolate", ["linear"], ["zoom"], 12, 0.1, 17, 1],
+          "icon-size": ["interpolate", ["linear"], ["zoom"], 12, 0.1, 17, 1.4],
           "icon-rotation-alignment": "map",
           "icon-pitch-alignment": "map",
           "icon-rotate": ["coalesce", ["get", "iconRotation"], 0],
diff --git a/ui/src/utils/ReloadSWPrompt.tsx b/ui/src/utils/ReloadSWPrompt.tsx
index 8d0dd951..ba2b7523 100644
--- a/ui/src/utils/ReloadSWPrompt.tsx
+++ b/ui/src/utils/ReloadSWPrompt.tsx
@@ -11,10 +11,11 @@ export function ReloadPrompt() {
   } = useRegisterSW({
     onRegistered(r) {
       console.log("SW Registered: " + r);
-      r &&
-        setInterval(() => {
-          r.update();
-        }, intervalMS);
+      if (r === undefined) return;
+
+      setInterval(() => {
+        r.update();
+      }, intervalMS);
       setOfflineReady(true);
     },
     onRegisterError(error) {
diff --git a/ui/src/utils/useDebounce.tsx b/ui/src/utils/useDebounce.tsx
index ccc87f6c..eb2e16fb 100644
--- a/ui/src/utils/useDebounce.tsx
+++ b/ui/src/utils/useDebounce.tsx
@@ -1,25 +1,22 @@
 import { useEffect, useState } from "react";
 
-// Hook
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function useDebounce(value: any, delay: number) {
-    // State and setters for debounced value
-    const [debouncedValue, setDebouncedValue] = useState(value);
-    useEffect(
-        () => {
-            // Update debounced value after delay
-            const handler = setTimeout(() => {
-                setDebouncedValue(value);
-            }, delay);
-            // Cancel the timeout if value changes (also on delay change or unmount)
-            // This is how we prevent debounced value from updating if value is changed ...
-            // .. within the delay period. Timeout gets cleared and restarted.
-            return () => {
-                clearTimeout(handler);
-            };
-        },
-        [value, delay]
-    );
-    return debouncedValue;
+  // State and setters for debounced value
+  const [debouncedValue, setDebouncedValue] = useState(value);
+  useEffect(() => {
+    // Update debounced value after delay
+    const handler = setTimeout(() => {
+      setDebouncedValue(value);
+    }, delay);
+    // Cancel the timeout if value changes (also on delay change or unmount)
+    // This is how we prevent debounced value from updating if value is changed ...
+    // .. within the delay period. Timeout gets cleared and restarted.
+    return () => {
+      clearTimeout(handler);
+    };
+  }, [value, delay]);
+  return debouncedValue;
 }
 
-export default useDebounce;
\ No newline at end of file
+export default useDebounce;
diff --git a/ui/src/utils/useLocalStorage.tsx b/ui/src/utils/useLocalStorage.tsx
index 7a895efe..3dbf9184 100644
--- a/ui/src/utils/useLocalStorage.tsx
+++ b/ui/src/utils/useLocalStorage.tsx
@@ -143,7 +143,6 @@ export function useLocalStorage<T>(
     const value = readValue();
     setValue(value);
     setStoredValue(value);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [key]);
 
   const handleStorageChange = useCallback(
diff --git a/ui/src/views/incident/List.tsx b/ui/src/views/incident/List.tsx
index d81dbe58..c77be419 100644
--- a/ui/src/views/incident/List.tsx
+++ b/ui/src/views/incident/List.tsx
@@ -6,7 +6,7 @@ import {
   faEyeLowVision,
   faFolderClosed,
   faFolderOpen,
-  faPlusCircle
+  faPlusCircle,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import classNames from "classnames";
@@ -19,24 +19,21 @@ import { useNavigate } from "react-router-dom";
 import { Incident, IncidentListData } from "../../types";
 import { CloseIncident, GetIncidentDetails, GetIncidents } from "./graphql";
 
-
 function List() {
   const [filterClosed, setFilterClosed] = useState(true);
   const navigate = useNavigate();
   const { t } = useTranslation();
 
-  const { loading, error, data } = useQuery<IncidentListData>(GetIncidents,
-    {
-      pollInterval: 10000,
-    }
-  );
+  const { loading, error, data } = useQuery<IncidentListData>(GetIncidents, {
+    pollInterval: 10000,
+  });
 
   if (error) return <div className="notification is-danger">{error.message}</div>;
   if (loading) return <Spinner />;
 
   return (
     <div>
-      <h3 className="title is-size-3 is-capitalized">{t('incidents')}</h3>
+      <h3 className="title is-size-3 is-capitalized">{t("incidents")}</h3>
       <div className="buttons">
         <button
           className="button is-success is-small is-responsive is-rounded is-light is-capitalized"
@@ -45,7 +42,7 @@ function List() {
           <span className="icon is-small">
             <FontAwesomeIcon icon={faPlusCircle} />
           </span>
-          <span>{t('create')}</span>
+          <span>{t("create")}</span>
         </button>
         <button
           className="button is-primary is-small is-responsive is-rounded is-light"
@@ -54,7 +51,7 @@ function List() {
           <span className="icon is-small">
             <FontAwesomeIcon icon={filterClosed ? faEye : faEyeLowVision} />
           </span>
-          <span>{filterClosed ? t('showClosed') : t('hideClosed')}</span>
+          <span>{filterClosed ? t("showClosed") : t("hideClosed")}</span>
         </button>
       </div>
       <IncidentCards
@@ -66,45 +63,48 @@ function List() {
 
 function IncidentCards(props: { incidents: Incident[] }) {
   const { incidents } = props;
-  const [closeIncident] = useMutation(CloseIncident, {
-    refetchQueries: [{ query: GetIncidents }, { query: GetIncidentDetails }],
-  });
 
   return (
     <div className="container-flex">
-      {
-        incidents.map((incident) => (
-          <IncidentCard key={incident.id} incident={incident} closeIncident={closeIncident} />
-        ))
-      }
-    </div >
-  )
+      {incidents.map((incident) => (
+        <IncidentCard key={incident.id} incident={incident} />
+      ))}
+    </div>
+  );
 }
 
-function IncidentCard(props: { incident: Incident, closeIncident: any }) {
-  const { incident, closeIncident } = props;
+function IncidentCard(props: { incident: Incident }) {
+  const { incident } = props;
   const navigate = useNavigate();
+  const [closeIncident] = useMutation(CloseIncident, {
+    refetchQueries: [{ query: GetIncidents }, { query: GetIncidentDetails }],
+  });
 
   const cardClass = classNames({
     card: true,
     "mb-3": true,
-    "has-background-primary-light": incident.closedAt
+    "has-background-primary-light": incident.closedAt,
   });
   return (
-    <div className={cardClass} >
+    <div className={cardClass}>
       <div className="card-content">
         <div className="content has-text-small">
           <h4 className="title is-5">{incident.name}</h4>
           <div className="columns">
             <div className="column is-one-third">
-              <strong>{t('location')}: </strong>{incident.location.name}
+              <strong>{t("location")}: </strong>
+              {incident.location.name}
             </div>
             <div className="column is-one-third">
-              <strong>{t('createdAt')}: </strong>{dayjs(incident.createdAt).format("LLL")}
+              <strong>{t("createdAt")}: </strong>
+              {dayjs(incident.createdAt).format("LLL")}
             </div>
-            {incident.closedAt && <div className="column">
-              <strong>{t('closedAt')}: </strong>{dayjs(incident.closedAt).format("LLL")}
-            </div>}
+            {incident.closedAt && (
+              <div className="column">
+                <strong>{t("closedAt")}: </strong>
+                {dayjs(incident.closedAt).format("LLL")}
+              </div>
+            )}
           </div>
         </div>
       </div>
@@ -116,16 +116,13 @@ function IncidentCard(props: { incident: Incident, closeIncident: any }) {
           <span className="icon">
             <FontAwesomeIcon icon={faArrowRightFromBracket} />
           </span>
-          <span>{t('enter')}</span>
+          <span>{t("enter")}</span>
         </button>
-        <button
-          className="card-footer-item is-ahref is-capitalized"
-          onClick={() => navigate(`../${incident.id}/edit`)}
-        >
+        <button className="card-footer-item is-ahref is-capitalized" onClick={() => navigate(`../${incident.id}/edit`)}>
           <span className="icon">
             <FontAwesomeIcon icon={faEdit} />
           </span>
-          <span>{t('edit')}</span>
+          <span>{t("edit")}</span>
         </button>
         {incident.closedAt === null ? (
           <button
@@ -142,7 +139,7 @@ function IncidentCard(props: { incident: Incident, closeIncident: any }) {
             <span className="icon">
               <FontAwesomeIcon icon={faFolderClosed} />
             </span>
-            <span>{t('close')}</span>
+            <span>{t("close")}</span>
           </button>
         ) : (
           <button
@@ -156,12 +153,12 @@ function IncidentCard(props: { incident: Incident, closeIncident: any }) {
             <span className="icon">
               <FontAwesomeIcon icon={faFolderOpen} />
             </span>
-            <span>{t('open')}</span>
+            <span>{t("open")}</span>
           </button>
         )}
       </footer>
     </div>
-  )
+  );
 }
 
 export default List;
diff --git a/ui/src/views/incident/New.tsx b/ui/src/views/incident/New.tsx
index e904a5ef..c81a042d 100644
--- a/ui/src/views/incident/New.tsx
+++ b/ui/src/views/incident/New.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable jsx-a11y/anchor-is-valid */
-/* eslint-disable jsx-a11y/anchor-has-content */
 import { useMutation } from "@apollo/client";
 import { faClipboard, faLocationDot } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
diff --git a/ui/src/views/journal/Editor.tsx b/ui/src/views/journal/Editor.tsx
index 38603dda..2e2c9db4 100644
--- a/ui/src/views/journal/Editor.tsx
+++ b/ui/src/views/journal/Editor.tsx
@@ -138,20 +138,26 @@ function Editor() {
         return Object.assign({}, state, { time: action.time });
       }
       case "set_media_detail": {
-        switch (action.detail.type) {
+        const details = {
+          sender: state.senderDetail,
+          receiver: state.receiverDetail,
+          ...action.detail,
+        };
+
+        switch (details.type) {
           case Medium.Radio:
-            return Object.assign({}, state, { media: action.detail.type, radioChannel: action.detail.channel });
+            return {
+              ...state,
+              media: details.type,
+              radioChannel: details.channel || "",
+            };
           default:
-            const details = Object.assign(
-              {},
-              { sender: state.senderDetail, receiver: state.receiverDetail },
-              action.detail,
-            );
-            return Object.assign({}, state, {
-              media: action.detail.type,
+            return {
+              ...state,
+              media: details.type,
               senderDetail: details.sender,
               receiverDetail: details.receiver,
-            });
+            };
         }
       }
       case "clear": {
diff --git a/ui/src/views/journal/EditorForms/Elements.tsx b/ui/src/views/journal/EditorForms/Elements.tsx
index 50c7ac0b..9f98a9a6 100644
--- a/ui/src/views/journal/EditorForms/Elements.tsx
+++ b/ui/src/views/journal/EditorForms/Elements.tsx
@@ -6,184 +6,186 @@ import { Hint } from "react-autocomplete-hint";
 import { Medium } from "types";
 import { useEditorContext } from "../Editor";
 
-
 const SenderInput = () => {
-    const { state, dispatch } = useEditorContext();
-
-    return (
-        <div className="control is-expanded has-icons-left">
-            <Hint options={state.autocompleteDetails.senderReceiverNames} allowTabFill={true} allowEnterFill={true} >
-                <input
-                    className="input"
-                    type="text"
-                    value={state.sender}
-                    autoComplete="on"
-                    placeholder={t('name') as string}
-                    onChange={(e) => {
-                        e.preventDefault();
-                        dispatch({ type: 'set_sender', sender: e.target.value });
-                    }}
-                />
-            </Hint>
-            <span className="icon is-small is-left">
-                <FontAwesomeIcon icon={faCircleArrowLeft} />
-            </span>
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+
+  return (
+    <div className="control is-expanded has-icons-left">
+      <Hint options={state.autocompleteDetails.senderReceiverNames} allowTabFill={true} allowEnterFill={true}>
+        <input
+          className="input"
+          type="text"
+          value={state.sender}
+          autoComplete="on"
+          placeholder={t("name") as string}
+          onChange={(e) => {
+            e.preventDefault();
+            dispatch({ type: "set_sender", sender: e.target.value });
+          }}
+        />
+      </Hint>
+      <span className="icon is-small is-left">
+        <FontAwesomeIcon icon={faCircleArrowLeft} />
+      </span>
+    </div>
+  );
+};
 
 const ReceiverInput = () => {
-    const { state, dispatch } = useEditorContext();
-
-    return (
-        <div className="control is-expanded has-icons-left">
-            <Hint options={state.autocompleteDetails.senderReceiverNames} allowTabFill={true} allowEnterFill={true} >
-                <input
-                    className="input"
-                    type="text"
-                    value={state.receiver}
-                    autoComplete="on"
-                    placeholder={t('name') as string}
-                    onChange={(e) => {
-                        e.preventDefault();
-                        dispatch({ type: 'set_receiver', receiver: e.target.value });
-                    }}
-                />
-            </Hint>
-            <span className="icon is-small is-left">
-                <FontAwesomeIcon icon={faCircleArrowRight} />
-            </span>
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+
+  return (
+    <div className="control is-expanded has-icons-left">
+      <Hint options={state.autocompleteDetails.senderReceiverNames} allowTabFill={true} allowEnterFill={true}>
+        <input
+          className="input"
+          type="text"
+          value={state.receiver}
+          autoComplete="on"
+          placeholder={t("name") as string}
+          onChange={(e) => {
+            e.preventDefault();
+            dispatch({ type: "set_receiver", receiver: e.target.value });
+          }}
+        />
+      </Hint>
+      <span className="icon is-small is-left">
+        <FontAwesomeIcon icon={faCircleArrowRight} />
+      </span>
+    </div>
+  );
+};
 
 const ContentInput = () => {
-    const { state, dispatch } = useEditorContext();
-    return (
-
-
-        <div className="control">
-            <textarea
-                className="textarea"
-                autoFocus={true}
-                placeholder={t('message.contentHelp') as string}
-                rows={10}
-                value={state.content}
-                onChange={(e) => {
-                    e.preventDefault();
-                    dispatch({ type: 'set_content', content: e.target.value });
-                }}
-            />
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+  return (
+    <div className="control">
+      <textarea
+        className="textarea"
+        autoFocus={true}
+        placeholder={t("message.contentHelp") as string}
+        rows={10}
+        value={state.content}
+        onChange={(e) => {
+          e.preventDefault();
+          dispatch({ type: "set_content", content: e.target.value });
+        }}
+      />
+    </div>
+  );
+};
 
 const TimeInput = () => {
-    const { state, dispatch } = useEditorContext();
-    return (
-
-        <div className="control is-expanded has-icons-left">
-            <input
-                className="input"
-                value={dayjs(state.time).format("YYYY-MM-DDTHH:mm")}
-                type="datetime-local"
-                placeholder={dayjs(Date.now()).format("DD.MM.YYYY HH:mm")}
-                onChange={(e) => {
-                    e.preventDefault();
-                    e.target.value && dispatch({ type: 'set_time', time: dayjs(e.target.value).toDate() });
-                }}
-            />
-            <span className="icon is-small is-left">
-                <FontAwesomeIcon icon={faClock} />
-            </span>
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+  return (
+    <div className="control is-expanded has-icons-left">
+      <input
+        className="input"
+        value={dayjs(state.time).format("YYYY-MM-DDTHH:mm")}
+        type="datetime-local"
+        placeholder={dayjs(Date.now()).format("DD.MM.YYYY HH:mm")}
+        onChange={(e) => {
+          e.preventDefault();
+          dispatch({ type: "set_time", time: dayjs(e.target.value).toDate() });
+        }}
+      />
+      <span className="icon is-small is-left">
+        <FontAwesomeIcon icon={faClock} />
+      </span>
+    </div>
+  );
+};
 
 const SenderDetailInput = (props: { placeholder: string }) => {
-    const { state, dispatch } = useEditorContext();
-    return (
-        <div className="control is-expanded">
-            <Hint options={state.autocompleteDetails.senderReceiverDetails} allowTabFill={true} allowEnterFill={true} >
-                <input
-                    className="input"
-                    value={state.senderDetail}
-                    type="text"
-                    onChange={(e) => {
-                        e.preventDefault();
-                        dispatch({ type: 'set_media_detail', detail: Object.assign({}, state.media, { type: state.media, sender: e.target.value }) });
-                    }}
-                    placeholder={props.placeholder}
-                />
-            </Hint>
-        </div>
-    )
-}
-
+  const { state, dispatch } = useEditorContext();
+  return (
+    <div className="control is-expanded">
+      <Hint options={state.autocompleteDetails.senderReceiverDetails} allowTabFill={true} allowEnterFill={true}>
+        <input
+          className="input"
+          value={state.senderDetail}
+          type="text"
+          onChange={(e) => {
+            e.preventDefault();
+            dispatch({
+              type: "set_media_detail",
+              detail: Object.assign({}, state.media, { type: state.media, sender: e.target.value }),
+            });
+          }}
+          placeholder={props.placeholder}
+        />
+      </Hint>
+    </div>
+  );
+};
 
 const ReceiverDetailInput = (props: { placeholder: string }) => {
-    const { state, dispatch } = useEditorContext();
-    return (
-        <div className="control is-expanded">
-            <Hint options={state.autocompleteDetails.senderReceiverDetails} allowTabFill={true} allowEnterFill={true} >
-                <input
-                    className="input"
-                    value={state.receiverDetail}
-                    type="text"
-                    onChange={(e) => {
-                        e.preventDefault();
-                        dispatch({ type: 'set_media_detail', detail: Object.assign({}, state.media, { type: state.media, receiver: e.target.value }) });
-                    }}
-                    placeholder={props.placeholder}
-                />
-            </Hint>
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+  return (
+    <div className="control is-expanded">
+      <Hint options={state.autocompleteDetails.senderReceiverDetails} allowTabFill={true} allowEnterFill={true}>
+        <input
+          className="input"
+          value={state.receiverDetail}
+          type="text"
+          onChange={(e) => {
+            e.preventDefault();
+            dispatch({
+              type: "set_media_detail",
+              detail: Object.assign({}, state.media, { type: state.media, receiver: e.target.value }),
+            });
+          }}
+          placeholder={props.placeholder}
+        />
+      </Hint>
+    </div>
+  );
+};
 
 const RadioChannelDetailInput = () => {
-    const { state, dispatch } = useEditorContext();
-
-    return (
-        <div className="control">
-            <Hint options={state.autocompleteDetails.channelList} allowTabFill={true} allowEnterFill={true} >
-                <input
-                    className="input"
-                    value={state.radioChannel || ""}
-                    type="text"
-                    onChange={(e) => {
-                        e.preventDefault();
-                        dispatch({ type: 'set_media_detail', detail: { type: Medium.Radio, channel: e.target.value } });
-                    }}
-                    placeholder={t('radioChannel') as string}
-                />
-            </Hint>
-        </div>
-    )
-}
+  const { state, dispatch } = useEditorContext();
+
+  return (
+    <div className="control">
+      <Hint options={state.autocompleteDetails.channelList} allowTabFill={true} allowEnterFill={true}>
+        <input
+          className="input"
+          value={state.radioChannel || ""}
+          type="text"
+          onChange={(e) => {
+            e.preventDefault();
+            dispatch({ type: "set_media_detail", detail: { type: Medium.Radio, channel: e.target.value } });
+          }}
+          placeholder={t("radioChannel") as string}
+        />
+      </Hint>
+    </div>
+  );
+};
 
 const SaveButton = () => {
-    const { dispatch } = useEditorContext();
-    return (
-
-        <div className="control">
-            <button className="button is-primary is-rounded is-capitalized" onClick={(e) => {
-                e.preventDefault();
-                dispatch({ type: 'save' })
-            }}>
-                {t('save')}
-            </button>
-        </div>
-    )
-}
+  const { dispatch } = useEditorContext();
+  return (
+    <div className="control">
+      <button
+        className="button is-primary is-rounded is-capitalized"
+        onClick={(e) => {
+          e.preventDefault();
+          dispatch({ type: "save" });
+        }}
+      >
+        {t("save")}
+      </button>
+    </div>
+  );
+};
 export {
-    SenderInput,
-    SenderDetailInput,
-    ReceiverInput,
-    ReceiverDetailInput,
-    TimeInput,
-    ContentInput,
-    RadioChannelDetailInput,
-    SaveButton
+  SenderInput,
+  SenderDetailInput,
+  ReceiverInput,
+  ReceiverDetailInput,
+  TimeInput,
+  ContentInput,
+  RadioChannelDetailInput,
+  SaveButton,
 };
-
diff --git a/ui/src/views/journal/Message.tsx b/ui/src/views/journal/Message.tsx
index 0a17e642..a708dd2c 100644
--- a/ui/src/views/journal/Message.tsx
+++ b/ui/src/views/journal/Message.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable jsx-a11y/anchor-is-valid */
 import classNames from "classnames";
 import dayjs from "dayjs";
 import de from "dayjs/locale/de";
diff --git a/ui/src/views/journal/Overview.tsx b/ui/src/views/journal/Overview.tsx
index aae0819f..2ad8eaba 100644
--- a/ui/src/views/journal/Overview.tsx
+++ b/ui/src/views/journal/Overview.tsx
@@ -9,7 +9,7 @@ import {
   faEyeLowVision,
   faFolderClosed,
   faFolderOpen,
-  faPlusCircle
+  faPlusCircle,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import classNames from "classnames";
@@ -47,8 +47,10 @@ function Overview() {
 
   return (
     <div>
-      <h3 className="title is-size-3 is-capitalized">{t('journalList')}</h3>
-      <h3 className="subtitle is-capitalized">{t('incident')}: {incident.name}</h3>
+      <h3 className="title is-size-3 is-capitalized">{t("journalList")}</h3>
+      <h3 className="subtitle is-capitalized">
+        {t("incident")}: {incident.name}
+      </h3>
 
       <div className="buttons">
         <button
@@ -58,7 +60,7 @@ function Overview() {
           <span className="icon is-small">
             <FontAwesomeIcon icon={faPlusCircle} />
           </span>
-          <span>{t('create')}</span>
+          <span>{t("create")}</span>
         </button>
         <button
           className="button is-primary is-small is-responsive is-rounded is-light"
@@ -67,7 +69,7 @@ function Overview() {
           <span className="icon is-small">
             <FontAwesomeIcon icon={filterClosed ? faEye : faEyeLowVision} />
           </span>
-          <span>{filterClosed ? t('showClosed') : t('hideClosed')}</span>
+          <span>{filterClosed ? t("showClosed") : t("hideClosed")}</span>
         </button>
       </div>
 
@@ -75,72 +77,66 @@ function Overview() {
         journals={data.incidents[0].journals.filter((journal) => !filterClosed || journal.closedAt === null) || []}
         incidentId={incidentId}
       />
-    </div >
+    </div>
   );
 }
 
-
-function JournalCards(props: { journals: Journal[], incidentId: string | undefined }) {
+function JournalCards(props: { journals: Journal[]; incidentId: string | undefined }) {
   const { journals, incidentId } = props;
 
-  const [closeJournal] = useMutation(CloseJournal, {
-    refetchQueries: [{ query: GetJournals, variables: { incidentId: incidentId } }],
-  });
-
-
   return (
     <div className="container-flex">
-      {
-        journals.map((journal) => (
-          <JournalCard key={journal.id} journal={journal} closeJournal={closeJournal} />
-        ))
-      }
-    </div >
-  )
+      {journals.map((journal) => (
+        <JournalCard key={journal.id} journal={journal} incidentId={incidentId} />
+      ))}
+    </div>
+  );
 }
 
-function JournalCard(props: { journal: Journal, closeJournal: any }) {
-  const { journal, closeJournal } = props;
+function JournalCard(props: { journal: Journal; incidentId: string | undefined }) {
+  const { journal, incidentId } = props;
   const navigate = useNavigate();
 
+  const [closeJournal] = useMutation(CloseJournal, {
+    refetchQueries: [{ query: GetJournals, variables: { incidentId: incidentId } }],
+  });
+
   const cardClass = classNames({
     card: true,
     "mb-3": true,
-    "has-background-primary-light": journal.closedAt
+    "has-background-primary-light": journal.closedAt,
   });
   return (
-    <div className={cardClass} >
+    <div className={cardClass}>
       <div className="card-content">
         <div className="content has-text-small">
           <h4 className="title is-5">{journal.name}</h4>
           <div className="columns">
             <div className="column is-one-third">
-              <strong>{t('createdAt')}: </strong>{dayjs(journal.createdAt).format("LLL")}
+              <strong>{t("createdAt")}: </strong>
+              {dayjs(journal.createdAt).format("LLL")}
             </div>
-            {journal.closedAt && <div className="column">
-              <strong>{t('closedAt')}: </strong>{dayjs(journal.closedAt).format("LLL")}
-            </div>}
+            {journal.closedAt && (
+              <div className="column">
+                <strong>{t("closedAt")}: </strong>
+                {dayjs(journal.closedAt).format("LLL")}
+              </div>
+            )}
           </div>
         </div>
       </div>
       <footer className="card-footer">
-        <button
-          className="card-footer-item is-ahref is-capitalized"
-          onClick={() => navigate(`../${journal.id}/edit`)}
-        >
+        <button className="card-footer-item is-ahref is-capitalized" onClick={() => navigate(`../${journal.id}/edit`)}>
           <span className="icon">
             <FontAwesomeIcon icon={faEdit} />
           </span>
-          <span>{t('write')}</span>
+          <span>{t("write")}</span>
         </button>
-        <button
-          className="card-footer-item is-ahref is-capitalized"
-          onClick={() => navigate(`../${journal.id}`)}
-        >
+        <button className="card-footer-item is-ahref is-capitalized" onClick={() => navigate(`../${journal.id}`)}>
           <span className="icon">
             <FontAwesomeIcon icon={faChartSimple} />
           </span>
-          <span>{t('feed')}</span>
+          <span>{t("feed")}</span>
         </button>
         {journal.closedAt === null ? (
           <button
@@ -157,7 +153,7 @@ function JournalCard(props: { journal: Journal, closeJournal: any }) {
             <span className="icon">
               <FontAwesomeIcon icon={faFolderClosed} />
             </span>
-            <span>{t('close')}</span>
+            <span>{t("close")}</span>
           </button>
         ) : (
           <button
@@ -168,18 +164,18 @@ function JournalCard(props: { journal: Journal, closeJournal: any }) {
                   journalId: journal.id,
                   closedAt: undefined,
                 },
-              })
+              });
             }}
           >
             <span className="icon">
               <FontAwesomeIcon icon={faFolderOpen} />
             </span>
-            <span>{t('open')}</span>
+            <span>{t("open")}</span>
           </button>
         )}
       </footer>
     </div>
-  )
+  );
 }
 
 export default Overview;
diff --git a/ui/src/views/journal/TriageModal.tsx b/ui/src/views/journal/TriageModal.tsx
index 75d63d51..9dac6f00 100644
--- a/ui/src/views/journal/TriageModal.tsx
+++ b/ui/src/views/journal/TriageModal.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable jsx-a11y/anchor-has-content */
-/* eslint-disable jsx-a11y/anchor-is-valid */
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { faMinus, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -38,7 +36,6 @@ function Triage(props: { message: Message | undefined; setMessage: (message: Mes
   const [saveMessageTriage, { error: errorSet }] = useMutation<SaveMessageTriageData, SaveMessageTriageVars>(
     SaveMessageTriage,
     {
-      onCompleted() {},
       refetchQueries: [{ query: GetJournalMessages, variables: { journalId: journalId } }],
     },
   );
diff --git a/ui/src/views/map/DrawModes/IconPoint.js b/ui/src/views/map/DrawModes/IconPoint.js
index ff1d7038..dc8a6eab 100644
--- a/ui/src/views/map/DrawModes/IconPoint.js
+++ b/ui/src/views/map/DrawModes/IconPoint.js
@@ -2,37 +2,36 @@ import doubleClickZoom from "@mapbox/mapbox-gl-draw/src/lib/double_click_zoom";
 import DrawPoint from "@mapbox/mapbox-gl-draw/src/modes/draw_point";
 
 const {
-    stopDrawingAndRemove: originalstopDrawingAndRemove,
-    onTap: originalOnTap,
-    onStop: originalOnStop,
-    toDisplayFeatures: originalToDisplayFeatures,
-    onTrash: originalOnTrash,
-    onKeyUp: originalOnKeyUp,
-    ...restOriginalMethods
+  stopDrawingAndRemove: originalstopDrawingAndRemove,
+  onTap: originalOnTap,
+  onStop: originalOnStop,
+  onTrash: originalOnTrash,
+  onKeyUp: originalOnKeyUp,
+  ...restOriginalMethods
 } = DrawPoint;
 
 const iconPointMode = {
-    originalstopDrawingAndRemove,
-    originalOnTap,
-    originalOnStop,
-    originalOnTrash,
-    originalOnKeyUp,
-    ...restOriginalMethods,
+  originalstopDrawingAndRemove,
+  originalOnTap,
+  originalOnStop,
+  originalOnTrash,
+  originalOnKeyUp,
+  ...restOriginalMethods,
 };
 
 iconPointMode.onSetup = function () {
-    const selectedFeatures = this.getSelected();
-    this.clearSelectedFeatures();
-    doubleClickZoom.disable(this);
+  const selectedFeatures = this.getSelected();
+  this.clearSelectedFeatures();
+  doubleClickZoom.disable(this);
 
-    const state = {
-        map: this.map,
-        draw: this._ctx.api,
-        selectedFeatures,
-        selectedPointID: null,
-    };
+  const state = {
+    map: this.map,
+    draw: this._ctx.api,
+    selectedFeatures,
+    selectedPointID: null,
+  };
 
-    return state;
+  return state;
 };
 
-export default iconPointMode;
\ No newline at end of file
+export default iconPointMode;
diff --git a/ui/src/views/map/Map.tsx b/ui/src/views/map/Map.tsx
index 74115d41..e3e42be5 100644
--- a/ui/src/views/map/Map.tsx
+++ b/ui/src/views/map/Map.tsx
@@ -231,13 +231,13 @@ function Draw(props: { activeLayer: string | undefined }) {
   });
 
   const onSelectionChange = useCallback(
-    (e: any) => {
+    (e: FeatureEvent) => {
       const features: Feature[] = e.features;
       if (features?.length > 0) {
         const feature = first(features);
         dispatch({ type: "SELECT_FEATURE", payload: { id: feature?.id?.toString() } });
       } else {
-        dispatch({ type: "DESELECT_FEATURE", payload: {} });
+        dispatch({ type: "DESELECT_FEATURE", payload: null });
       }
     },
     [dispatch],
@@ -272,7 +272,7 @@ function Draw(props: { activeLayer: string | undefined }) {
         const feature = CleanFeature(f);
         modifyFeature({ variables: { id: feature.id, geometry: feature.geometry, properties: feature.properties } });
       });
-      dispatch({ type: "DESELECT_FEATURE", payload: {} });
+      dispatch({ type: "DESELECT_FEATURE", payload: null });
     },
     [dispatch, props.activeLayer, modifyFeature],
   );
@@ -284,7 +284,7 @@ function Draw(props: { activeLayer: string | undefined }) {
         const feature = CleanFeature(f);
         deleteFeature({ variables: { id: feature.id, deletedAt: new Date() } });
       });
-      dispatch({ type: "DESELECT_FEATURE", payload: {} });
+      dispatch({ type: "DESELECT_FEATURE", payload: null });
     },
     [dispatch, props.activeLayer, deleteFeature],
   );
@@ -293,7 +293,7 @@ function Draw(props: { activeLayer: string | undefined }) {
     (e: CombineFeatureEvent) => {
       onCreate({ features: e.createdFeatures });
       onDelete({ features: e.deletedFeatures });
-      dispatch({ type: "DESELECT_FEATURE", payload: {} });
+      dispatch({ type: "DESELECT_FEATURE", payload: null });
     },
     [dispatch, onCreate, onDelete],
   );
diff --git a/ui/src/views/map/controls/BabsIconController.tsx b/ui/src/views/map/controls/BabsIconController.tsx
index a55c12a3..3a0a4817 100644
--- a/ui/src/views/map/controls/BabsIconController.tsx
+++ b/ui/src/views/map/controls/BabsIconController.tsx
@@ -198,7 +198,7 @@ function LineController(props: BabsIconControllerProps) {
     }
 
     // reverse the coordinates
-    if (selectedFeature.geometry.type === "LineString" || selectedFeature.geometry.type === "MultiLineString") {
+    if (selectedFeature.geometry.type === "LineString") {
       const feature = {
         type: selectedFeature.type,
         id: selectedFeature.id,
@@ -217,7 +217,7 @@ function LineController(props: BabsIconControllerProps) {
     return <></>;
   }
 
-  if (selectedFeature.geometry.type !== "LineString" && selectedFeature.geometry.type !== "MultiLineString") {
+  if (selectedFeature.geometry.type !== "LineString") {
     return <></>;
   }
 
@@ -429,12 +429,12 @@ interface GroupMenuProps {
   name: string;
   iconGroup: BabsIconType;
   feature: Feature<Geometry, GeoJsonProperties>;
-  onUpdate: (e: any) => void;
+  onUpdate: (e: { features: Feature<Geometry, GeoJsonProperties>[]; action: string }) => void;
 }
 
 interface BabsIconControllerProps {
   selectedFeature: Feature<Geometry, GeoJsonProperties> | undefined;
-  onUpdate: (e: any) => void;
+  onUpdate: (e: { features: Feature<Geometry, GeoJsonProperties>[]; action: string }) => void;
 }
 
 function BabsIconController() {
diff --git a/ui/src/views/map/controls/DrawControl.tsx b/ui/src/views/map/controls/DrawControl.tsx
index 4836e81a..5823f7d9 100644
--- a/ui/src/views/map/controls/DrawControl.tsx
+++ b/ui/src/views/map/controls/DrawControl.tsx
@@ -46,7 +46,6 @@ function DrawControl(props: DrawControlProps) {
     },
     () => {
       if (draw) {
-        MapboxDraw;
         dispatch({ type: "SET_DRAW", payload: { draw: draw } });
       }
     },