diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index d8433d8..64fb55e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -391,36 +391,3 @@ a:has(button) {
     font-weight: bold;
     padding: 3px 5px;
 }
-
-.map-icon svg {
-    display: inline-block;
-    width: 20px;
-    vertical-align: middle;
-    margin-top: -3px;
-    stroke: #fff;
-    fill: none;
-    position: relative;
-    z-index: 1;
-}
-
-.map-popup {
-    display: none;
-}
-
-.map-icon:hover .map-popup {
-    display: block;
-    position: absolute;
-    color: tomato;
-    z-index: 100;
-}
-
-.map-nm-loc {
-    width: 20px;
-    height: 20px;
-    border-radius: 50px;
-    opacity: .5;
-    background-color: #005ba4;
-    display: inline-block;
-    margin-left: -10px;
-    margin-top: -10px;
-}
diff --git a/app/views/instance/_list.html.erb b/app/views/instance/_list.html.erb
index 6630721..828131a 100644
--- a/app/views/instance/_list.html.erb
+++ b/app/views/instance/_list.html.erb
@@ -12,17 +12,6 @@
       <div class="meta">
         <h3 class="nm-info">
           <span class="badge">LV<%= nm[:level].to_s.rjust(2, "0") %></span>
-          <% if nm[:x] and nm[:y] %>
-            <span class="map-icon">
-              <%= render partial: "map_icon" %>
-              <div class="map-popup">
-                <div style="position: relative; width: 200px; height: 200px;">
-                  <img src="/maps/<%= @instance.zone %>_fw.jpg" style="width: 200px; z-index: 100;" />
-                  <span class="map-nm-loc" style="position: absolute; left: <%= (nm[:x] / 42.0) * 100.0 %>%; top: <%= (nm[:y] / 42.0) * 100.0 %>%;"></span>
-                </div>
-              </div>
-            </span>
-          <% end %>
           <%= nm[:name] %>
           <% if nm[:drops] %>
             <span title="<%= nm[:drops] %>" style="font-size: 14px;">✨</span>
diff --git a/app/views/instance/_map_icon.html.erb b/app/views/instance/_map_icon.html.erb
deleted file mode 100644
index b6f060a..0000000
--- a/app/views/instance/_map_icon.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg viewBox="0 0 24 24"  xmlns="http://www.w3.org/2000/svg">
-  <path d="M9 20L3 17V4L9 7M9 20L15 17M9 20V7M15 17L21 20V7L15 4M15 17V4M9 7L15 4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/data/anemos.toml b/data/anemos.toml
index 94c01a4..4aefc21 100644
--- a/data/anemos.toml
+++ b/data/anemos.toml
@@ -45,8 +45,8 @@ name = "Sabotender Corrido"
 nick = "Sabo"
 level = 1
 element = "wind"
-x = 14.1
-y = 21.8
+x = 14
+y = 22
 
 [nms.spawned_by]
 name = "Flowering Sabotender"
@@ -57,8 +57,8 @@ name = "The Lord of Anemos"
 nick = "Lord"
 level = 2
 element = "water"
-x = 27.8
-y = 28.2
+x = 30
+y = 27
 drops = "The Prince of Anemos (minion)"
 
 [nms.spawned_by]
@@ -71,7 +71,7 @@ nick = "Teles"
 level = 3
 element = "wind"
 x = 26
-y = 26.8
+y = 28
 
 [nms.spawned_by]
 name = "Anemos Harpeia"
@@ -82,8 +82,8 @@ name = "The Emperor of Anemos"
 nick = "Emperor"
 level = 4
 element = "wind"
-x = 17.2
-y = 23.9
+x = 17
+y = 22
 drops = "Emperor Hairpin"
 
 [nms.spawned_by]
@@ -95,8 +95,8 @@ name = "Callisto"
 nick = "Callisto"
 level = 5
 element = "earth"
-x = 27.8
-y = 23.3
+x = 26
+y = 22
 
 [nms.spawned_by]
 name = "Val Bear"
@@ -107,8 +107,8 @@ name = "Number"
 nick = "Number"
 level = 6
 element = "lightning"
-x = 23.2
-y = 22.7
+x = 24
+y = 23
 
 [nms.spawned_by]
 name = "Pneumaflayer"
@@ -119,8 +119,8 @@ name = "Jahannam"
 nick = "Jaha"
 level = 7
 element = "wind"
-x = 19.1
-y = 19.6
+x = 18
+y = 19
 
 [nms.spawned_by]
 name = "Typhoon Sprite"
@@ -132,8 +132,8 @@ name = "Amemet"
 nick = "Amemet"
 level = 8
 element = "fire"
