diff --git a/App/GameModule/Model/Units/UnitModel.php b/App/GameModule/Model/Units/UnitModel.php
index 9bb6dd71..0e981ef9 100644
--- a/App/GameModule/Model/Units/UnitModel.php
+++ b/App/GameModule/Model/Units/UnitModel.php
@@ -7,4 +7,14 @@
 class UnitModel extends App\Model\BaseModel
 {
 	protected $table = 'unit';
+
+
+	/**
+	 * @return array
+	 */
+	public function getNames()
+	{
+		return $this->database->select('id, name')->from($this->table)
+			->fetchPairs('id', 'name');
+	}
 }
\ No newline at end of file
diff --git a/App/GameModule/Model/Units/UnitService.php b/App/GameModule/Model/Units/UnitService.php
index 27737449..3e32b157 100644
--- a/App/GameModule/Model/Units/UnitService.php
+++ b/App/GameModule/Model/Units/UnitService.php
@@ -158,7 +158,7 @@ class UnitService
 	];
 
 	/**
-	 * @var App\GameModule\Model\Units\UnitsModel
+	 * @var App\GameModule\Model\Units\UnitModel
 	 */
 	private $unitModel;
 	/**
@@ -217,6 +217,9 @@ public function train($form, $values, $village)
 				} else {
 					$amount = $trainable;
 				}
+				if ($amount == 0) {
+					continue;
+				}
 
 				$this->VDataModel->update($village->getId(), [
 					'wood' => $village->getActualWood() - $amount * $unit->getWood(),
@@ -411,10 +414,10 @@ public function getTrainableUnits($village, $units)
 	 */
 	public function getTrainableUnit($village, $unit)
 	{
-		$wood = round($village->getActualWood() / $unit->getWood());
-		$clay = round($village->getActualClay() / $unit->getClay());
-		$iron = round($village->getActualIron() / $unit->getIron());
-		$crop = round($village->getActualCrop() / $unit->getCrop());
+		$wood = floor($village->getActualWood() / $unit->getWood());
+		$clay = floor($village->getActualClay() / $unit->getClay());
+		$iron = floor($village->getActualIron() / $unit->getIron());
+		$crop = floor($village->getActualCrop() / $unit->getCrop());
 		return min($wood, $clay, $iron, $crop);
 	}
 
@@ -429,4 +432,13 @@ public function getUnits($village)
 
 		return $unitData;
 	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getNames()
+	{
+		return $this->unitModel->getNames();
+	}
 }
\ No newline at end of file
diff --git a/App/GameModule/Presenters/OuterVillagePresenter.php b/App/GameModule/Presenters/OuterVillagePresenter.php
index 267f08aa..59b66431 100644
--- a/App/GameModule/Presenters/OuterVillagePresenter.php
+++ b/App/GameModule/Presenters/OuterVillagePresenter.php
@@ -15,6 +15,12 @@ class OuterVillagePresenter extends GamePresenter
 	/** @var App\FrontModule\Model\VData\VDataModel @inject */
 	public $VDataModel;
 
+	/** @var App\GameModule\Model\Units\UnitsModel @inject */
+	public $unitsModel;
+
+	/** @var App\GameModule\Model\Units\UnitService @inject */
+	public $unitService;
+
 
 	public function startup()
 	{
@@ -37,6 +43,8 @@ public function actionDefault($id)
 			$id = $field->wref;
 		}
 		$this->template->village = $this->villageService->getVillage($id);
+		$this->template->units = $this->unitsModel->get($id);
+		$this->template->unitNames = $this->unitService->getNames();
 	}
 
 
diff --git a/App/GameModule/Templates/OuterVillage/default.latte b/App/GameModule/Templates/OuterVillage/default.latte
index 1287714d..852df43b 100644
--- a/App/GameModule/Templates/OuterVillage/default.latte
+++ b/App/GameModule/Templates/OuterVillage/default.latte
@@ -67,6 +67,36 @@
                     </tr>
                 </tbody>
             </table>
+            <table id="troops" cellpadding="1" cellspacing="1">
+            	<thead>
+            		<tr>
+            			<th colspan="3">Troops</th>
+            		</tr>
+				</thead>
+				<tbody>
+					{var $hasUnits = FALSE}
+            		{for $i = 1; $i < 50; $i++}
+						{if $units['u' . $i] > 0}
+							<tr>
+								<td class="ico">
+									<img class="unit u{$i}" src="{$baseUrl}/img/x.gif"
+										alt="{$unitNames[$i]}" title="{$unitNames[$i]}" />
+								</td>
+								<td class="num">
+									{$units['u' . $i]}
+								</td>
+								<td class="un">
+									{$unitNames[$i]}
+								</td>
+							</tr>
+							{var $hasUnits = TRUE}
+						{/if}
+					{/for}
+					<tr n:if=" ! $hasUnits">
+						<td>none</td>
+					</tr>
+            	</tbody>
+			</table>
         </div>
         {control building}
     </div>
diff --git a/www/Templates/troops.tpl b/www/Templates/troops.tpl
deleted file mode 100644
index bb419396..00000000
--- a/www/Templates/troops.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php 
-#################################################################################
-##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
-## --------------------------------------------------------------------------- ##
-##  Filename       troops.tpl                                                  ##
-##  Developed by:  Dzoki                                                       ##
-##  License:       TravianX Project                                            ##
-##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
-##                                                                             ##
-#################################################################################
-?>
-<table id="troops" cellpadding="1" cellspacing="1">
-<thead><tr>
-	<th colspan="3"><?php echo TROOPS_DORF; ?></th>
-</tr></thead><tbody>
-<?php
-$troops = $technology->getAllUnits($village->wid,True,1);
-$TroopsPresent = False;
-for($i=1;$i<=50;$i++) {
-	if($troops['u'.$i] > 0) {
-		echo "<tr><td class=\"ico\"><a href=\"build.php?id=39\"><img class=\"unit u".$i."\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" /></a></td>";
-		echo "<td class=\"num\">".$troops['u'.$i]."</td><td class=\"un\">".$technology->getUnitName($i)."</td></tr>";
-		$TroopsPresent = True;
-	}
-}
-if($troops['hero'] > 0) {
-		echo "<tr><td class=\"ico\"><a href=\"build.php?id=39\"><img class=\"unit uhero\" src=\"img/x.gif\" alt=\"Hero\" title=\"Hero\" /></a></td>";
-		echo "<td class=\"num\">".$troops['hero']."</td><td class=\"un\">Hero</td></tr>";
-		$TroopsPresent = True;
-}
-$units = $technology->getUnitList($village->wid);
-if(!$TroopsPresent) {
-	echo "<tr><td>none</td></tr>";
-}
-?>
-	</tbody></table>
-</div>
diff --git a/www/Templates/version.tpl b/www/Templates/version.tpl
deleted file mode 100644
index 8bb1762e..00000000
--- a/www/Templates/version.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div id="content"  class="plus">
-<h1>TravianZ <font color="#71D000">V</font><font color="#FF6F0F">E</font><font  color="#71D000">R</font><font color="#FF6F0F">S</font><font  color="#71D000">I</font><font color="#FF6F0F">O</font><font  color="#71D000">N</font> CREDITS </h1>
-<div id="textmenu">
-
-</div>
diff --git a/www/dorf1.php b/www/dorf1.php
index 6bc68f2c..b7edaffb 100644
--- a/www/dorf1.php
+++ b/www/dorf1.php
@@ -10,8 +10,6 @@
 
 		<?php
 		include("Templates/movement.tpl");
-		// --production--
-		include("Templates/troops.tpl");
 
 		?>