diff --git a/src/components/Context.vue b/src/components/Context.vue
index f123221..0a44d4a 100644
--- a/src/components/Context.vue
+++ b/src/components/Context.vue
@@ -1,6 +1,5 @@
 <template>
     <slot />
-    <div ref="resizeListener" class="resize-listener" />
 </template>
 
 <script setup lang="ts">
@@ -10,25 +9,12 @@ import {
     NodesInjectionKey,
     FeatureNode
 } from "game/layers";
-import { nextTick, onMounted, provide, ref } from "vue";
-
-const observer = new MutationObserver(updateNodes);
-const resizeObserver = new ResizeObserver(updateNodes);
+import { nextTick, provide, ref } from "vue";
 
 const nodes = ref<Record<string, FeatureNode | undefined>>({});
 
 defineExpose({ nodes });
 
-const resizeListener = ref<Element | null>(null);
-
-onMounted(() => {
-    // ResizeListener exists because ResizeObserver's don't work when told to observe an SVG element
-    const resListener = resizeListener.value;
-    if (resListener != null) {
-        resizeObserver.observe(resListener);
-    }
-});
-
 const observerOptions = {
     attributes: true,
     childList: true,
@@ -36,54 +22,22 @@ const observerOptions = {
 };
 
 provide(RegisterNodeInjectionKey, (id, element) => {
-    nodes.value[id] = { element };
+    const observer = new MutationObserver(() => updateNode(id));
     observer.observe(element, observerOptions);
-    nextTick(() => {
-        if (resizeListener.value != null) {
-            updateNode(id);
-        }
-    });
+    nodes.value[id] = { element, observer };
+    nextTick(() => updateNode(id));
 });
 provide(UnregisterNodeInjectionKey, id => {
+    nodes.value[id]?.observer?.disconnect();
     nodes.value[id] = undefined;
 });
 provide(NodesInjectionKey, nodes);
 
-let isDirty = true;
-let boundingRect = resizeListener.value?.getBoundingClientRect();
-function updateNodes() {
-    if (resizeListener.value != null && isDirty) {
-        isDirty = false;
-        nextTick(() => {
-            boundingRect = resizeListener.value?.getBoundingClientRect();
-            Object.keys(nodes.value).forEach(id => updateNode(id));
-            isDirty = true
-        });
-    }
-}
-
 function updateNode(id: string) {
     const node = nodes.value[id];
-    if (!node || boundingRect == null) {
+    if (node == null) {
         return;
     }
-    const nodeRect = node.element.getBoundingClientRect();
-
-    node.y = nodeRect.x + nodeRect.width / 2 - boundingRect.x;
-    node.x = nodeRect.y + nodeRect.height / 2 - boundingRect.y;
-    node.rect = nodeRect;
+    node.rect = node.element.getBoundingClientRect();
 }
 </script>
-
-<style scoped>
-svg,
-.resize-listener {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: -10;
-    pointer-events: none;
-}
-</style>
diff --git a/src/features/links/Link.vue b/src/features/links/Link.vue
index 8371836..9159f87 100644
--- a/src/features/links/Link.vue
+++ b/src/features/links/Link.vue
@@ -13,32 +13,47 @@
 <script setup lang="ts">
 import { Link } from "features/links/links";
 import { FeatureNode } from "game/layers";
-import { computed, toRefs, unref } from "vue";
+import { computed, toRefs } from "vue";
 
 const _props = defineProps<{
     link: Link;
     startNode: FeatureNode;
     endNode: FeatureNode;
+    boundingRect: DOMRect | undefined;
 }>();
 const props = toRefs(_props);
 
 const startPosition = computed(() => {
-    const position = { x: props.startNode.value.x || 0, y: props.startNode.value.y || 0 };
+    const rect = props.startNode.value.rect;
+    const boundingRect = props.boundingRect.value;
+    const position =
+        rect && boundingRect
+            ? {
+                  x: rect.x + rect.width / 2 - boundingRect.x,
+                  y: rect.y + rect.height / 2 - boundingRect.y
+              }
+            : { x: 0, y: 0 };
     if (props.link.value.offsetStart) {
-        position.x += unref(props.link.value.offsetStart).x;
-        position.y += unref(props.link.value.offsetStart).y;
+        position.x += props.link.value.offsetStart.x;
+        position.y += props.link.value.offsetStart.y;
     }
     return position;
 });
 
 const endPosition = computed(() => {
-    const position = { x: props.endNode.value.x || 0, y: props.endNode.value.y || 0 };
+    const rect = props.endNode.value.rect;
+    const boundingRect = props.boundingRect.value;
+    const position =
+        rect && boundingRect
+            ? {
+                  x: rect.x + rect.width / 2 - boundingRect.x,
+                  y: rect.y + rect.height / 2 - boundingRect.y
+              }
+            : { x: 0, y: 0 };
     if (props.link.value.offsetEnd) {
-        position.x += unref(props.link.value.offsetEnd).x;
-        position.y += unref(props.link.value.offsetEnd).y;
+        position.x += props.link.value.offsetEnd.x;
+        position.y += props.link.value.offsetEnd.y;
     }
     return position;
 });
 </script>
-
-<style scoped></style>
diff --git a/src/features/links/Links.vue b/src/features/links/Links.vue
index fa5ead1..cab8aae 100644
--- a/src/features/links/Links.vue
+++ b/src/features/links/Links.vue
@@ -4,34 +4,71 @@
             v-for="(link, index) in validLinks"
             :key="index"
             :link="link"
+            :boundingRect="boundingRect"
             :startNode="nodes[link.startNode.id]!"
             :endNode="nodes[link.endNode.id]!"
         />
     </svg>
+    <div ref="resizeListener" class="resize-listener" />
 </template>
 
 <script setup lang="ts">
 import { Link } from "features/links/links";
 import { NodesInjectionKey } from "game/layers";
-import { computed, inject, toRef } from "vue";
+import { computed, inject, nextTick, onMounted, ref, toRef } from "vue";
 import LinkVue from "./Link.vue";
 
 const _props = defineProps<{ links?: Link[] }>();
 const links = toRef(_props, "links");
 
+const resizeObserver = new ResizeObserver(updateNodes);
+
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const nodes = inject(NodesInjectionKey)!;
 
-const validLinks = computed(
-    () =>
-        links.value?.filter(link => {
-            const n = nodes.value;
-            return (
-                n[link.startNode.id]?.x != undefined &&
-                n[link.startNode.id]?.y != undefined &&
-                n[link.endNode.id]?.x != undefined &&
-                n[link.endNode.id]?.y != undefined
+const resizeListener = ref<Element | null>(null);
+
+onMounted(() => {
+    // ResizeListener exists because ResizeObserver's don't work when told to observe an SVG element
+    const resListener = resizeListener.value;
+    if (resListener != null) {
+        resizeObserver.observe(resListener);
+    }
+});
+
+let isDirty = true;
+let boundingRect = ref(resizeListener.value?.getBoundingClientRect());
+function updateNodes() {
+    if (resizeListener.value != null && isDirty) {
+        isDirty = false;
+        nextTick(() => {
+            boundingRect.value = resizeListener.value?.getBoundingClientRect();
+            Object.values(nodes.value).forEach(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                node => (node!.rect = node?.element.getBoundingClientRect())
             );
-        }) ?? []
-);
+            isDirty = true;
+        });
+    }
+}
+
+const validLinks = computed(() => {
+    const n = nodes.value;
+    return (
+        links.value?.filter(link => n[link.startNode.id]?.rect && n[link.startNode.id]?.rect) ?? []
+    );
+});
 </script>
+
+<style scoped>
+.resize-listener,
+svg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -10;
+    pointer-events: none;
+}
+</style>
diff --git a/src/game/layers.tsx b/src/game/layers.tsx
index 6706912..5733ade 100644
--- a/src/game/layers.tsx
+++ b/src/game/layers.tsx
@@ -22,9 +22,8 @@ import { persistent, PersistentRef } from "./persistence";
 import player from "./player";
 
 export interface FeatureNode {
-    x?: number;
-    y?: number;
     rect?: DOMRect;
+    observer?: MutationObserver;
     element: HTMLElement;
 }