diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl
index 100a23dd..c105d1b0 100644
--- a/Templates/Notice/1.tpl
+++ b/Templates/Notice/1.tpl
@@ -219,86 +219,6 @@ for($i=87;$i<=96;$i++) {
 </tr></tbody></table>
 
 <?php }
-if($dataarray[98]==1 and $dataarray[31]!=4){
-if ($dataarray[97]=='1'){ 
-$start=31; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=98;$i<=107;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=118;$i<=127;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php } ?>
-<?php  if ($dataarray[128]=='1'){
-$start=41; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php }
-	}else{
 if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
@@ -376,5 +296,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php }} ?>
+<?php } ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/1x.tpl b/Templates/Notice/1x.tpl
index 937b671b..273404c9 100644
--- a/Templates/Notice/1x.tpl
+++ b/Templates/Notice/1x.tpl
@@ -220,86 +220,6 @@ for($i=87;$i<=96;$i++) {
 </tr></tbody></table>
 
 <?php }
-if($dataarray[98]==1 and $dataarray[31]!=4){
-if ($dataarray[97]=='1'){ 
-$start=31; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=98;$i<=107;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=118;$i<=127;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php } ?>
-<?php  if ($dataarray[128]=='1'){
-$start=41; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=139;$i<=148;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php }
-	}else{
 if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
@@ -377,5 +297,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php }} ?>
+<?php } ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/2.tpl b/Templates/Notice/2.tpl
index f0e4c859..433ef78d 100644
--- a/Templates/Notice/2.tpl
+++ b/Templates/Notice/2.tpl
@@ -218,86 +218,6 @@ for($i=87;$i<=96;$i++) {
 </tr></tbody></table>
 
 <?php }
-if($dataarray[98]==1 and $dataarray[31]!=4){
-if ($dataarray[97]=='1'){ 
-$start=31; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=98;$i<=107;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=118;$i<=127;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php } ?>
-<?php  if ($dataarray[128]=='1'){
-$start=41; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=139;$i<=148;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php }
-	}else{
 if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
@@ -375,5 +295,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php }} ?>
+<?php } ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/2x.tpl b/Templates/Notice/2x.tpl
index 937b671b..273404c9 100644
--- a/Templates/Notice/2x.tpl
+++ b/Templates/Notice/2x.tpl
@@ -220,86 +220,6 @@ for($i=87;$i<=96;$i++) {
 </tr></tbody></table>
 
 <?php }
-if($dataarray[98]==1 and $dataarray[31]!=4){
-if ($dataarray[97]=='1'){ 
-$start=31; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=98;$i<=107;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=118;$i<=127;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php } ?>
-<?php  if ($dataarray[128]=='1'){
-$start=41; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
-for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
-}
-echo "</tr><tr><th>Troops</th>";
-for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-echo "<tr><th>Casualties</th>";
-for($i=139;$i<=148;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
-    }
-    else {
-    	echo "<td>".$dataarray[$i]."</td>";
-    }
-}
-?>
-</tr></tbody></table>
-
-<?php }
-	}else{
 if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
@@ -377,5 +297,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php }} ?>
+<?php } ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/4x.tpl b/Templates/Notice/4x.tpl
index 1e41eb5d..937b671b 100644
--- a/Templates/Notice/4x.tpl
+++ b/Templates/Notice/4x.tpl
@@ -287,7 +287,7 @@ for($i=129;$i<=138;$i++) {
     }
 }
 echo "<tr><th>Casualties</th>";
-for($i=129;$i<=138;$i++) {
+for($i=139;$i<=148;$i++) {
 	if($dataarray[$i] == 0) {
     	echo "<td class=\"none\">0</td>";
     }
diff --git a/Templates/Notice/5x.tpl b/Templates/Notice/5x.tpl
index 1e41eb5d..937b671b 100644
--- a/Templates/Notice/5x.tpl
+++ b/Templates/Notice/5x.tpl
@@ -287,7 +287,7 @@ for($i=129;$i<=138;$i++) {
     }
 }
 echo "<tr><th>Casualties</th>";
-for($i=129;$i<=138;$i++) {
+for($i=139;$i<=148;$i++) {
 	if($dataarray[$i] == 0) {
     	echo "<td class=\"none\">0</td>";
     }
diff --git a/Templates/Notice/6x.tpl b/Templates/Notice/6x.tpl
index 1e41eb5d..937b671b 100644
--- a/Templates/Notice/6x.tpl
+++ b/Templates/Notice/6x.tpl
@@ -287,7 +287,7 @@ for($i=129;$i<=138;$i++) {
     }
 }
 echo "<tr><th>Casualties</th>";
-for($i=129;$i<=138;$i++) {
+for($i=139;$i<=148;$i++) {
 	if($dataarray[$i] == 0) {
     	echo "<td class=\"none\">0</td>";
     }
diff --git a/Templates/Notice/7.tpl b/Templates/Notice/7.tpl
index a58bd2e7..5a66bca7 100644
--- a/Templates/Notice/7.tpl
+++ b/Templates/Notice/7.tpl
@@ -204,8 +204,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -282,5 +362,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/7x.tpl b/Templates/Notice/7x.tpl
index dce6d5b9..937b671b 100644
--- a/Templates/Notice/7x.tpl
+++ b/Templates/Notice/7x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file