diff --git a/public/assets/images/scenario-dragon_hunting.svg b/public/assets/images/scenario-dragon_hunting.svg
index e27e404..27b0bdf 100644
--- a/public/assets/images/scenario-dragon_hunting.svg
+++ b/public/assets/images/scenario-dragon_hunting.svg
@@ -1,11 +1,7 @@
 <?xml version="1.0" standalone="no"?>
-<svg viewBox="-150 -150 600 800" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="-15.639999389648438 -129.2300262451172 2320.879638671875 4871.5654296875" xmlns="http://www.w3.org/2000/svg">
   <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="http://localhost:8080/assets/css/map.css" type="text/css" />
   <style>
-    #image-maps image {
-      transform: none;
-    }
-
     g[data-edge="north"] { --i: -2; }
     g[data-edge="south"] { --i: 78; }
 
@@ -69,10 +65,12 @@
     <use href="http://localhost:8080/assets/images/mapsheets.svg#map3" style="transform: translate(0, 780.5px);"/>
 
     <rect id="dots" fill="url(#asterisk)"/>
+
     <g id="firing-arcs">
       <g id="shapes"/>
       <g id="lines"/>
     </g>
+
     <g class="start-locations">
       <g data-edge="north">
         <g data-x="13">
@@ -121,6 +119,7 @@
         </g>
       </g>
     </g>
+
     <g class="grid"/>
   </g>
   <script data-cols="33" data-rows="77" href="http://localhost:8080/map.js"/>
diff --git a/public/assets/images/scenario-race_against_time.svg b/public/assets/images/scenario-race_against_time.svg
index 99d5e5a..93685d4 100644
--- a/public/assets/images/scenario-race_against_time.svg
+++ b/public/assets/images/scenario-race_against_time.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<svg viewBox="-150 -150 600 800" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="-15.639999389648438 -129.2300262451172 2320.879638671875 1751.5654296875" xmlns="http://www.w3.org/2000/svg">
   <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="http://localhost:8080/assets/css/map.css" type="text/css" />
   <style>
     g[data-edge="north"] { --i: -2; }
@@ -61,11 +61,14 @@
 
   <g class="gameboard">
     <use href="http://localhost:8080/assets/images/mapsheets.svg#map4"/>
+
     <rect id="dots" fill="url(#asterisk)"/>
+
     <g id="firing-arcs">
       <g id="shapes"/>
       <g id="lines"/>
     </g>
+
     <g class="start-locations">
       <g data-edge="north">
         <g data-x="13">
@@ -114,6 +117,7 @@
         </g>
       </g>
     </g>
+
     <g class="grid"/>
   </g>
   <script data-cols="33" data-rows="25" href="http://localhost:8080/map.js"/>
diff --git a/public/assets/images/scenario-side_show.svg b/public/assets/images/scenario-side_show.svg
index 810aa33..7eebc83 100644
--- a/public/assets/images/scenario-side_show.svg
+++ b/public/assets/images/scenario-side_show.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?>
-<svg viewBox="-18 -150 2320 3360" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="-15.639999389648438 -109 2320.879638671875 3280" xmlns="http://www.w3.org/2000/svg">
   <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="http://localhost:8080/assets/css/map.css" type="text/css" />
   <style>
     g[data-edge="north"] { --i: -2; }
@@ -100,296 +100,17 @@
 
   <rect id="background"/>
 
-  <!-- <g id="image-maps" style="opacity: 1">
-    <image id="map2" class="map-scans" href="scans/map2.jpg" width="2284" height="1518"/>
-    <image class="map-scans" href="row.jpg" width="2284" height="55" y="1505" />
-    <image id="map3" class="map-scans" href="scans/map3.jpg" width="2284" height="1518"/>
-    <image id="map1" class="map-scans" href="scans/map1.jpg" width="2284" height="1518"/>
-  </g> -->
-
   <g class="gameboard">
     <use href="http://localhost:8080/assets/images/mapsheets.svg#map2"/>
