@@ -817,7 +817,7 @@ }
 
 AI.targetReset = function(target)
 {
-  for (int i = 0; i < teams.cpu.units.length; i++)
+  for (var i = 0; i < teams.cpu.units.length; i++)
   {
     if (teams.cpu.units[i].target.x == target.x &&
       teams.cpu.units[i].target.y == target.y)

@@ -138,6 +138,7 @@ attack.listen();
   map.draw();
   attack.drawPattern();
   mapCursor.draw();
+  hud.draw();
 }
 
 function attackAnim()

@@ -12,8 +12,12 @@ camera.y = 0;
 
 window.hud = {};
 hud.gfx = {};
+hud.gfx.statusWindow = new Image();
+hud.gfx.statusWindow.src = "assets/ui/statusWindow.png";
 hud.gfx.terrainWindow = new Image();
 hud.gfx.terrainWindow.src = "assets/ui/terrainWindow.png";
+hud.gfx.unitWindow = new Image();
+hud.gfx.unitWindow.src = "assets/ui/unitWindow.png";
 hud.gfx.structWindow = new Image();
 hud.gfx.structWindow.src = "assets/ui/structWindow.png";
 hud.gfx.cycleModes = new Array(4);
@@ -61,17 +65,18 @@ screen.fillText(currentCell.type, 10, 20);
   screen.fillText("def+" + currentCell.defMod, 10, 30);
   screen.fillText("agi-" + currentCell.agiMod, 10, 40);
 
-  screen.fillText(gameState.phase + " phase", 240, 10);
-  screen.fillText("ruin: " + gameState.ruin, 240, 20);
-  screen.fillText("E: " + teams.p1.energy + "/" + teams.cpu.energy, 240, 30);
-  screen.fillText("S: " + teams.p1.structs.length + "/" + teams.cpu.structs.length, 240, 40);
-  screen.fillText("U: " + teams.p1.units.length + "/" + teams.cpu.units.length, 240, 50);
+  screen.drawImage(hud.gfx.statusWindow, 230, 5);
+  screen.fillText(gameState.phase + " phase", 235, 10);
+  screen.fillText("ruin: " + gameState.ruin, 235, 20);
+  screen.fillText("E: " + teams.p1.energy + "/" + teams.cpu.energy, 235, 30);
+  screen.fillText("S: " + teams.p1.structs.length + "/" + teams.cpu.structs.length, 235, 40);
+  screen.fillText("U: " + teams.p1.units.length + "/" + teams.cpu.units.length, 235, 50);
 
   screen.drawImage(hud.gfx.cycleModes[mapCursor.cycleMode], 85, 5);
 
   if (!isEmptyObject(currentCell.structure))
   {
-//    screen.drawImage(hud.gfx.structWindow, 5, 135);
+    screen.drawImage(hud.gfx.structWindow, 5, 135);
     screen.fillText(currentCell.structure.name, 10, 140);
     screen.fillText("HP: " + currentCell.structure.hp + "/" + currentCell.structure.maxHP, 10, 150);
     screen.fillText("E: " + currentCell.structure.energy + "@" + currentCell.structure.rate, 10, 160);
@@ -79,6 +84,7 @@ }
 
   if (!isEmptyObject(currentCell.unit))
   {
+    screen.drawImage(hud.gfx.unitWindow, 5, 55);
     screen.fillText(currentCell.unit.name, 10, 60);
     screen.fillText("HP: " + currentCell.unit.hp + "/" + currentCell.unit.maxHP, 10, 70);
     screen.fillText("pow: " + currentCell.unit.pow, 10, 80);

@@ -155,25 +155,25 @@ var self = new blankMenu();
 
   if (teams.p1.energy >= 20 && thisCell.type != "water" && thisCell.type != "forest")
   {
-    self.addItem("[20] Solar Plant", buildSolar);
+    self.addItem("E20 Solar Plant", buildSolar);
   }
   if (teams.p1.energy >= 30 && thisCell.type == "water")
   {
-    self.addItem("[30] Tidal Plant", buildTidal);
+    self.addItem("E30 Tidal Plant", buildTidal);
   }
   if (teams.p1.energy >= 30 && thisCell.type == "mountain")
   {
-    self.addItem("[30] Mine", buildMine);
+    self.addItem("E30 Mine", buildMine);
   }
   if (teams.p1.energy >= 40 && thisCell.type != "water" && thisCell.type != "forest" && thisCell.type != "city" && thisCell.type != "mountain")
   {
-    self.addItem("[40] Factory", buildFactory);
+    self.addItem("E40 Factory", buildFactory);
   }
 
   if (teams.p1.energy >= 40 && thisCell.type != "water" && thisCell.type != "forest" && thisCell.type != "city" && thisCell.type !=
 "mountain")
   {
-    self.addItem("[40] Armory", buildArmory);
+    self.addItem("E40 Armory", buildArmory);
   }
 
   if (self.items.length == 0)
@@ -202,23 +202,23 @@ var thisCell = map.data[mapCursor.x][mapCursor.y];
   var self = new blankMenu();
   if (teams.p1.energy >= 30)
   {
-    self.addItem("[30] Ranger", buildRanger);
+    self.addItem("E30 Ranger", buildRanger);
   }
   if (teams.p1.energy >= 60)
   {
-    self.addItem("[60] Knight", buildKnight);
+    self.addItem("E60 Knight", buildKnight);
   }
   if (teams.p1.energy >= 90)
   {
-    self.addItem("[90] Ace", buildAce);
+    self.addItem("E90 Ace", buildAce);
   }
   if (teams.p1.energy >= 180)
   {
-    self.addItem("[180] Battle Angel", buildBattleAngel);
+    self.addItem("E180 Battle Angel", buildBattleAngel);
   }
   if (teams.p1.energy >= 300)
   {
-    self.addItem("[300] BlitzWalker", buildBlitzWalker);
+    self.addItem("E300 BlitzWalker", buildBlitzWalker);
   }
   if (self.items.length == 0)
   {
@@ -240,19 +240,19 @@ var self = new blankMenu();
 
   if (teams.p1.energy >= 15)
   {
-    self.addItem("[15] Beam Sabre mkI", equipOrUpgradeBeamSabreMKI);
+    self.addItem("E15 BeamSabre mkI", equipOrUpgradeBeamSabreMKI);
   }
   if (teams.p1.energy >= 12)
   {
-    self.addItem("[12] Rifle mkI", equipOrUpgradeRifleMKI);
+    self.addItem("E12 Rifle mkI", equipOrUpgradeRifleMKI);
   }
   if (teams.p1.energy >= 45)
   {
-    self.addItem("[45] Beam Cannon", equipOrUpgradeBeamCannon);
+    self.addItem("E45 Beam Cannon", equipOrUpgradeBeamCannon);
   }
   if (teams.p1.energy >= 80)
   {
-    self.addItem("[80] Hell Bomb", equipOrUpgradeHellBomb);
+    self.addItem("E80 Hell Bomb", equipOrUpgradeHellBomb);
   }
 
   if (self.items.length == 0)