diff --git a/torn-attribute-tracker.user.js b/torn-attribute-tracker.user.js
index 190787a..a0206da 100644
--- a/torn-attribute-tracker.user.js
+++ b/torn-attribute-tracker.user.js
@@ -123,12 +123,6 @@
 
   // ===== dom.js (embedded) =====
   const TAT_KNOWN_ATTRS = ['strength', 'defense', 'speed', 'dexterity', 'endurance', 'intelligence'];
-  const TAT_KNOWN_GYMS = [
-    'Total Bastion', 'Frontline Fitness', 'Premier Fitness', 'Average Joes',
-    "Woody's Workout Club", "Baldr's Gym", 'Sportscience Laboratory',
-    'Chrome Gym', "Mr. Miyagi's", 'Power House', 'Gym 300', 'Gym 400', 'Gym 500', 'Gym 600',
-    'Elite Gym', "David's Gym",
-  ];
   function currentAttribute() {
     const li = tatFindActiveAttributeLi();
     if (!li) return null;
@@ -180,16 +174,15 @@
     return tatParseNumber(valueSpan.textContent);
   }
   function tatFindGymName() {
-    // Gym names live in aria-labels of <button class="gymButton___HASH">.
-    const buttons = document.querySelectorAll('button[class*="gymButton"]');
-    for (const btn of buttons) {
-      const label = btn.getAttribute('aria-label') || '';
-      for (const name of TAT_KNOWN_GYMS) {
-        // aria-label format: "Gym Name. Membership cost - $X. ..."
-        if (label === name || label.indexOf(name + '.') === 0 || label.indexOf(name + ' ') === 0) {
-          return name;
-        }
-      }
+    // Find the currently selected gym button. It has the "active" class.
+    const activeBtn = document.querySelector('button[class*="gymButton"][class*="active"]');
+    if (activeBtn) {
+      const label = activeBtn.getAttribute('aria-label') || '';
+      // aria-label format: "<Gym Name>. Membership cost - $X. Energy usage - N per train."
+      // The gym name is everything before the first ". ".
+      const dot = label.indexOf('. ');
+      if (dot !== -1) return label.slice(0, dot);
+      return label; // no period, return whole label as fallback
     }
     return null;
   }
@@ -445,9 +438,14 @@
 
   // ===== main.js (embedded) =====
   function findAnchorElement() {
-    // Try several selectors in priority order. Torn's gym page structure
-    // varies; we cast a wide net and return the first match.
+    // Try several selectors in priority order. Torn's gym page renders the
+    // training UI as <ul class="properties___HASH"> (the list of attribute
+    // rows). Anchor the dialog above that list.
     const candidates = [
+      'ul[class*="properties"]',
+      '[class*="gymContent"]',
+      '[class*="gymContentWrapper"]',
+      // Legacy fallbacks (kept in case Torn ever wraps the list in a form):
       'form[action*="train"]',
       'form.train-form',
       'form[class*="train"]',
@@ -459,18 +457,7 @@
     ];
     for (const sel of candidates) {
       const el = document.querySelector(sel);
-      if (el) {
-        // Prefer the form ancestor if the match is a button/link, since we
-        // want to anchor above the whole form, not just the button.
-        return el.closest('form') || el;
-      }
-    }
-    // Last-ditch: any element inside the gym panel that looks like the
-    // training form.
-    const panel = document.querySelector('.gym, #gym, [class*="gym-"], [class*="Gym"]');
-    if (panel) {
-      const form = panel.querySelector('form');
-      if (form) return form;
+      if (el) return el;
     }
     return null;
   }