diff --git a/scripts/site/beta5/layout/classic/header.en.inc b/scripts/site/beta5/layout/classic/header.en.inc
index cdbbfac..68b2399 100644
--- a/scripts/site/beta5/layout/classic/header.en.inc
+++ b/scripts/site/beta5/layout/classic/header.en.inc
@@ -6,7 +6,7 @@ $players	= $game->getLib('beta5/player');
 $player		= $_SESSION[game::sessName()]['player'];
 
 ?>
-  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?
+  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?php 
 
 echo thm_getHeaderData();
 
diff --git a/scripts/site/beta5/layout/cripes/header.en.inc b/scripts/site/beta5/layout/cripes/header.en.inc
index 4c78495..bfe5f75 100644
--- a/scripts/site/beta5/layout/cripes/header.en.inc
+++ b/scripts/site/beta5/layout/cripes/header.en.inc
@@ -29,7 +29,7 @@ $players	= $game->getLib('beta5/player');
 $player		= $_SESSION[game::sessName()]['player'];
 
 ?>
-  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?
+  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?php 
 
 echo thm_getHeaderData();
 
diff --git a/scripts/site/beta5/layout/default/header.en.inc b/scripts/site/beta5/layout/default/header.en.inc
index 312466f..9d5c322 100644
--- a/scripts/site/beta5/layout/default/header.en.inc
+++ b/scripts/site/beta5/layout/default/header.en.inc
@@ -81,11 +81,11 @@ $protected = $players->call('getProtectionLevel', $player);
 
 
 ?>
-  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?
+  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?php 
 
 echo thm_getHeaderData();
 
-?></textarea><textarea id="thm-plist-init"><?
+?></textarea><textarea id="thm-plist-init"><?php 
 
 echo thm_getHeaderPList();
 
@@ -188,11 +188,11 @@ echo thm_getHeaderPList();
     </tr></table></td>
     <td id="msgicon">&nbsp;</td>
     <td class='icons'><a
-        href='planets'<?=tooltip('Manage your planets')?>><? drawIcon('planets', 'Planet management'); ?></a><a
-        href='fleets'<?=tooltip('Manage your fleets')?>><? drawIcon('fleets', 'Fleet management'); ?></a><a
-	href='map'<?=tooltip("View maps of the universe")?>><? drawIcon('map', 'Galactic maps'); ?></a><a
-	href='alliance'<?=tooltip('Display information about your current alliance or allows you to join an alliance')?>><? drawIcon('alliance', 'Alliance panel'); ?></a><a
-	href='../main/logout'<?=tooltip('Log out from the game')?>><? drawIcon('logout', 'Log out'); ?></a></td>
+        href='planets'<?=tooltip('Manage your planets')?>><?php  drawIcon('planets', 'Planet management'); ?></a><a
+        href='fleets'<?=tooltip('Manage your fleets')?>><?php  drawIcon('fleets', 'Fleet management'); ?></a><a
+	href='map'<?=tooltip("View maps of the universe")?>><?php  drawIcon('map', 'Galactic maps'); ?></a><a
+	href='alliance'<?=tooltip('Display information about your current alliance or allows you to join an alliance')?>><?php  drawIcon('alliance', 'Alliance panel'); ?></a><a
+	href='../main/logout'<?=tooltip('Log out from the game')?>><?php  drawIcon('logout', 'Log out'); ?></a></td>
    </tr></table></td></tr>
   </table>
   <div style="text-align:center">
diff --git a/scripts/site/beta5/layout/invert/header.en.inc b/scripts/site/beta5/layout/invert/header.en.inc
index c1f0ba7..3027e1a 100644
--- a/scripts/site/beta5/layout/invert/header.en.inc
+++ b/scripts/site/beta5/layout/invert/header.en.inc
@@ -72,11 +72,11 @@ $protected = $players->call('getProtectionLevel', $player);
 
 
 ?>
-  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?
+  <div style="visibility:hidden;display:none"><form action="?" onsubmit="return false"><textarea id="thm-hdr-init"><?php 
 
 echo thm_getHeaderData();
 
-?></textarea><textarea id="thm-plist-init"><?
+?></textarea><textarea id="thm-plist-init"><?php 
 
 echo thm_getHeaderPList();
 
