diff --git a/Templates/Manual/0.tpl b/Templates/Manual/0.tpl
index 53abe57f..26456146 100644
--- a/Templates/Manual/0.tpl
+++ b/Templates/Manual/0.tpl
@@ -3,7 +3,7 @@
 <img class="troops" src="img/x.gif" alt="Troops" title="Troops" />
 <img class="buildings" src="img/x.gif" alt="Buildings" title="Buildings" />
 <ul>
-<li><a href="manual.php?s=1&amp;typ=1">The troops</a></li>
+<li><a href="manual.php?s=1&amp;typ=2">The troops</a></li>
 
 <ul>
 	<li><a href="manual.php?typ=2&amp;s=1">Romans</a></li>
diff --git a/Templates/Manual/23.tpl b/Templates/Manual/23.tpl
index bb0a7818..4a0b0454 100644
--- a/Templates/Manual/23.tpl
+++ b/Templates/Manual/23.tpl
@@ -14,6 +14,6 @@
 <map id="nav" name="nav">
     <area href="manual.php?typ=2&amp;s=2" title="back" coords="0,0,45,18" shape="rect" alt="" />
     <area href="manual.php?s=1" title="Overview" coords="46,0,70,18" shape="rect" alt="" />
-    <area href="manual.php?typ=2&amp;s=4" title="forward" coords="71,0,116,18" shape="rect" alt="" />
+    <area href="<?php echo NEW_FUNCTIONS_MANUAL_NATURENATARS ? "manual.php?typ=2&amp;s=4" : "manual.php?typ=3&amp;s=1"; ?>" title="forward" coords="71,0,116,18" shape="rect" alt="" />
 </map>
 <img usemap="#nav" src="img/x.gif" class="navi" alt="" />
\ No newline at end of file
diff --git a/Templates/Manual/31.tpl b/Templates/Manual/31.tpl
index 30f703d7..e7f50e63 100644
--- a/Templates/Manual/31.tpl
+++ b/Templates/Manual/31.tpl
@@ -13,7 +13,7 @@
     <li><a href="manual.php?typ=4&amp;gid=11">Granary</a></li>
 </ul>
 <map id="nav" name="nav">
-    <area href="manual.php?typ=2&amp;s=5" title="back" coords="0,0,45,18" shape="rect" alt="" />
+    <area href="<?php echo NEW_FUNCTIONS_MANUAL_NATURENATARS ? "manual.php?typ=2&amp;s=5" : "manual.php?typ=2&amp;s=3"; ?>" title="back" coords="0,0,45,18" shape="rect" alt="" />
     <area href="manual.php?s=1" title="Overview" coords="46,0,70,18" shape="rect" alt="" />
     <area href="manual.php?typ=3&amp;s=2" title="forward" coords="71,0,116,18" shape="rect" alt="" />
 </map>
diff --git a/Templates/Manual/4.tpl b/Templates/Manual/4.tpl
index ddc000a8..4583425f 100644
--- a/Templates/Manual/4.tpl
+++ b/Templates/Manual/4.tpl
@@ -3,7 +3,7 @@
 <img class="troops" src="img/x.gif" alt="Troops" title="Troops" />
 <img class="buildings" src="img/x.gif" alt="Buildings" title="Buildings" />
 <ul>
-<li><a href="manual.php?s=1&amp;typ=1">The troops</a></li>
+<li><a href="manual.php?s=1&amp;typ=2">The troops</a></li>
 
 <ul>
 	<li><a href="manual.php?typ=2&amp;s=1">Romans</a></li>
diff --git a/install/templates/accounts.tpl b/install/templates/accounts.tpl
index ca4e99e7..50b70024 100644
--- a/install/templates/accounts.tpl
+++ b/install/templates/accounts.tpl
@@ -16,7 +16,7 @@
 #################################################################################
 
 if(isset($_GET['err']) && $_GET['err'] == 1) {
-	echo "<br /><hr /><br /><div class=\"headline\"><span class=\"f10 c5\">At least MultiHunter &amp; Support password are required in this form.</span></div><br /><br />";
+	echo "<br /><hr /><br /><div class=\"headline\"><span class=\"f10 c5\">At least Multihunter &amp; Support password are required in this form.</span></div><br /><br />";
 }
 
 if(isset($_GET['err']) && $_GET['err'] == 2) {
diff --git a/install/templates/dataform.tpl b/install/templates/dataform.tpl
index a7404f31..24857ddc 100644
--- a/install/templates/dataform.tpl
+++ b/install/templates/dataform.tpl
@@ -33,17 +33,17 @@ if(isset($_GET['err']) && $_GET['err'] == 1) {
 		<table>
 			<tr>
 				<td>
-					Warning: This can take some time. Please wait until the next page has been loaded. Click Create to proceed...
-					<br />
-					<br />
+					<b>Warning</b>: This can take some time. Please wait until the next page has been loaded. Click Create to proceed...
+					<br>
+					<br>
 				</td>
 			</tr>
 			<tr>
 				<td>
 					<center>
-						<input type="submit" name="Submit" id="Submit" value="Create" onClick="return proceed()" />
-						<br />
-						<br />
+						<input type="submit" name="Submit" id="Submit" value="Create..." onClick="return proceed()">
+						<br>
+						<br>
 					</center>
 				</td>
 			</tr>
diff --git a/install/templates/wdata.tpl b/install/templates/wdata.tpl
index d1e7b409..514aae08 100644
--- a/install/templates/wdata.tpl
+++ b/install/templates/wdata.tpl
@@ -26,14 +26,29 @@ echo "<br /><hr /><br /><div class=\"headline\"><span class=\"f10 c5\">Existing
 }
 ?>
 <form action="process.php" method="post" id="dataform">
-<input type="hidden" name="subwdata" value="1">
-
-        <p>
-        <span class="f10 c">Create World Data</span>
-<table>
-<tr><td><b>Warning</b>: This can take some time. Wait till the next page has been loaded! Click Create to proceed..</td></tr>
-<tr><td><center><input type="submit" name="Submit" id="Submit" value="Create.." onClick="return proceed()"></center></td></tr>
-</table>
-        </p>
+	<input type="hidden" name="subwdata" value="1">
+	
+	<p>
+		<span class="f10 c">Create World Data</span>
+		
+		<table>
+			<tr>
+				<td>
+					<b>Warning</b>: This can take some time. Please wait until the next page has been loaded. Click Create to proceed...
+					<br>
+					<br>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<center>
+						<input type="submit" name="Submit" id="Submit" value="Create..." onClick="return proceed()">
+						<br>
+						<br>
+					</center>
+				</td>
+			</tr>
+		</table>
+	</p>
 </form>
 </div>