-    <!-- <g id="svg-map2"  style="transform: translate(0, 0px); opacity: 0.5">
-      <g class="building1" style="transform: translate(220px, 280px)">
-        <use href="#building1"/>
-        <g class="furniture">
-          <use style="transform: translate(-22.5px, -49px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-22.5px, 37px)" href="#bed"/>
-          <use style="transform: translate(22.5px, 50.5px)" href="#bed"/>
-          <use style="transform: translate(17.5px, -47px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(20.5px, -19px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(7.5px, -10.75px)" href="#dresser"/>
-          <use style="transform: translate(-14.5px, -1px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(26px, 11.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(27px, 26px)" href="#dresser"/>
-          <use style="transform: translate(-26.75px, 58px) rotate(90deg)" href="#dresser"/>
-        </g>
-      </g>
-      <g class="building2" style="transform: translate(108px, 282px)">
-        <use href="#building2"/>
-        <g class="furniture">
-          <rect class="couch" x="-46" y="11" width="8.5" height="16"/>
-          <rect class="couch" x="-15.5" y="36" width="16" height="8.5"/>
-          <rect class="coffee-table" x="3.5" y="-54.5" width="5" height="9.5"/>
-          <rect class="coffee-table" x="-2" y="-20" width="9.5" height="5"/>
-          <rect class="coffee-table" x="40" y="-4.5" width="9.5" height="5"/>
-          <rect class="coffee-table" x="-29.5" y="36" width="9.5" height="5"/>
-          <rect class="coffee-table" style="transform-origin: 13.25px 16.5px; transform: rotate(-57deg)" x="8.5" y="14.5" width="9.5" height="5"/>
-          <use style="transform: translate(19.5px, -1px)" href="#desk"/>
-          <use style="transform: translate(28px, -47px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(20.5px, 38px) rotate(90deg)" href="#desk"/>
-          <use style="transform: translate(-30px, -21.5px)" href="#desk"/>
-          <use style="transform: translate(-25px, -49px)" href="#desk"/>
-        </g>
-      </g>
-      <g class="building3" style="transform: translate(485.5px, 264.5px)">
-        <use style="transform: rotate(180deg)" href="#building3"/>
-        <g class="furniture">
-          <use style="transform: translate(-2px, -28.5px)" href="#couch"/>
-          <use style="transform: translate(-18px, 12.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(17.75px, 35.25px)" href="#dresser"/>
-          <use style="transform: translate(17.75px, 5px)" href="#dresser"/>
-          <use style="transform: translate(-.5px, 4px)" href="#dresser"/>
-          <use style="transform: translate(-17px, -1px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-24.5px, -18px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(17.5px, -17.5px) rotate(-90deg)" href="#desk"/>
-        </g>
-      </g>
-      <g class="building4" style="transform: translate(377.25px, 278.75px)">
-        <use href="#building4"/>
-        <g class="furniture">
-          <use style="transform: translate(-13.5px, -39px)" href="#bed"/>
-          <use style="transform: translate(12px, -51px)" href="#bed"/>
-          <use style="transform: translate(23.5px, 48px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-22.75px, -1.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-28px, -29.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(28px, -48.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(29px, -18px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-6px, 14.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(28px, 10.5px)" href="#dresser"/>
-          <use style="transform: translate(-22.5px, 34px)" href="#dresser"/>
-          <use style="transform: translate(7.5px, 29px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-30.5px, 48.5px)" href="#dresser"/>
-        </g>
-      </g>
-      <g class="building5" style="transform: translate(103px, 84.75px)">
-        <use href="#building5"/>
-        <g class="furniture">
-          <use style="transform: translate(-36px, -17.25px) rotate(90deg)" href="#bed"/>
-          <use style="transform: translate(23px, -17.25px) rotate(90deg)" href="#bed"/>
-          <use style="transform: translate(-40.25px, -.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-58.5px, 27px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-8px, 20.5px) rotate(90deg)" href="#desk"/>
-          <use style="transform: translate(-48px, 12.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(17.5px, 2.5px)" href="#dresser"/>
-          <use style="transform: translate(35.75px, 2.25px)" href="#dresser"/>
-          <use style="transform: translate(30.25px, 25.5px)" href="#dresser"/>
-          <use style="transform: translate(38.5px, -17.5px)" href="#dresser"/>
-          <use style="transform: translate(49.75px, 13.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(65px, -5.5px)" href="#stairs"/>
-        </g>
-      </g>
-      <g class="building6" style="transform: translate(224px, 85.75px)">
-        <use href="#building6"/>
-        <g class="furniture">
-          <use style="transform: translate(9.5px, -40.5px)" href="#bed"/>
-          <use style="transform: translate(-8px, 11.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(8.75px, 48.75px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-8px, -41px)" href="#dresser"/>
-          <use style="transform: translate(12px, 12px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-15px, 42.5px) rotate(90deg)" href="#dresser"/>
-        </g>
-      </g>
-      <g class="building7" style="transform: translate(427.75px, 110px)">
-        <use href="#building7"/>
-        <g class="furniture">
-          <use style="transform: translate(-99px, -46.5px)" href="#desk"/>
-          <use style="transform: translate(-106px, 22px)" href="#desk"/>
-          <use style="transform: translate(-46px, -58.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(-1.5px, -61.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-1px, -41.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-28.75px, 16.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(32.5px, 32px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(54.5px, 32.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(69.5px, 28.25px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(88px, 31.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(104px, 23.75px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(104.5px, -2px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(103.5px, -41.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(103.25px, -59.75px) rotate(90deg)" href="#desk"/>
-
-          <use style="transform: translate(-107px, -27.75px) rotate(0deg)" href="#dresser"/>
-          <use style="transform: translate(-75.5px, -37.75px) rotate(0deg)" href="#dresser"/>
-          <use style="transform: translate(-63.5px, -26.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-62px, 17.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(6px, 5.5px)" href="#dresser"/>
-          <use style="transform: translate(12.5px, 21.5px)" href="#dresser"/>
-          <use style="transform: translate(48.25px, -32.5px)" href="#dresser"/>
-          <use style="transform: translate(65px, -58px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(73px, -29.25px) rotate(90deg)" href="#dresser"/>
-
-          <path class="stairs" style="transform: translate(34.5px, -63.25px) rotate(-90deg)" d="
-            M -5.25 -10.95 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-          "/>
-        </g>
-      </g>
-    </g> -->
     <use href="http://localhost:8080/assets/images/mapsheets.svg#map3" style="transform: translate(0, 390.25px);"/>