@@ -174,11 +174,11 @@ echo thm_getHeaderPList();
     </tr></table></td>
     <td id="msgicon">&nbsp;</td>
     <td class='icons'><a
-        href='planets'<?=tooltip('Manage your planets')?>><? drawIcon('planets', 'Planet management'); ?></a><a
-        href='fleets'<?=tooltip('Manage your fleets')?>><? drawIcon('fleets', 'Fleet management'); ?></a><a
-	href='map'<?=tooltip("View maps of the universe")?>><? drawIcon('map', 'Galactic maps'); ?></a><a
-	href='alliance'<?=tooltip('Display information about your current alliance or allows you to join an alliance')?>><? drawIcon('alliance', 'Alliance panel'); ?></a><a
-	href='../main/logout'<?=tooltip('Log out from the game')?>><? drawIcon('logout', 'Log out'); ?></a></td>
+        href='planets'<?=tooltip('Manage your planets')?>><?php  drawIcon('planets', 'Planet management'); ?></a><a
+        href='fleets'<?=tooltip('Manage your fleets')?>><?php  drawIcon('fleets', 'Fleet management'); ?></a><a
+	href='map'<?=tooltip("View maps of the universe")?>><?php  drawIcon('map', 'Galactic maps'); ?></a><a
+	href='alliance'<?=tooltip('Display information about your current alliance or allows you to join an alliance')?>><?php  drawIcon('alliance', 'Alliance panel'); ?></a><a
+	href='../main/logout'<?=tooltip('Log out from the game')?>><?php  drawIcon('logout', 'Log out'); ?></a></td>
    </tr></table></td></tr>
    <tr><td><table class='player' cellspacing='0' cellpadding='0'><tr>
     <td class='player'><span<?=tooltip('Your player name as well as the tag of the alliance you are a member of.');?>>Player <b id='jspname'></b><span id='jsalliance'></span></td>
diff --git a/scripts/site/beta5/output/preferences.en.inc b/scripts/site/beta5/output/preferences.en.inc
index 1d7cd58..1f1e4e5 100644
--- a/scripts/site/beta5/output/preferences.en.inc
+++ b/scripts/site/beta5/output/preferences.en.inc
@@ -163,21 +163,21 @@ for	($i=1;$i<6;$i++)
    <input type='submit' value='Update preferences' <?=tooltip('Click here to update your preferences')?>/>
    <input type='reset' value='Restore previous values' <?=tooltip('Click here to cancel your changes and restore the previous values')?> />
   </td></tr>
-<?
+<?php 
 if ($args['lok']) {
 ?>
   <tr><td colspan="2"><hr/></td></tr>
   <tr><td colspan="2">
    <h1>Leave Game</h1>
    <p>
-<?
+<?php 
 
 	if	(is_null($args['quit']))
 	{
 ?>
 	Click the button bellow to leave this game. Please note that it will not close your account; it will simply quit the current game. You will have 24 hours after you click the button to cancel your action; after that, your planets will be made neutral, your fleets will be destroyed, your private messages erased, etc...<br/><br/>
 	You will still be able to access the other games you're playing, and you'll be able to start playing any other game from the Account page.<br/><br/><input type='submit'<?=tooltip('Click here to leave this Legacy Worlds Game')?> name='quit' value='Leave <?=$args['name']?>' />
-<?
+<?php 
 	} else {
 		echo "You have decided to leave {$args['name']}. Your player information will be destroyed in ";
 		$tl = 86400 + $args['quit']  - time();
@@ -191,7 +191,7 @@ if ($args['lok']) {
 		$tl -= $m * 60;
 	?>
 	unless you decide to cancel this action by clicking the button below.<br/><br/><input type='submit' name='quit' <?=tooltip('Click here to cancel your request to leave this game')?> value='Do NOT leave <?=$args['name']?>' />
-<?
+<?php 
 	}
 }
 ?>
diff --git a/site/static/beta5/js/main.js b/site/static/beta5/js/main.js
index f7d9601..535492a 100644
--- a/site/static/beta5/js/main.js
+++ b/site/static/beta5/js/main.js
@@ -1,5 +1,6 @@
-function	formatNumber(n)
+function	formatNumber(number)
 {
+	let n = number || 0;
 	var l = n.length, m = l % 3, c = (l - m) / 3, v = ((m > 0) ? n.substr(0, m) : ''), z;
 	for	(z=0;z<c;z++)
 	{