diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/grolnok.txt b/forge-gui/res/adventure/Shandalar/custom_cards/grolnok_boss_effect.txt
similarity index 97%
rename from forge-gui/res/adventure/Shandalar/custom_cards/grolnok.txt
rename to forge-gui/res/adventure/Shandalar/custom_cards/grolnok_boss_effect.txt
index 99bf3ffa125..a4c2241fc6e 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/grolnok.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/grolnok_boss_effect.txt
@@ -1,4 +1,4 @@
-Name:Grolnok
+Name:Grolnok's Boss Effect
 ManaCost:no cost
 Colors:black,green,Blue
 Types:Enchantment
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/slobad.txt b/forge-gui/res/adventure/Shandalar/custom_cards/slobad_boss_effect.txt
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/custom_cards/slobad.txt
rename to forge-gui/res/adventure/Shandalar/custom_cards/slobad_boss_effect.txt
index 83bbde948c3..cc49d1cebb0 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/slobad.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/slobad_boss_effect.txt
@@ -1,4 +1,4 @@
-Name:Slobad
+Name:Slobad's Boss Effect
 ManaCost:no cost
 Types:Artifact
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+Artifact | AddToughness$ 2 | EffectZone$ Command | Description$ Artifact Creatures you control get +0/+2
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/tibalt.txt b/forge-gui/res/adventure/Shandalar/custom_cards/tibalt_boss_effect.txt
similarity index 99%
rename from forge-gui/res/adventure/Shandalar/custom_cards/tibalt.txt
rename to forge-gui/res/adventure/Shandalar/custom_cards/tibalt_boss_effect.txt
index 06493a93509..94add4dcc13 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/tibalt.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/tibalt_boss_effect.txt
@@ -1,4 +1,4 @@
-Name:Tibalt
+Name:Tibalt's Boss Effect
 ManaCost:no cost
 Colors:red,black
 Types:Enchantment
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/xira.txt b/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/custom_cards/xira.txt
rename to forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
index 99fabe3a555..2b062a3d968 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/xira.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/xira_boss_effect.txt
@@ -1,4 +1,4 @@
-Name:Xira
+Name:Xira's Boss Effect
 ManaCost:no cost
 Colors:black,green,red
 Types:Enchantment
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 2071e3aaced..6175c4266bd 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,12 +3,12 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "map/cursed_swamp.tmx",
+    "activeFile": "",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
         "tileset",
-        "map",
         "map/main_story",
+        "map",
         "obj"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
@@ -1824,7 +1824,7 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 5,
             "viewCenter": {
                 "x": 288,
                 "y": 192.25
@@ -2454,8 +2454,8 @@
         },
         "map/main_story/templeofchandra.tmx": {
             "expandedObjectLayers": [
-                2,
-                7
+                7,
+                2
             ],
             "scale": 1.5,
             "selectedLayer": 5,
@@ -3208,7 +3208,7 @@
             "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 390.75,
+                "x": 390.5,
                 "y": 221.75
             }
         },
