diff --git a/Templates/Notice/0x.tpl b/Templates/Notice/0x.tpl
index c2c560e7..d5a5c8b9 100644
--- a/Templates/Notice/0x.tpl
+++ b/Templates/Notice/0x.tpl
@@ -31,7 +31,8 @@ $dataarray = explode(",",$data);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/18x.tpl b/Templates/Notice/18x.tpl
index c2c560e7..d5a5c8b9 100644
--- a/Templates/Notice/18x.tpl
+++ b/Templates/Notice/18x.tpl
@@ -31,7 +31,8 @@ $dataarray = explode(",",$data);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/19x.tpl b/Templates/Notice/19x.tpl
index 6fe502f6..490bf061 100644
--- a/Templates/Notice/19x.tpl
+++ b/Templates/Notice/19x.tpl
@@ -31,7 +31,8 @@ $dataarray = explode(",",$data);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/1x.tpl b/Templates/Notice/1x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/1x.tpl
+++ b/Templates/Notice/1x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/20x.tpl b/Templates/Notice/20x.tpl
index c2c560e7..d5a5c8b9 100644
--- a/Templates/Notice/20x.tpl
+++ b/Templates/Notice/20x.tpl
@@ -31,7 +31,8 @@ $dataarray = explode(",",$data);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/21x.tpl b/Templates/Notice/21x.tpl
index c2c560e7..d5a5c8b9 100644
--- a/Templates/Notice/21x.tpl
+++ b/Templates/Notice/21x.tpl
@@ -31,7 +31,8 @@ $dataarray = explode(",",$data);
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/2x.tpl b/Templates/Notice/2x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/2x.tpl
+++ b/Templates/Notice/2x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/3x.tpl b/Templates/Notice/3x.tpl
index deb01baa..b0dadf4f 100644
--- a/Templates/Notice/3x.tpl
+++ b/Templates/Notice/3x.tpl
@@ -37,7 +37,8 @@ if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/4x.tpl b/Templates/Notice/4x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/4x.tpl
+++ b/Templates/Notice/4x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/5x.tpl b/Templates/Notice/5x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/5x.tpl
+++ b/Templates/Notice/5x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/6x.tpl b/Templates/Notice/6x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/6x.tpl
+++ b/Templates/Notice/6x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }
diff --git a/Templates/Notice/7x.tpl b/Templates/Notice/7x.tpl
index 6eaf060e..dce6d5b9 100644
--- a/Templates/Notice/7x.tpl
+++ b/Templates/Notice/7x.tpl
@@ -32,7 +32,8 @@ if(isset($dataarray[147]) and $dataarray[147] != 0){$colspan="11";}else{$colspan
 <tr>
 <td>&nbsp;</td>
 <?php
-$start = $dataarray[2] == 1? 1 : (($dataarray[2] == 2)? 11 : (($dataarray[2] == 3)? 21 : 31));
+$tribe = $dataarray[2];
+$start = ($tribe-1)*10+1;
 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>";
 }