-x = 14.7
-y = 15.9
+x = 15
+y = 16
 
 [nms.spawned_by]
 name = "Abraxas"
@@ -144,8 +144,8 @@ name = "Caym"
 nick = "Caym"
 level = 9
 element = "ice"
-x = 12.6
-y = 12.4
+x = 14
+y = 13
 
 [nms.spawned_by]
 name = "Stalker Ziz"
@@ -156,8 +156,8 @@ name = "Bombadeel"
 nick = "Bomba"
 level = 10
 element = "earth"
-x = 28.5
-y = 20.5
+x = 28
+y = 20
 
 [nms.spawned_by]
 name = "Traveling Gourmand"
@@ -169,8 +169,8 @@ name = "Serket"
 nick = "Serket"
 level = 11
 element = "earth"
-x = 24
-y = 20
+x = 25
+y = 18
 drops = "Scorpion Harness, Wind-up Mithra"
 
 [nms.spawned_by]
@@ -182,8 +182,8 @@ name = "Judgmental Julika"
 nick = "Julika"
 level = 12
 element = "ice"
-x = 22.2
-y = 14.9
+x = 22
+y = 16
 
 [nms.spawned_by]
 name = "Henbane"
@@ -195,7 +195,7 @@ nick = "Rider"
 level = 13
 element = "lightning"
 x = 20
-y = 13.4
+y = 13
 
 [nms.spawned_by]
 name = "Duskfall Dullahan"
@@ -207,8 +207,8 @@ name = "Polyphemus"
 nick = "Poly"
 level = 14
 element = "ice"
-x = 26.2
-y = 15
+x = 26
+y = 14
 
 [nms.spawned_by]
 name = "Monoeye"
@@ -219,8 +219,8 @@ name = "Simurgh's Strider"
 nick = "Strider"
 level = 15
 element = "wind"
-x = 28.8
-y = 13.3
+x = 29
+y = 13
 drops = "Strider Boots"
 
 [nms.spawned_by]
@@ -232,8 +232,8 @@ name = "King Hazmat"
 nick = "Hazmat"
 level = 16
 element = "fire"
-x = 35.2
-y = 19.7
+x = 35
+y = 18
 
 [nms.spawned_by]
 name = "Anemos Anala"
@@ -244,8 +244,8 @@ name = "Fafnir"
 nick = "Fafnir"
 level = 17
 element = "fire"
-x = 34.6
-y = 21.9
+x = 36
+y = 22
 drops = "Wind-up Fafnir"
 
 [nms.spawned_by]
@@ -270,8 +270,8 @@ name = "Lamashtu"
 nick = "Lamashtu"
 level = 19
 element = "wind"
-x = 8.2
-y = 25.3
+x = 8
+y = 23
 
 [nms.spawned_by]
 name = "Val Specter"
@@ -283,8 +283,8 @@ name = "Pazuzu"
 nick = "Paz"
 level = 20
 element = "wind"
-x = 7.3
-y = 21.7
+x = 7
+y = 22
 weather = "gales"
 drops = "Altar to Pazuzu, Pazuzu (card)"
 
diff --git a/data/hydatos.toml b/data/hydatos.toml
index 9cd1601..4eab987 100644
--- a/data/hydatos.toml
+++ b/data/hydatos.toml
@@ -40,8 +40,8 @@ name = "Khalamari"
 nick = "Khalamari"
 level = 50
 element = "water"
-x = 10.8
-y = 25.6
+x = 11
+y = 24
 
 [nms.spawned_by]
 name = "Xzomit"
@@ -52,8 +52,8 @@ name = "Stegodon"
 nick = "Stegodon"
 level = 51
 element = "earth"
-x = 10.4
-y = 17.2
+x = 9
+y = 17
 
 [nms.spawned_by]
 name = "Hydatos Primelephas"
@@ -64,8 +64,8 @@ name = "Molech"
 nick = "Molech"
 level = 52
 element = "ice"
-x = 8.1
-y = 21.8
+x = 7
+y = 21
 drops = "Molech's Horn (magicite)"
 
 [nms.spawned_by]
@@ -77,8 +77,8 @@ name = "Piasa"
 nick = "Piasa"
 level = 53
 element = "wind"
-x = 7.1
-y = 14.5
+x = 7
+y = 14
 
 [nms.spawned_by]
 name = "Vivid Gastornis"
@@ -89,8 +89,8 @@ name = "Frostmane"
 nick = "Frostmane"
 level = 54
 element = "fire"
-x = 8.2
-y = 26.1
+x = 8
+y = 25
 
 [nms.spawned_by]
 name = "Northern Tiger"
