diff --git a/src/components/GroupAnchorOffsetOverlay/index.tsx b/src/components/GroupAnchorOffsetOverlay/index.tsx
index 54dfe72..56e34ab 100644
--- a/src/components/GroupAnchorOffsetOverlay/index.tsx
+++ b/src/components/GroupAnchorOffsetOverlay/index.tsx
@@ -50,31 +50,18 @@ export const GroupAnchorOffsetOverlay = ({
   const hoveredElement = (hoveredPrimitive._parent_pcb_component ||
     hoveredPrimitive._element) as PcbComponent | undefined
 
-  if (!hoveredElement) return null
-
-  let parentGroup: PcbGroup | undefined
-  let targetCenter: Point | undefined
-
-  if (
-    hoveredElement.type === "pcb_component" &&
-    hoveredElement.position_mode === "relative_to_group_anchor"
-  ) {
-    parentGroup = elements
-      .filter((el): el is PcbGroup => el.type === "pcb_group")
-      .find(
-        (group) =>
-          group.pcb_group_id ===
-          hoveredElement.positioned_relative_to_pcb_group_id,
-      )
-    targetCenter = hoveredElement.center
-  } else if ("pcb_group_id" in hoveredElement) {
-    parentGroup = elements
-      .filter((el): el is PcbGroup => el.type === "pcb_group")
-      .find((group) => group.pcb_group_id === hoveredElement.pcb_group_id)
-    targetCenter = hoveredElement.center
-  }
+  if (!hoveredElement?.pcb_group_id) return null
+
+  const parentGroup = elements
+    .filter((el): el is PcbGroup => el.type === "pcb_group")
+    .find((group) => group.pcb_group_id === hoveredElement.pcb_group_id)
 
-  if (!parentGroup?.anchor_position || !targetCenter) return null
+  if (!parentGroup?.anchor_position) return null
+
+  const targetCenter: Point = hoveredElement.center || {
+    x: hoveredPrimitive.x,
+    y: hoveredPrimitive.y,
+  }
 
   const groupComponents = elements
     .filter((el): el is PcbComponent => el.type === "pcb_component")
diff --git a/src/components/ToolbarOverlay.tsx b/src/components/ToolbarOverlay.tsx
index 2198346..ce9fe5d 100644
--- a/src/components/ToolbarOverlay.tsx
+++ b/src/components/ToolbarOverlay.tsx
@@ -266,10 +266,10 @@ export const ToolbarOverlay = ({ children, elements }: Props) => {
     numLayers <= 2
       ? ["top", "bottom"]
       : [
-          "top",
-          ...Array.from({ length: numLayers - 2 }, (_, i) => `inner${i + 1}`),
-          "bottom",
-        ]
+        "top",
+        ...Array.from({ length: numLayers - 2 }, (_, i) => `inner${i + 1}`),
+        "bottom",
+      ]
 
   const processedLayers = availableLayers
 
@@ -719,7 +719,7 @@ export const ToolbarOverlay = ({ children, elements }: Props) => {
                   }}
                 />
                 <CheckboxMenuItem
-                  label="Show Group Anchor Offsets"
+                  label="Anchor Offsets on Hover"
                   checked={viewSettings.is_showing_group_anchor_offsets}
                   onClick={() => {
                     setIsShowingGroupAnchorOffsets(
diff --git a/src/global-store.ts b/src/global-store.ts
index 2062630..c86b6fe 100644
--- a/src/global-store.ts
+++ b/src/global-store.ts
@@ -94,7 +94,7 @@ export const createStore = (
           : getStoredBoolean(STORAGE_KEYS.IS_SHOWING_PCB_GROUPS, true),
         is_showing_group_anchor_offsets: getStoredBoolean(
           STORAGE_KEYS.IS_SHOWING_GROUP_ANCHOR_OFFSETS,
-          process.env.NODE_ENV !== "production",
+          true,
         ),
         is_showing_solder_mask: getStoredBoolean(
           STORAGE_KEYS.IS_SHOWING_SOLDER_MASK,