@@ -3251,28 +3251,20 @@
     "map.tileWidth": 16,
     "map.width": 90,
     "openFiles": [
-        "map/main_story/templeofchandra.tmx",
-        "map/tibalt_f1.tmx",
-        "map/tibalt.tmx",
-        "map/tibalt_f2.tmx",
-        "map/grolnok.tmx",
-        "map/nahiri.tmx",
-        "map/nahiricave.tmx",
-        "map/cursed_swamp.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
     "recentFiles": [
         "map/main_story/templeofchandra.tmx",
-        "map/tibalt_f1.tmx",
         "map/tibalt.tmx",
-        "map/tibalt_f2.tmx",
-        "map/grolnok.tmx",
-        "map/nahiri.tmx",
+        "map/tibalt_f1.tmx",
+        "map/xira.tmx",
         "map/nahiricave.tmx",
+        "map/nahiri.tmx",
+        "map/grolnok.tmx",
+        "map/tibalt_f2.tmx",
         "map/cursed_swamp.tmx",
         "map/slobad_factory.tmx",
-        "map/xira.tmx",
         "map/main_story/blue_castle_f1.tmx",
         "map/kiora_island.tmx"
     ],
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
index ada56d6eb37..dfa008f4639 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
@@ -10,17 +10,17 @@
    eJzNVkEOgDAI4+rH/P+TjJ4Wso4iDVuTxaTRUcpkmJndl314n+OacYrl4Tkfe8b9icG8i7iqF6yeyJsVx9YOfYvyX3mDkPGbyQ/FUKOyp1JPVLNuPQp06jkx90ot1WDO106tUZ/qhqInKnFa3VT3RjU++5916WFidZ4h1pusnyptSAvLd+lBc6NaU6UGu3sTM+tV92fmy6gvZWf32T4ZrSMemJc8zA==
   </data>
  </layer>
- <layer id="1" name="Background" width="36" height="24" visible="0">
+ <layer id="1" name="Background" width="36" height="24">
   <data encoding="base64" compression="zlib">
    eJxbwM7AsGAUw/F/NuqZtRgJD7RbRvHQxQyDwA3IeOEgcMMoHsWjeBQTiys5B8besgGyFxdmIlH9MVZUeiDxJQbsbqMUk2sOtrildziB3ICM6WXvQix209MNgyE9UgMDAG2aMkY=
   </data>
  </layer>
- <layer id="2" name="Ground" width="36" height="24" visible="0">
+ <layer id="2" name="Ground" width="36" height="24">
   <data encoding="base64" compression="zlib">
    eJydl1FS1EAQhoclyUaqfFLPIB5Cn9GluITw7BN6AsHSI+ACexjg1ap9EC9AiZZXQPO78zs/PT3ZxL+qa0My0/nS3dMzhJD0tQ3hS/d7WYdM9TS/9/ZBMh23zuxYvI+mmkxX5vF4Up7Su/msNOZ3U+Z5tBXC486ebA3j8cZrDNbxWBbYeXf/usvTtzb5GCvO4TstW8ku6pznMMb7nakDCmOu2/t/ezz/Y+B5sxHCfpOM34SYezzKOyRGY3keTkLY3cxrzmOBUCPkfdEmU01GxgV1EySvV3W+9pi/MX7P4vz5SJ45mUSMkfJovHUtq21MU1/wclbz2bS/FxxV+fxtqU3w6FzLge8hx0fH12fDd2K4hvDYXGmvIEMwsUVc0cNvN8v+duTZcZXHCr998w9jLXM8Y2G/mdrrfN1Ef4gVDfrl8H4QJvJgzLzg/9y5v9PDT/2I76aRgTH8KT4WJkb8/hKTFXzamB5X+Rjbj6kbM/fE1JLWJt+zDCs+9JNTZx2T6ZX4Rty8eh6iRYFnJv69PVpjiFr5HsczPzO5V9LLyP2pSt+kMVKDX6y3ZYEH12cmr++rFcfewLoCw24cq/wLh6cvPry2POt01yQW+JkVuD0eFfrt375o+iBydte4LotaxwKdOjzL+AxzsSb/nc0cJk96PtiPzAdNyjd9lmJj61nFPtPHpHv6QVPe22Cve2KK+Hl7Es4dV5Hf9gnvHFIyb5983uYcjE3J/0VkQd1oD7W+x7LoOYt5pXj9zJxpnpq83hoe7F3g1BrX+6GHQ20Rf5E/XmPNXtbJ/7bzP8UfHp3Gmw==
   </data>
  </layer>
- <layer id="3" name="Clutter" width="36" height="24" visible="0">
+ <layer id="3" name="Clutter" width="36" height="24">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
@@ -28,7 +28,7 @@
    eJyVV0lrVEEQrsm8ZRY0qGGOLihBL15MFDR6j5Oj4O5JvBlBJOBFr/4Ft0ii4FE9mpgIQvRqMqPg1YuCCHpQcbc+usuuV/NmeR989Ovl1fv6q+qehMgjJXrJzeEGUczPfxOilprDOMZexETz3K8ylyKiZeZTZoX7dxUxvyVy3MrcxjwTu3X3UveNNxTQ9i2+eWTYPV8qBQLP+f2frOFX4jStxG58F7cR909ye4p5mpmob6CNvF6rGVoWakSLzKkGZXAtCs+HKlkKrvP7N9LQh/6PZeeR9kPv+Rzrv6/0as1H60THmMfrIeb6oWz8WR9L7+92GjzqhmbZefWBn69UiSYbQYvNn2i2eqAFvki+Zr1/4GQj6EKtQEvLaxJdVh+8ghaJgTxtjpwXwGMe+153xPyPHH+AMU/ondgY1mgtoHh3J6UOQCvqG3ouV12MeeUFUfBD80ktxGireKgn8GvdETp2ek9QQ6JlgkL+BLrGUOvLNadJ9hT79V+4v1TLUuZXjNdTPj8zHKeUZj0BJAeLaj/6jMKz30nQ3Qv6LOm157dn1+n8ALNqrfh7wuda6ktyDdzk/lDqfCUfC3OrzDX1nX1K12s1jnxdUJrEN+2LQPL4rZ7VMCjW+i/pAM4sNM55LeLrKoU92rifR7P9NhVD038Ducp7F95Az/6CcQcF9tPL2266UAPg+3J2vOj+8yB+C1Ann0Y7140z93ra3wqblzzIfS53e949JRCPcN9Z/Ek6xyqb3F1TqG79mSqKpvktvaX2AR12XTdNg3gm72sOirEosKV+7weJkVdX+vu9YizUOsfkHprZ4bguCbokVtFa7neOBLhnr1bdM2rubOJogfqZjov5fKDSX4uGPlf/ay8Nd1/LrJ+OQ/xu37Dj9m7vB6nTg34vuP9Wo/y1Nm+2LtHiDLwdcf3dG0JbMrrkPhnvogsaHiaOwypf4pHep+jqxTX1PM58kIT4mo+Ye3LeFw3vyvlaUNf6bwoNzGlg3UWfW/hv53vh1Ui2b8/NXJofz95bWtszpUfexd7k7yz5v8U+W2gt/wDn09Bg
   </data>
  </layer>
- <layer id="7" name="Tilelaag 5" width="36" height="24" visible="0">
+ <layer id="7" name="Tilelaag 5" width="36" height="24">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
@@ -36,7 +36,7 @@
    eJy9lcEOATEQhidBhA1uXkDCwUmIRLyBFxDv4EFcPQ6eYtcLODq64Go3u5UxpjvTqv2Spu3upPNPZ9oC5JyhWhbCfxc9tWa5D8mX9N9Vj415J8AiDKu+bGPbIw1rB93jnvv6+27e0zxo8/cPpJixpqVnXmdkTBvl2v/sJy0/v76cQT4HV0UtYmi9cHHTdUeNvJ8W9rSvErwfXA6xHqrP56zY8Ik7hk+NrrnDvvFaNi22vbkNv+0MrjWe7XFSooFqSRhtnCbDoQ1wTNuprdMjnWmD0ZyQJsWxjgC2A4BNVMwDvjG2euZiMbV9T3U80vaMwunQ6KTEaGzeFw27op/+oCeD3tUcXA3Z6i6EljJMDZXZarThO467l33vGC00b1kdJGSMv1VNLJuo2ckmby71gI4Dkr2BtK7o3CXOKglxVl9SX0NS
   </data>
  </layer>
- <objectgroup id="4" name="Objects" visible="0">
+ <objectgroup id="4" name="Objects">
   <object id="38" template="../obj/entry_up.tx" x="256" y="377.5">
    <properties>
     <property name="teleport" value=""/>
@@ -45,7 +45,7 @@
   <object id="49" template="../obj/gold.tx" x="107.705" y="136.536"/>
   <object id="53" template="../obj/enemy.tx" x="271.708" y="215.489" width="16" height="17.6724">
    <properties>
-    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Grolnok&quot;]
+    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Grolnok's Boss Effect&quot;]
 }</property>
     <property name="enemy" value="Grolnok"/>
     <property name="threatRange" type="int" value="60"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/slobad_factory.tmx b/forge-gui/res/adventure/Shandalar/maps/map/slobad_factory.tmx