@@ -101,8 +101,8 @@ name = "Daphne"
 nick = "Daphne"
 level = 55
 element = "water"
-x = 24.2
-y = 19
+x = 25
+y = 15
 
 [nms.spawned_by]
 name = "Dark Void Monk"
@@ -113,7 +113,7 @@ name = "King Goldemar"
 nick = "Golde"
 level = 56
 element = "lightning"
-x = 29.1
+x = 28
 y = 23
 drops = "Goldemar's Horn (magicite), Dvergr (card)"
 
@@ -127,8 +127,8 @@ name = "Leuke"
 nick = "Leuke"
 level = 57
 element = "earth"
-x = 37.4
-y = 26.4
+x = 37
+y = 26
 
 [nms.spawned_by]
 name = "Tigerhawk"
@@ -139,8 +139,8 @@ name = "Barong"
 nick = "Barong"
 level = 58
 element = "fire"
-x = 32.2
-y = 25.3
+x = 32
+y = 24
 
 [nms.spawned_by]
 name = "Laboratory Lion"
@@ -151,8 +151,8 @@ name = "Ceto"
 nick = "Ceto"
 level = 59
 element = "water"
-x = 36.3
-y = 14
+x = 36
+y = 13
 drops = "Ceto's Claw (magicite)"
 
 [nms.spawned_by]
@@ -164,8 +164,8 @@ name = "Provenance Watcher"
 nick = "PW"
 level = 60
 element = "fire"
-x = 32.8
-y = 19.5
+x = 32
+y = 19
 drops = "Provenance Watcher (card)"
 
 [nms.spawned_by]
diff --git a/data/pagos.toml b/data/pagos.toml
index 5639b18..61e6c35 100644
--- a/data/pagos.toml
+++ b/data/pagos.toml
@@ -114,8 +114,8 @@ name = "Hakutaku"
 nick = "Haku"
 level = 25
 element = "fire"
-x = 28.5
-y = 22.4
+x = 29
+y = 22
 drops = "Optical Hat"
 
 [nms.spawned_by]
@@ -127,8 +127,8 @@ name = "King Igloo"
 nick = "Igloo"
 level = 26
 element = "ice"
-x = 17.4
-y = 16.2
+x = 17
+y = 16
 
 [nms.spawned_by]
 name = "Huwasi"
@@ -139,8 +139,8 @@ name = "Asag"
 nick = "Asag"
 level = 27
 element = "lightning"
-x = 10.5
-y = 10.5
+x = 10
+y = 10
 
 [nms.spawned_by]
 name = "Wandering Opken"
@@ -152,7 +152,7 @@ nick = "Surabhi"
 level = 28
 element = "earth"
 x = 10
-y = 18.2
+y = 20
 
 [nms.spawned_by]
 name = "Pagos Billygoat"
@@ -163,8 +163,8 @@ name = "King Arthro"
 nick = "Arthro"
 level = 29
 element = "water"
-x = 8.5
-y = 15.5
+x = 8
+y = 15
 weather = "fog"
 drops = "Blitzring"
 
@@ -177,8 +177,8 @@ name = "Mindertaur/Eldertaur"
 nick = "Brothers"
 level = 30
 element = "earth"
-x = 14
-y = 18.5
+x = 13
+y = 18
 
 [nms.spawned_by]
 name = "Lab Minotaur"
@@ -190,7 +190,7 @@ nick = "Holy Cow"
 level = 31
 element = "water"
 x = 26
-y = 17.1
+y = 16
 
 [nms.spawned_by]
 name = "Elder Buffalo"
@@ -201,7 +201,7 @@ name = "Hadhayosh"
 nick = "Behe"
 level = 32
 element = "lightning"
-x = 31.4
+x = 30
 y = 19
 drops = "Behemoth Horn/Pelt"
 weather = "thunder"
@@ -215,8 +215,8 @@ name = "Horus"
 nick = "Horus"
 level = 33
 element = "fire"
-x = 25.5
-y = 20.2
+x = 25
+y = 19
 weather = "heat"
 
 [nms.spawned_by]
@@ -228,8 +228,8 @@ name = "Arch Angra Mainyu"
 nick = "Mainyu"
 level = 34
 element = "wind"
-x = 24.4
-y = 25.3
+x = 24
+y = 25
 
 [nms.spawned_by]
 name = "Gawper"
@@ -241,7 +241,7 @@ nick = "Cassie"
 level = 35
 element = "ice"
 x = 22
-y = 14.5
+y = 14
 drops = "Cassie Earring"
 weather = "blizzards"
 
