diff --git a/package.json b/package.json
index 1b31325b..452873ec 100644
--- a/package.json
+++ b/package.json
@@ -87,5 +87,4 @@
     "tslib": "^2.8.1",
     "typescript": "^5.7.3"
   }
-
 }
diff --git a/src/components/CommandPalette.tsx b/src/components/CommandPalette.tsx
index 615ad716..919f7c1f 100644
--- a/src/components/CommandPalette.tsx
+++ b/src/components/CommandPalette.tsx
@@ -126,11 +126,8 @@ export const CommandPalette = (): JSX.Element => {
             const nodeNum = device.hardware.myNodeNum.toString();
 
             return {
-              label:
-                longName ?? nodeNum,
-              icon: (
-                <Avatar text={shortName?.toString() ?? nodeNum} />
-              ),
+              label: longName ?? nodeNum,
+              icon: <Avatar text={shortName?.toString() ?? nodeNum} />,
               action() {
                 setSelectedDevice(device.id);
               },
@@ -255,8 +252,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Red",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#f25555]" : "bg-[#f28585]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#f25555]" : "bg-[#f28585]"
+                  }`}
                 />
               ),
               action() {
@@ -267,8 +265,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Orange",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#e1720b]" : "bg-[#edb17a]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#e1720b]" : "bg-[#edb17a]"
+                  }`}
                 />
               ),
               action() {
@@ -279,8 +278,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Yellow",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#ac8c1a]" : "bg-[#e0cc87]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#ac8c1a]" : "bg-[#e0cc87]"
+                  }`}
                 />
               ),
               action() {
@@ -291,8 +291,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Green",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#27a341]" : "bg-[#8bc9c5]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#27a341]" : "bg-[#8bc9c5]"
+                  }`}
                 />
               ),
               action() {
@@ -303,8 +304,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Blue",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#2093fe]" : "bg-[#70afea]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#2093fe]" : "bg-[#70afea]"
+                  }`}
                 />
               ),
               action() {
@@ -315,8 +317,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Purple",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#926bff]" : "bg-[#a09eef]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#926bff]" : "bg-[#a09eef]"
+                  }`}
                 />
               ),
               action() {
@@ -327,8 +330,9 @@ export const CommandPalette = (): JSX.Element => {
               label: "Pink",
               icon: (
                 <span
-                  className={`h-3 w-3 rounded-full ${darkMode ? "bg-[#e454c4]" : "bg-[#dba0c7]"
-                    }`}
+                  className={`h-3 w-3 rounded-full ${
+                    darkMode ? "bg-[#e454c4]" : "bg-[#dba0c7]"
+                  }`}
                 />
               ),
               action() {
diff --git a/src/components/DeviceSelector.tsx b/src/components/DeviceSelector.tsx
index ec0e11e9..9816f194 100644
--- a/src/components/DeviceSelector.tsx
+++ b/src/components/DeviceSelector.tsx
@@ -11,8 +11,8 @@ import {
   SearchIcon,
   SunIcon,
 } from "lucide-react";
-import { Avatar } from "./UI/Avatar";
 import type { JSX } from "react";
+import { Avatar } from "./UI/Avatar";
 
 export const DeviceSelector = (): JSX.Element => {
   const { getDevices } = useDeviceStore();
@@ -45,7 +45,13 @@ export const DeviceSelector = (): JSX.Element => {
               }}
               active={selectedDevice === device.id}
             >
-              <Avatar text={device.nodes.get(device.hardware.myNodeNum)?.user?.shortName.toString() ?? "UNK"} />
+              <Avatar
+                text={
+                  device.nodes
+                    .get(device.hardware.myNodeNum)
+                    ?.user?.shortName.toString() ?? "UNK"
+                }
+              />
             </DeviceSelectorButton>
           ))}
           <Separator />
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index 7625946f..88c66bcb 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -1,4 +1,5 @@
 import { Label } from "@components/UI/Label.tsx";
