diff --git a/static/js/components/commandForm.js b/static/js/components/commandForm.js
index d76c9d2..3b08b7c 100644
--- a/static/js/components/commandForm.js
+++ b/static/js/components/commandForm.js
@@ -227,7 +227,7 @@ window.openAcademyModal = function() {
 };
 
 window.closeAcademyModal = function(e) {
-  if (e && e.target !== document.getElementById('academy-modal-overlay') && e.target !== document.getElementById('building-modal-close')) return;
+  if (e && e.target !== document.getElementById('academy-modal-overlay') && e.target !== document.getElementById('academy-modal-close')) return;
   document.getElementById('academy-modal-overlay').classList.remove('open');
 };
 
diff --git a/templates/dashboard.html b/templates/dashboard.html
index 5051493..d7840e3 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -240,15 +240,6 @@
 
 </div>
 
-<script>
-  window.PLAYER_ID = "{{ player_id }}";
-</script>
-<script src="/static/js/state.js"></script>
-<script src="/static/js/components/townViewer.js"></script>
-<script src="/static/js/components/commandForm.js"></script>
-<script src="/static/js/components/commandLog.js"></script>
-<script src="/static/js/api.js"></script>
-<script src="/static/js/app.js"></script>
 <!-- ====== Building Picker Modal ====== -->
 <div id="building-modal-overlay" onclick="window.closeBuildingModal(event)">
   <div id="building-modal">
@@ -266,12 +257,22 @@
 <!-- ====== Academy Picker Modal ====== -->
 <div id="academy-modal-overlay" onclick="window.closeAcademyModal(event)">
   <div id="academy-modal">
-    <div id="building-modal-header">
+    <div id="academy-modal-header">
       <h3>🦉 Ακαδημία</h3>
-      <button id="building-modal-close" onclick="window.closeAcademyModal()">✕</button>
+      <button id="academy-modal-close" onclick="window.closeAcademyModal()">✕</button>
     </div>
     <div id="academy-grid"></div>
   </div>
 </div>
+
+<script>
+  window.PLAYER_ID = "{{ player_id }}";
+</script>
+<script src="/static/js/state.js"></script>
+<script src="/static/js/components/townViewer.js"></script>
+<script src="/static/js/components/commandForm.js"></script>
+<script src="/static/js/components/commandLog.js"></script>
+<script src="/static/js/api.js"></script>
+<script src="/static/js/app.js"></script>
 </body>
 </html>