diff --git a/interface/progmem-generator.js b/interface/progmem-generator.js
index 905173626..2a96ee410 100644
--- a/interface/progmem-generator.js
+++ b/interface/progmem-generator.js
@@ -88,7 +88,6 @@ export default function ProgmemGenerator({ outputPath = './WWWData.h', bytesPerL
         };
 
         const generateWWWClass = () =>
-          // eslint-disable-next-line max-len
           `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
 
 class WWWData {
diff --git a/interface/src/framework/ap/APSettingsForm.tsx b/interface/src/framework/ap/APSettingsForm.tsx
index 48da99907..f43c704d9 100644
--- a/interface/src/framework/ap/APSettingsForm.tsx
+++ b/interface/src/framework/ap/APSettingsForm.tsx
@@ -174,7 +174,7 @@ const APSettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/framework/mqtt/MqttSettingsForm.tsx b/interface/src/framework/mqtt/MqttSettingsForm.tsx
index 189610cf4..045e3ea79 100644
--- a/interface/src/framework/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -398,7 +398,7 @@ const MqttSettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/framework/network/NetworkSettingsForm.tsx b/interface/src/framework/network/NetworkSettingsForm.tsx
index bc2a768bc..4e4c40912 100644
--- a/interface/src/framework/network/NetworkSettingsForm.tsx
+++ b/interface/src/framework/network/NetworkSettingsForm.tsx
@@ -298,7 +298,7 @@ const WiFiSettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/framework/ntp/NTPSettingsForm.tsx b/interface/src/framework/ntp/NTPSettingsForm.tsx
index cf450ffe0..56c3b3e0e 100644
--- a/interface/src/framework/ntp/NTPSettingsForm.tsx
+++ b/interface/src/framework/ntp/NTPSettingsForm.tsx
@@ -95,7 +95,7 @@ const NTPSettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/framework/security/SecuritySettingsForm.tsx b/interface/src/framework/security/SecuritySettingsForm.tsx
index 3a8cab96b..14930d399 100644
--- a/interface/src/framework/security/SecuritySettingsForm.tsx
+++ b/interface/src/framework/security/SecuritySettingsForm.tsx
@@ -65,7 +65,7 @@ const SecuritySettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/framework/system/GeneralFileUpload.tsx b/interface/src/framework/system/GeneralFileUpload.tsx
index d1ef50e66..11ade4405 100644
--- a/interface/src/framework/system/GeneralFileUpload.tsx
+++ b/interface/src/framework/system/GeneralFileUpload.tsx
@@ -116,7 +116,7 @@ const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
               {LL.DOWNLOAD_SETTINGS_TEXT()}
             </Typography>
           </Box>
-          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => downloadSettings()}>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadSettings}>
             {LL.SETTINGS_OF('')}
           </Button>
           <Box color="warning.main">
@@ -124,12 +124,7 @@ const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
               {LL.DOWNLOAD_CUSTOMIZATION_TEXT()}{' '}
             </Typography>
           </Box>
-          <Button
-            startIcon={<DownloadIcon />}
-            variant="outlined"
-            color="primary"
-            onClick={() => downloadCustomizations()}
-          >
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadCustomizations}>
             {LL.CUSTOMIZATIONS()}
           </Button>
           <Button
@@ -137,7 +132,7 @@ const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
             startIcon={<DownloadIcon />}
             variant="outlined"
             color="primary"
-            onClick={() => downloadEntities()}
+            onClick={downloadEntities}
           >
             {LL.CUSTOM_ENTITIES(0)}
           </Button>
@@ -146,7 +141,7 @@ const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
               {LL.DOWNLOAD_SCHEDULE_TEXT()}{' '}
             </Typography>
           </Box>
-          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => downloadSchedule()}>
+          <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={downloadSchedule}>
             {LL.SCHEDULE(0)}
           </Button>
         </>
diff --git a/interface/src/framework/system/OTASettingsForm.tsx b/interface/src/framework/system/OTASettingsForm.tsx
index 1b9cd033a..33543f0c9 100644
--- a/interface/src/framework/system/OTASettingsForm.tsx
+++ b/interface/src/framework/system/OTASettingsForm.tsx
@@ -86,7 +86,7 @@ const OTASettingsForm: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/project/DashboardDevices.tsx b/interface/src/project/DashboardDevices.tsx
index e35dcef99..3f0c837be 100644
--- a/interface/src/project/DashboardDevices.tsx
+++ b/interface/src/project/DashboardDevices.tsx
@@ -322,7 +322,6 @@ const DashboardDevices: FC = () => {
     return () => {
       clearInterval(timer);
     };
-    // eslint-disable-next-line
   }, [analog, sensor, deviceValue, sensorData]);
 
   const isCmdOnly = (dv: DeviceValue) => dv.v === '' && dv.c;
diff --git a/interface/src/project/DashboardSensors.tsx b/interface/src/project/DashboardSensors.tsx
index a18d35fd7..2ac954ec2 100644
--- a/interface/src/project/DashboardSensors.tsx
+++ b/interface/src/project/DashboardSensors.tsx
@@ -446,7 +446,7 @@ const DashboardSensors: FC = () => {
       )}
 
       <ButtonRow>
-        <Box display="flex" flexWrap="wrap">
+        <Box mt={2} display="flex" flexWrap="wrap">
           <Box flexGrow={1}>
             <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={fetchSensorData}>
               {LL.REFRESH()}
diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx
index ff3570d5d..3c23a6adb 100644
--- a/interface/src/project/DashboardStatus.tsx
+++ b/interface/src/project/DashboardStatus.tsx
@@ -116,7 +116,6 @@ const DashboardStatus: FC = () => {
     return () => {
       clearInterval(timer);
     };
-    // eslint-disable-next-line
   }, []);
 
   const showName = (id: any) => {
diff --git a/interface/src/project/SettingsApplication.tsx b/interface/src/project/SettingsApplication.tsx
index a2a67c02b..facc4a54b 100644
--- a/interface/src/project/SettingsApplication.tsx
+++ b/interface/src/project/SettingsApplication.tsx
@@ -643,7 +643,7 @@ const SettingsApplication: FC = () => {
               variant="outlined"
               color="primary"
               type="submit"
-              onClick={() => loadData()}
+              onClick={loadData}
             >
               {LL.CANCEL()}
             </Button>
diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx
index edf6228dc..ec1076b24 100644
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -547,7 +547,7 @@ const SettingsCustomization: FC = () => {
                   startIcon={<WarningIcon color="warning" />}
                   variant="contained"
                   color="info"
-                  onClick={() => saveCustomization()}
+                  onClick={saveCustomization}
                 >
                   {LL.APPLY_CHANGES(numChanges)}
                 </Button>
diff --git a/interface/src/project/SettingsEntities.tsx b/interface/src/project/SettingsEntities.tsx
index cb1c93897..0da5ff8e8 100644
--- a/interface/src/project/SettingsEntities.tsx
+++ b/interface/src/project/SettingsEntities.tsx
@@ -130,7 +130,7 @@ const SettingsEntities: FC = () => {
 
   useEffect(() => {
     void fetchEntities();
-  }, [fetchEntities]);
+  }, []);
 
   const saveEntities = async () => {
     if (entities) {
@@ -270,14 +270,14 @@ const SettingsEntities: FC = () => {
         <Box flexGrow={1}>
           {numChanges > 0 && (
             <ButtonRow>
-              <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => fetchEntities()} color="secondary">
+              <Button startIcon={<CancelIcon />} variant="outlined" onClick={fetchEntities} color="secondary">
                 {LL.CANCEL()}
               </Button>
               <Button
                 startIcon={<WarningIcon color="warning" />}
                 variant="contained"
                 color="info"
-                onClick={() => saveEntities()}
+                onClick={saveEntities}
               >
                 {LL.APPLY_CHANGES(numChanges)}
               </Button>
@@ -286,7 +286,7 @@ const SettingsEntities: FC = () => {
         </Box>
         <Box flexWrap="nowrap" whiteSpace="nowrap">
           <ButtonRow>
-            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={() => addEntityItem()}>
+            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={addEntityItem}>
               {LL.ADD(0)}
             </Button>
           </ButtonRow>
diff --git a/interface/src/project/SettingsScheduler.tsx b/interface/src/project/SettingsScheduler.tsx
index f9d4782f5..4e3da6116 100644
--- a/interface/src/project/SettingsScheduler.tsx
+++ b/interface/src/project/SettingsScheduler.tsx
@@ -280,14 +280,14 @@ const SettingsScheduler: FC = () => {
         <Box flexGrow={1}>
           {numChanges !== 0 && (
             <ButtonRow>
-              <Button startIcon={<CancelIcon />} variant="outlined" onClick={() => fetchSchedule()} color="secondary">
+              <Button startIcon={<CancelIcon />} variant="outlined" onClick={fetchSchedule} color="secondary">
                 {LL.CANCEL()}
               </Button>
               <Button
                 startIcon={<WarningIcon color="warning" />}
                 variant="contained"
                 color="info"
-                onClick={() => saveSchedule()}
+                onClick={saveSchedule}
               >
                 {LL.APPLY_CHANGES(numChanges)}
               </Button>
@@ -296,7 +296,7 @@ const SettingsScheduler: FC = () => {
         </Box>
         <Box flexWrap="nowrap" whiteSpace="nowrap">
           <ButtonRow>
-            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={() => addScheduleItem()}>
+            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={addScheduleItem}>
               {LL.ADD(0)}
             </Button>
           </ButtonRow>