+import type { JSX } from "react";
 
 export interface FieldWrapperProps {
   label: string;
@@ -17,7 +18,7 @@ export const FieldWrapper = ({
   validationText,
 }: FieldWrapperProps): JSX.Element => (
   <div className="pt-6 sm:pt-5">
-    <div role="group" aria-labelledby="label-notifications">
+    <fieldset aria-labelledby="label-notifications">
       <div className="sm:grid sm:grid-cols-3 sm:items-baseline sm:gap-4">
         <Label>{label}</Label>
         <div className="sm:col-span-2">
@@ -32,6 +33,6 @@ export const FieldWrapper = ({
           </div>
         </div>
       </div>
-    </div>
+    </fieldset>
   </div>
 );
diff --git a/src/components/PageComponents/Map/NodeDetail.tsx b/src/components/PageComponents/Map/NodeDetail.tsx
index ff743ddf..f174c831 100644
--- a/src/components/PageComponents/Map/NodeDetail.tsx
+++ b/src/components/PageComponents/Map/NodeDetail.tsx
@@ -1,3 +1,4 @@
+import { Avatar } from "@app/components/UI/Avatar";
 import { Separator } from "@app/components/UI/Seperator";
 import { H5 } from "@app/components/UI/Typography/H5.tsx";
 import { Subtle } from "@app/components/UI/Typography/Subtle.tsx";
@@ -17,7 +18,7 @@ import {
   MountainSnow,
   Star,
 } from "lucide-react";
-import { Avatar } from "@app/components/UI/Avatar";
+import type { JSX } from "react";
 
 export interface NodeDetailProps {
   node: ProtobufType.Mesh.NodeInfo;
@@ -68,8 +69,9 @@ export const NodeDetail = ({ node }: NodeDetailProps): JSX.Element => {
           {!!node.deviceMetrics?.batteryLevel && (
             <div
               className="flex items-center gap-1"
-              title={`${node.deviceMetrics?.voltage?.toPrecision(3) ?? "Unknown"
-                } volts`}
+              title={`${
+                node.deviceMetrics?.voltage?.toPrecision(3) ?? "Unknown"
+              } volts`}
             >
               {node.deviceMetrics?.batteryLevel > 100 ? (
                 <BatteryChargingIcon size={22} />
diff --git a/src/components/PageComponents/Messages/Message.tsx b/src/components/PageComponents/Messages/Message.tsx
index af58e743..563ba492 100644
--- a/src/components/PageComponents/Messages/Message.tsx
+++ b/src/components/PageComponents/Messages/Message.tsx
@@ -29,8 +29,9 @@ export const Message = ({
         <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
       )}
       <span
-        className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
-          }`}
+        className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
+          message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
+        }`}
       >
         {message.data}
       </span>
@@ -66,8 +67,9 @@ export const Message = ({
           <AlertCircleIcon size={16} className="my-auto text-textSecondary" />
         )}
         <span
-          className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
-            }`}
+          className={`ml-4 border-l-2 border-l-backgroundPrimary pl-2 ${
+            message.state === "ack" ? "text-textPrimary" : "text-textSecondary"
+          }`}
         >
           {message.data}
         </span>
diff --git a/src/components/UI/Avatar.tsx b/src/components/UI/Avatar.tsx
index 2438840c..06659bd5 100644
--- a/src/components/UI/Avatar.tsx
+++ b/src/components/UI/Avatar.tsx
@@ -14,7 +14,7 @@ interface AvatarProps {
   className?: string;
 }
 
-// biome-ignore lint/complexity/noStaticOnlyClass: stop being annoying Biome 
+// biome-ignore lint/complexity/noStaticOnlyClass: stop being annoying Biome
 class ColorUtils {
   static hexToRgb(hex: number): RGBColor {
     return {
@@ -72,28 +72,26 @@ export const Avatar: React.FC<AvatarProps> = ({
   const bgColor = getColorFromText();
   const isLight = ColorUtils.isLight(bgColor);
   const textColor = isLight ? "#000000" : "#FFFFFF";
-  const initials = text
-    .toUpperCase()
-    .slice(0, 4);
+  const initials = text.toUpperCase().slice(0, 4);
 
   return (
     <div
-      className={cn(`
+      className={cn(
+        `
         rounded-full 
         flex 
         items-center 
         justify-center 
         font-semibold`,
         sizes[size],
-        className)
-      }
+        className,
+      )}
       style={{
         backgroundColor: `rgb(${bgColor.r}, ${bgColor.g}, ${bgColor.b})`,
         color: textColor,
       }}
     >
       <p className="p-1">{initials}</p>
-
     </div>
   );
 };
diff --git a/src/components/UI/Sidebar/sidebarButton.tsx b/src/components/UI/Sidebar/sidebarButton.tsx
index 76de58bc..73cbc032 100644
--- a/src/components/UI/Sidebar/sidebarButton.tsx
+++ b/src/components/UI/Sidebar/sidebarButton.tsx
@@ -18,7 +18,7 @@ export const SidebarButton = ({
   Icon,
   element,
   onClick,
-  className
+  className,
 }: SidebarButtonProps): JSX.Element => (
   <Button
     onClick={onClick}
diff --git a/src/components/generic/Table/index.tsx b/src/components/generic/Table/index.tsx
index aef5f6f2..bffffeb2 100755
--- a/src/components/generic/Table/index.tsx
+++ b/src/components/generic/Table/index.tsx
@@ -74,15 +74,12 @@ export const Table = ({ headings, rows }: TableProps): JSX.Element => {
             >
               <div className="flex gap-2">
                 {heading.title}
-                {sortColumn === heading.title && (
-                  <>
-                    {sortOrder === "asc" ? (
-                      <ChevronUpIcon size={16} />
-                    ) : (
-                      <ChevronDownIcon size={16} />
-                    )}
-                  </>
-                )}
+                {sortColumn === heading.title &&
+                  (sortOrder === "asc" ? (
+                    <ChevronUpIcon size={16} />
+                  ) : (
+                    <ChevronDownIcon size={16} />
+                  ))}
               </div>
             </th>
           ))}
diff --git a/src/index.css b/src/index.css
index 8a35066d..6b1f61e2 100644
--- a/src/index.css
+++ b/src/index.css
@@ -97,6 +97,5 @@
 }
 
 img {
-  -drag: none;
   -webkit-user-drag: none;
 }
