diff --git a/templates/dashboard.html b/templates/dashboard.html
index 81ed26f..8f534c3 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -241,19 +241,7 @@
         <div class="form-group" id="build-options">
           <label>Building</label>
           <select id="building-select">
-            <option value="main">Senate (main)</option>
-            <option value="storage">Warehouse (storage)</option>
-            <option value="farm">Farm</option>
-            <option value="academy">Academy</option>
-            <option value="temple">Temple</option>
-            <option value="barracks">Barracks</option>
-            <option value="docks">Docks</option>
-            <option value="market">Marketplace</option>
-            <option value="hide">Cave (hide)</option>
-            <option value="lumber">Lumber mill</option>
-            <option value="stoner">Quarry (stoner)</option>
-            <option value="ironer">Ironer</option>
-            <option value="wall">City Wall</option>
+            <option disabled>Επιλέξτε πόλη...</option>
           </select>
         </div>
 
@@ -261,33 +249,33 @@
         <div class="form-group" id="recruit-options" style="display:none">
           <label>Unit</label>
           <select id="unit-select">
-            <optgroup label="Land">
-              <option value="sword">Swordsman</option>
-              <option value="slinger">Slinger</option>
-              <option value="archer">Archer</option>
-              <option value="hoplite">Hoplite</option>
-              <option value="rider">Rider</option>
-              <option value="chariot">Chariot</option>
-              <option value="catapult">Catapult</option>
+            <optgroup label="Ξηρά">
+              <option value="sword">Ξιφομάχος</option>
+              <option value="slinger">Σφενδονήτης</option>
+              <option value="archer">Τοξότης</option>
+              <option value="hoplite">Οπλίτης</option>
+              <option value="rider">Ιππέας</option>
+              <option value="chariot">Άρμα</option>
+              <option value="catapult">Καταπέλτης</option>
             </optgroup>
-            <optgroup label="Naval">
-              <option value="big_transporter">Big Transporter</option>
-              <option value="small_transporter">Small Transporter</option>
-              <option value="bireme">Bireme</option>
-              <option value="attack_ship">Attack Ship</option>
-              <option value="trireme">Trireme</option>
-              <option value="colonize_ship">Colony Ship</option>
+            <optgroup label="Ναυτικές">
+              <option value="big_transporter">Μεταφορικό Πλοίο</option>
+              <option value="small_transporter">Γρήγορο Μεταφορικό Πλοίο</option>
+              <option value="bireme">Διήρης</option>
+              <option value="attack_ship">Πλοίο Φάρος</option>
+              <option value="trireme">Τριήρης</option>
+              <option value="colonize_ship">Αποικιακό Πλοίο</option>
             </optgroup>
-            <optgroup label="Mythical">
-              <option value="medusa">Medusa</option>
-              <option value="zyklop">Cyclops</option>
-              <option value="harpy">Harpy</option>
-              <option value="pegasus">Pegasus</option>
-              <option value="minotaur">Minotaur</option>
-              <option value="manticore">Manticore</option>
-              <option value="cerberus">Cerberus</option>
-              <option value="hydra">Hydra</option>
-              <option value="sea_monster">Sea Monster</option>
+            <optgroup label="Μυθικές">
+              <option value="medusa">Μέδουσα</option>
+              <option value="zyklop">Κύκλωπας</option>
+              <option value="harpy">Άρπυια</option>
+              <option value="pegasus">Πήγασος</option>
+              <option value="minotaur">Μινώταυρος</option>
+              <option value="manticore">Μαντιχώρας</option>
+              <option value="cerberus">Κέρβερος</option>
+              <option value="hydra">Ύδρα</option>
+              <option value="sea_monster">Τέρας της Θάλασσας</option>
             </optgroup>
           </select>
         </div>
@@ -322,6 +310,22 @@ let towns = [];
 let selectedTownId = null;
 const POLL_INTERVAL = 4000;
 
+const BUILDING_NAMES_GR = {
+  main: "Σύγκλητος",
+  storage: "Αποθήκη",
+  farm: "Φάρμα",
+  academy: "Ακαδημία",
+  temple: "Ναός",
+  barracks: "Στρατώνας",
+  docks: "Λιμάνι",
+  market: "Αγορά",
+  hide: "Σπηλιά",
+  lumber: "Ξυλουργείο",
+  stoner: "Λατομείο",
+  ironer: "Ορυχείο Αργύρου",
+  wall: "Τείχος"
+};
+
 // ================================================================
 // Polling
 // ================================================================
@@ -403,6 +407,24 @@ function selectTown(id) {
   document.getElementById('command-form-wrap').style.display = 'block';
 
   renderBuildQueuePreview();
+  renderBuildingDropdown();
+}
+
+function renderBuildingDropdown() {
+  const town = getSelectedTown();
+  if (!town) return;
+  const bSelect = document.getElementById('building-select');
+  const bLevels = town.buildings || {};
+  
+  bSelect.innerHTML = '';
+  
+  for (const [key, nameGr] of Object.entries(BUILDING_NAMES_GR)) {
+    const level = bLevels[key] !== undefined ? bLevels[key] : "?";
+    const option = document.createElement('option');
+    option.value = key;
+    option.textContent = `${nameGr} [Επίπεδο ${level}]`;
+    bSelect.appendChild(option);
+  }
 }
 
 function getSelectedTown() {