-    <!-- <g id="svg-map3" style="transform: translate(0, 390.25px);">
-      <g class="building1" style="transform: translate(359px, 98.5px)">
-        <use href="#building1"/>
-        <g class="furniture">
-          <rect class="couch" x="-28.75" y="-51.75" width="16" height="8.5"/>
-          <rect class="coffee-table" x="12.75" y="-48.75" width="9.5" height="5"/>
-          <rect class="coffee-table" x="22.75" y="-34.75" width="9.5" height="5"/>
-          <rect class="coffee-table" x="-18.75" y="-2.75" width="9.5" height="5"/>
-          <rect class="coffee-table" x="-31.75" y="24.25" width="9.5" height="5"/>
-          <rect class="coffee-table" x="22.25" y="27.25" width="9.5" height="5"/>
-          <rect class="coffee-table" x="23.25" y="10.75" width="5" height="9.5"/>
-          <rect class="coffee-table" x="12.25" y="-29.75" width="5" height="9.5"/>
-          <rect class="bed" x="-19.75" y="42.25" width="10" height="18"/>
-          <rect class="bed" x="17.25" y="41.25" width="10" height="18"/>
-        </g>
-      </g>
-      <g class="building2" style="transform: translate(185px, 77.5px)">
-        <use style="transform: rotate(180deg)" href="#building2"/>
-        <g class="furniture">
-          <use style="transform: translate(-39px, -2.75px)" href="#couch"/>
-          <use style="transform: translate(5.25px, -41px) rotate(90deg)" href="#couch"/>
 