diff --git a/src/pages/Map.tsx b/src/pages/Map.tsx
index e0efadb0..d574ab01 100644
--- a/src/pages/Map.tsx
+++ b/src/pages/Map.tsx
@@ -1,4 +1,5 @@
 import { NodeDetail } from "@app/components/PageComponents/Map/NodeDetail";
+import { Avatar } from "@app/components/UI/Avatar";
 import { Subtle } from "@app/components/UI/Typography/Subtle.tsx";
 import { cn } from "@app/core/utils/cn.ts";
 import { PageLayout } from "@components/PageLayout.tsx";
@@ -7,6 +8,7 @@ import { SidebarSection } from "@components/UI/Sidebar/SidebarSection.tsx";
 import { SidebarButton } from "@components/UI/Sidebar/sidebarButton.tsx";
 import { useAppStore } from "@core/stores/appStore.ts";
 import { useDevice } from "@core/stores/deviceStore.ts";
+import type { Protobuf } from "@meshtastic/js";
 import { numberToHexUnpadded } from "@noble/curves/abstract/utils";
 import { bbox, lineString } from "@turf/turf";
 import {
@@ -18,8 +20,6 @@ import {
 import { type JSX, useCallback, useEffect, useState } from "react";
 import { AttributionControl, Marker, Popup, useMap } from "react-map-gl";
 import MapGl from "react-map-gl/maplibre";
-import type { Protobuf } from "@meshtastic/js";
-import { Avatar } from "@app/components/UI/Avatar";
 
 export const MapPage = (): JSX.Element => {
   const { nodes, waypoints } = useDevice();
@@ -135,9 +135,7 @@ export const MapPage = (): JSX.Element => {
           renderWorldCopies={false}
           maxPitch={0}
           style={{
-            filter: darkMode
-              ? "brightness(0.8)"
-              : "",
+            filter: darkMode ? "brightness(0.8)" : "",
           }}
           dragRotate={false}
           touchZoomRotate={false}
@@ -191,7 +189,12 @@ export const MapPage = (): JSX.Element => {
                   }}
                 >
                   <div className="flex cursor-pointer gap-2 rounded-md bg-transparent p-1.5">
-                    <Avatar text={node.user?.shortName.toString() ?? node.num.toString()} size="sm" />
+                    <Avatar
+                      text={
+                        node.user?.shortName.toString() ?? node.num.toString()
+                      }
+                      size="sm"
+                    />
                     <Subtle className={cn(zoom < 12 && "hidden")}>
                       {node.user?.longName ||
                         `!${numberToHexUnpadded(node.num)}`}
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index e90024c8..ed3a497d 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -65,55 +65,60 @@ export const MessagesPage = (): JSX.Element => {
                 setChatType("direct");
                 setActiveChat(node.num);
               }}
-              element={<Avatar text={node.user?.shortName.toString() ?? node.num.toString()} />}
+              element={
+                <Avatar
+                  text={node.user?.shortName.toString() ?? node.num.toString()}
+                />
+              }
             />
           ))}
         </SidebarSection>
       </Sidebar>
       <div className="flex flex-col flex-grow">
         <PageLayout