@@ -254,8 +254,8 @@ name = "Louhi"
 nick = "Louhi"
 level = 35
 element = "ice"
-x = 35.7
-y = 18.7
+x = 36
+y = 19
 drops = "Louhi (card)"
 
 [nms.spawned_by]
diff --git a/data/pyros.toml b/data/pyros.toml
index 273de0d..15696f2 100644
--- a/data/pyros.toml
+++ b/data/pyros.toml
@@ -31,8 +31,8 @@ name = "Leucosia"
 nick = "Leucosia"
 level = 35
 element = "water"
-x = 26.6
-y = 26.3
+x = 27
+y = 26
 
 [nms.spawned_by]
 name = "Pyros Bhoot"
@@ -44,8 +44,8 @@ name = "Flauros"
 nick = "Flauros"
 level = 36
 element = "lightning"
-x = 29.1
-y = 29.6
+x = 29
+y = 29
 
 [nms.spawned_by]
 name = "Thunderstorm Sprite"
@@ -57,8 +57,8 @@ name = "The Sophist"
 nick = "Sophist"
 level = 37
 element = "wind"
-x = 31.9
-y = 32
+x = 31
+y = 31
 
 [nms.spawned_by]
 name = "Pyros Apanda"
@@ -69,8 +69,8 @@ name = "Graffiacane"
 nick = "Doll"
 level = 38
 element = "ice"
-x = 23.7
-y = 37.3
+x = 23
+y = 37
 drops = "Calca (minion)"
 
 [nms.spawned_by]
@@ -82,8 +82,8 @@ name = "Askalaphos"
 nick = "Owl"
 level = 39
 element = "wind"
-x = 19.3
-y = 28.1
+x = 19
+y = 29
 weather = "umbral_wind"
 
 [nms.spawned_by]
@@ -95,8 +95,8 @@ name = "Grand Duke Batym"
 nick = "Batym"
 level = 40
 element = "earth"
-x = 17.9
-y = 14.3
+x = 18
+y = 14
 
 [nms.spawned_by]
 name = "Dark Troubadour"
@@ -108,7 +108,7 @@ name = "Aetolus"
 nick = "Aetolus"
 level = 41
 element = "lightning"
-x = 10.2
+x = 10
 y = 14
 
 [nms.spawned_by]
@@ -120,8 +120,8 @@ name = "Lesath"
 nick = "Lesath"
 level = 42
 element = "fire"
-x = 12.8
-y = 11.5
+x = 13
+y = 11
 
 [nms.spawned_by]
 name = "Bird Eater"
@@ -132,8 +132,8 @@ name = "Eldthurs"
 nick = "Eldthurs"
 level = 43
 element = "fire"
-x = 15.4
-y = 6.6
+x = 13
+y = 6
 
 [nms.spawned_by]
 name = "Pyros Crab"
@@ -144,8 +144,8 @@ name = "Iris"
 nick = "Iris"
 level = 44
 element = "water"
-x = 21.5
-y = 11.9
+x = 21
+y = 11
 
 [nms.spawned_by]
 name = "Northern Swallow"
@@ -156,8 +156,8 @@ name = "Lamebrix Strikebocks"
 nick = "Lamebrix"
 level = 45
 element = "earth"
-x = 22
-y = 7.9
+x = 21
+y = 7
 drops = "Lamebrix's Dice (magicite)"
 
 [nms.spawned_by]
@@ -170,7 +170,7 @@ nick = "Dux"
 level = 46
 element = "lightning"
 x = 27
-y = 9.1
+y = 9
 weather = "thunder"
 
 [nms.spawned_by]
@@ -182,8 +182,8 @@ name = "Lumber Jack"
 nick = "Jack"
 level = 47
 element = "earth"
-x = 30
-y = 11.6
+x = 29
+y = 11
 drops = "Wind-up Elvaan"
 
 [nms.spawned_by]
@@ -195,8 +195,8 @@ name = "Glaukopis"
 nick = "Glaukopis"
 level = 48
 element = "fire"
-x = 31.6
-y = 14.9
+x = 31
+y = 15
 
 [nms.spawned_by]
 name = "Val Skatene"
@@ -220,8 +220,8 @@ name = "Skoll"
 nick = "Skoll"
 level = 50
 element = "ice"
-x = 23.9
-y = 30
+x = 23
+y = 29
 weather = "blizzards"
 drops = "Skoll's Claw (magicite)"
 
@@ -234,8 +234,8 @@ name = "Penthesilea"
 nick = "Penny"
 level = 50
 element = "fire"
-x = 35.5
-y = 6.1
+x = 35
+y = 6
 drops = "Penthesilea (card)"
 weather = "heat"