index 2151094bbee..44005105a60 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/slobad_factory.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/slobad_factory.tmx
@@ -72,7 +72,7 @@
   </object>
   <object id="74" template="../obj/enemy.tx" x="398.667" y="110">
    <properties>
-    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Slobad&quot;]
+    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Slobad's Boss Effect&quot;]
 }</property>
     <property name="enemy" value="Slobad"/>
     <property name="threatRange" type="int" value="90"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/tibalt_f2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/tibalt_f2.tmx
index 000571d30c7..3af93ecfc3d 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/tibalt_f2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/tibalt_f2.tmx
@@ -47,7 +47,7 @@
   </object>
   <object id="150" template="../obj/enemy.tx" x="141.842" y="91.272">
    <properties>
-    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Tibalt&quot;]
+    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Tibalt's Boss Effect&quot;]
 }</property>
     <property name="enemy" value="Tibalt"/>
     <property name="reward">[
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx b/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx
index 0d915d697c8..27a377c18dd 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/xira.tmx
@@ -34,7 +34,7 @@
  <objectgroup id="4" name="Objects" opacity="0.9">
   <object id="67" template="../obj/enemy.tx" x="350" y="56.6638" width="16" height="17.6724">
    <properties>
-    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Xira&quot;]
+    <property name="effect">{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Xira's Boss Effect&quot;]
 }</property>
     <property name="enemy" value="Xira"/>
    </properties>