-          label={`Messages: ${chatType === "broadcast" && currentChannel
-            ? getChannelName(currentChannel)
-            : chatType === "direct" && nodes.get(activeChat)
-              ? (nodes.get(activeChat)?.user?.longName ?? nodeHex)
-              : "Loading..."
-            }`}
+          label={`Messages: ${
+            chatType === "broadcast" && currentChannel
+              ? getChannelName(currentChannel)
+              : chatType === "direct" && nodes.get(activeChat)
+                ? (nodes.get(activeChat)?.user?.longName ?? nodeHex)
+                : "Loading..."
+          }`}
           actions={
             chatType === "direct"
               ? [
-                {
-                  icon: nodes.get(activeChat)?.user?.publicKey.length
-                    ? LockIcon
-                    : LockOpenIcon,
-                  iconClasses: nodes.get(activeChat)?.user?.publicKey.length
-                    ? "text-green-600"
-                    : "text-yellow-300",
-                  async onClick() {
-                    const targetNode = nodes.get(activeChat)?.num;
-                    if (targetNode === undefined) return;
-                    toast({
-                      title: nodes.get(activeChat)?.user?.publicKey.length
-                        ? "Chat is using PKI encryption."
-                        : "Chat is using PSK encryption.",
-                    });
+                  {
+                    icon: nodes.get(activeChat)?.user?.publicKey.length
+                      ? LockIcon
+                      : LockOpenIcon,
+                    iconClasses: nodes.get(activeChat)?.user?.publicKey.length
+                      ? "text-green-600"
+                      : "text-yellow-300",
+                    async onClick() {
+                      const targetNode = nodes.get(activeChat)?.num;
+                      if (targetNode === undefined) return;
+                      toast({
+                        title: nodes.get(activeChat)?.user?.publicKey.length
+                          ? "Chat is using PKI encryption."
+                          : "Chat is using PSK encryption.",
+                      });
+                    },
                   },
-                },
-                {
-                  icon: WaypointsIcon,
-                  async onClick() {
-                    const targetNode = nodes.get(activeChat)?.num;
-                    if (targetNode === undefined) return;
-                    toast({
-                      title: "Sending Traceroute, please wait...",
-                    });
-                    await connection?.traceRoute(targetNode).then(() =>
+                  {
+                    icon: WaypointsIcon,
+                    async onClick() {
+                      const targetNode = nodes.get(activeChat)?.num;
+                      if (targetNode === undefined) return;
                       toast({
-                        title: "Traceroute sent.",
-                      }),
-                    );
+                        title: "Sending Traceroute, please wait...",
+                      });
+                      await connection?.traceRoute(targetNode).then(() =>
+                        toast({
+                          title: "Traceroute sent.",
+                        }),
+                      );
+                    },
                   },
-                },
-              ]
+                ]
               : []
           }
         >
diff --git a/src/pages/Nodes.tsx b/src/pages/Nodes.tsx
index db8aa64f..bc7022d3 100644
--- a/src/pages/Nodes.tsx
+++ b/src/pages/Nodes.tsx
@@ -52,8 +52,8 @@ export const NodesPage = (): JSX.Element => {
                 {node.user?.longName ??
                   (node.user?.macaddr
                     ? `Meshtastic ${base16
-                      .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
-                      .toLowerCase()}`
+                        .stringify(node.user?.macaddr.subarray(4, 6) ?? [])
+                        .toLowerCase()}`
                     : `!${numberToHexUnpadded(node.num)}`)}
               </h1>,
 
@@ -89,8 +89,9 @@ export const NodesPage = (): JSX.Element => {
                 {node.lastHeard !== 0
                   ? node.viaMqtt === false && node.hopsAway === 0
                     ? "Direct"
-                    : `${node.hopsAway.toString()} ${node.hopsAway > 1 ? "hops" : "hop"
-                    } away`
+                    : `${node.hopsAway.toString()} ${
+                        node.hopsAway > 1 ? "hops" : "hop"
+                      } away`
                   : "-"}
                 {node.viaMqtt === true ? ", via MQTT" : ""}
               </Mono>,