-          <use style="transform: translate(-14.5px, -16.25px) rotate(29deg)" href="#dresser"/>
-          <use style="transform: translate(-16.75px, 6.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-28.25px, 52px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(23.75px, -38.25px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(32.5px, 21.5px) rotate(-60deg)" href="#dresser"/>
-
-          <use style="transform: translate(-20px, -40px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(40px, -19px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(4.5px, 10.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-11px, 48px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(25px, 48px) rotate(180deg)" href="#desk"/>
-
-          <path id="stairs" style="transform: translate(8px, -16px)" d="
-            M -7 -16.3 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-            m 0 2.75 h 14 v 2.3 h -14 z
-          "/>
-        </g>
-      </g>
-      <g class="building3" style="transform: translate(51.25px, 65.75px)">
-        <use href="#building3"/>
-        <g class="furniture">
-          <use style="transform: translate(2.25px, 23px)" href="#couch"/>
-          <use style="transform: translate(6.5px, -14px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-18.5px, -37px)" href="#dresser"/>
-          <use style="transform: translate(-27px, 37px)" href="#dresser"/>
-          <use style="transform: translate(-25.5px, -17.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(26px, 29.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-13.75px, 16px) rotate(90deg)" href="#desk"/>
-        </g>
-      </g>
-      <g class="building4" style="transform: translate(499px, 96px)">
-        <use style="transform: rotate(180deg)" href="#building4"/>
-        <g class="furniture">
-          <use style="transform: translate(13.5px, 42px)" href="#bed"/>
-          <use style="transform: translate(-11.5px, 51px)" href="#bed"/>
-          <use style="transform: translate(-23px, -51px)" href="#desk"/>
-          <use style="transform: translate(25px, 2.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-7px, -29px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(31.5px, -49.25px)" href="#dresser"/>
-          <use style="transform: translate(29px, -29.25px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(7.5px, -29px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-26.75px, -11px)" href="#dresser"/>
-          <use style="transform: translate(-28px, 16.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(28.75px, 31.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-28px, 48.25px) rotate(90deg)" href="#dresser"/>
-        </g>
-      </g>
-      <g class="building5" style="transform: translate(103px, 294.5px)">
-        <use href="#building5"/>
-        <g class="furniture">
-          <use style="transform: translate(-37px, -17.25px) rotate(90deg)" href="#bed"/>
-          <use style="transform: translate(22px, -17.25px) rotate(90deg)" href="#bed"/>
-          <use style="transform: translate(-41.25px, -.5px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-59.75px, 27px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(-9px, 25.5px) rotate(90deg)" href="#desk"/>
-          <use style="transform: translate(-49.5px, 13.75px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(16.5px, 2.75px)" href="#dresser"/>
-          <use style="transform: translate(34.75px, 2.75px)" href="#dresser"/>
-          <use style="transform: translate(29px, 26px)" href="#dresser"/>
-          <use style="transform: translate(37.5px, -17.25px)" href="#dresser"/>
-          <use style="transform: translate(48.5px, 14px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(65px, -5.5px)" href="#stairs"/>
-        </g>
-      </g>
-      <g class="building6" style="transform: translate(224.5px, 275px)">
-        <use style="transform: rotate(180deg)" href="#building6"/>
-        <g class="furniture">
-          <use style="transform: translate(-9px, 39px)" href="#bed"/>
-          <use style="transform: translate(.5px, 1px) rotate(90deg)" href="#couch"/>
-          <use style="transform: translate(14px, 24.75px)" href="#couch"/>
-          <use style="transform: translate(-10px, -47.75px)" href="#desk"/>
-          <use style="transform: translate(18.5px, -37.25px)" href="#dresser"/>
-          <use style="transform: translate(3px, -13.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-11px, -13.5px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(8px, 42.5px)" href="#dresser"/>
-        </g>
-      </g>
-      <g class="building7" style="transform: translate(419px, 305.75px)">
-        <use href="#building7"/>
-        <g class="furniture">
-          <use style="transform: translate(-99px, -46.75px)" href="#desk"/>
-          <use style="transform: translate(-106px, 21.25px)" href="#desk"/>
-          <use style="transform: translate(-46.5px, -57.25px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(-2.5px, -61.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-2px, -41.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(-29.5px, 16.25px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(31.25px, 31px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(53.75px, 32.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(68.25px, 28px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(87px, 31.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(102.5px, 23.5px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(103.5px, -2px) rotate(180deg)" href="#desk"/>
-          <use style="transform: translate(102px, -41.75px) rotate(-90deg)" href="#desk"/>
-          <use style="transform: translate(101.75px, -59.75px) rotate(90deg)" href="#desk"/>
-
-          <use style="transform: translate(-101.75px, -26.25px) rotate(0deg)" href="#dresser"/>
-          <use style="transform: translate(-71.5px, -36.75px) rotate(0deg)" href="#dresser"/>
-          <use style="transform: translate(-59px, -26px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(-62.5px, 17px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(5px, 4.75px)" href="#dresser"/>
-          <use style="transform: translate(11.5px, 20.25px)" href="#dresser"/>
-          <use style="transform: translate(46.25px, -32.5px)" href="#dresser"/>
-          <use style="transform: translate(62.5px, -57px) rotate(90deg)" href="#dresser"/>
-          <use style="transform: translate(71.5px, -29.25px) rotate(90deg)" href="#dresser"/>
-
-          <path class="stairs" style="transform: translate(33.5px, -63.25px) rotate(-90deg)" d="
-            M -5.25 -10.95 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-            m 0 3.3 h 10.5 v 3 h -10.5 z
-          "/>
-        </g>
-      </g>
-    </g> -->
     <rect id="dots" fill="url(#asterisk)"/>
+
     <g id="firing-arcs">
       <g id="shapes"/>
       <g id="lines"/>
     </g>
+
     <g class="start-locations" data-attacker-name="liao" data-defender-name="davion">
       <g data-edge="north">
         <g data-x="13">
@@ -438,6 +159,7 @@
         </g>
       </g>
     </g>
+
     <g class="grid">
       <g data-y="0">
         <g data-x="0"><use href="#hex"/></g>