diff --git a/Templates/Ajax/mapscroll.tpl b/Templates/Ajax/mapscroll.tpl
index d37e0655..51dc016e 100644
--- a/Templates/Ajax/mapscroll.tpl
+++ b/Templates/Ajax/mapscroll.tpl
@@ -87,17 +87,16 @@ $query2 = "SELECT
 			ORDER BY FIND_IN_SET(".TB_PREFIX."wdata.id,'$maparray2')";
 $result2 = mysql_query($query2) or die(mysql_error());
 
-$targetalliance = array();
-$neutralarray = array();
-$friendarray = array();
-$enemyarray = array();
 $i=0;
 //Load coor array
 $yrow = 0;
 
 $map_js ='';
 while ($donnees = mysql_fetch_assoc($result2)){	
-
+$targetalliance = $donnees['user_alliance'];
+$neutralarray = array();
+$friendarray = array();
+$enemyarray = array();
 $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
 
 	//Javascript map info
diff --git a/Templates/Ajax/mapscroll2.tpl b/Templates/Ajax/mapscroll2.tpl
index 7e241669..ca6d6129 100644
--- a/Templates/Ajax/mapscroll2.tpl
+++ b/Templates/Ajax/mapscroll2.tpl
@@ -102,10 +102,6 @@ $query2 = "SELECT
 //echo $query2;
 $result2 = mysql_query($query2) or die(mysql_error());
 
-$targetalliance = array();
-$neutralarray = array();
-$friendarray = array();
-$enemyarray = array();
 $i=0;
 $i2=0;
 $yrow = 0;
@@ -114,6 +110,10 @@ $coorindex = 0;
 $map_js ='';
 
 while ($donnees = mysql_fetch_assoc($result2)){
+$targetalliance = $donnees['user_alliance'];
+$neutralarray = array();
+$friendarray = array();
+$enemyarray = array();
 $image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
 
 
diff --git a/Templates/Map/mapview.tpl b/Templates/Map/mapview.tpl
index dbc949b5..35b3a798 100644
--- a/Templates/Map/mapview.tpl
+++ b/Templates/Map/mapview.tpl
@@ -93,10 +93,6 @@ $query2 = "SELECT
 //echo $query2;
 $result2 = mysql_query($query2) or die(mysql_error());
 
-$targetalliance = array();
-$neutralarray = array();
-$friendarray = array();
-$enemyarray = array();
 $i=0;
 //Load coor array
 $coorarray = array("53, 137, 90, 157, 53, 177, 16, 157","89, 117, 126, 137, 89, 157, 52, 137","125, 97, 162, 117, 125, 137, 88, 117","161, 77, 198, 97, 161, 117, 124, 97","197, 57, 234, 77, 197, 97, 160, 77","233, 37, 270, 57, 233, 77, 196, 57","269, 17, 306, 37, 269, 57, 232, 37","90, 157, 127, 177, 90, 197, 53, 177","126, 137, 163, 157, 126, 177, 89, 157","162, 117, 199, 137, 162, 157, 125, 137","198, 97, 235, 117, 198, 137, 161, 117","234, 77, 271, 97, 234, 117, 197, 97","270, 57, 307, 77, 270, 97, 233, 77","306, 37, 343, 57, 306, 77, 269, 57","127, 177, 164, 197, 127, 217, 90, 197","163, 157, 200, 177, 163, 197, 126, 177","199, 137, 236, 157, 199, 177, 162, 157","235, 117, 272, 137, 235, 157, 198, 137","271, 97, 308, 117, 271, 137, 234, 117","307, 77, 344, 97, 307, 117, 270, 97","343, 57, 380, 77, 343, 97, 306, 77","164, 197, 201, 217, 164, 237, 127, 217","200, 177, 237, 197, 200, 217, 163, 197","236, 157, 273, 177, 236, 197, 199, 177","272, 137, 309, 157, 272, 177, 235, 157","308, 117, 345, 137, 308, 157, 271, 137","344, 97, 381, 117, 344, 137, 307, 117","380, 77, 417, 97, 380, 117, 343, 97","201, 217, 238, 237, 201, 257, 164, 237","237, 197, 274, 217, 237, 237, 200, 217","273, 177, 310, 197, 273, 217, 236, 197","309, 157, 346, 177, 309, 197, 272, 177","345, 137, 382, 157, 345, 177, 308, 157","381, 117, 418, 137, 381, 157, 344, 137","417, 97, 454, 117, 417, 137, 380, 117","238, 237, 275, 257, 238, 277, 201, 257","274, 217, 311, 237, 274, 257, 237, 237","310, 197, 347, 217, 310, 237, 273, 217","346, 177, 383, 197, 346, 217, 309, 197","382, 157, 419, 177, 382, 197, 345, 177","418, 137, 455, 157, 418, 177, 381, 157","454, 117, 491, 137, 454, 157, 417, 137","275, 257, 312, 277, 275, 297, 238, 277","311, 237, 348, 257, 311, 277, 274, 257","347, 217, 384, 237, 347, 257, 310, 237","383, 197, 420, 217, 383, 237, 346, 217","419, 177, 456, 197, 419, 217, 382, 197","455, 157, 492, 177, 455, 197, 418, 177","491, 137, 528, 157, 491, 177, 454, 157");
@@ -106,6 +102,10 @@ $row = 0;
 $coorindex = 0;
 $map_js ='';
 while ($donnees = mysql_fetch_assoc($result2)){
+	$targetalliance = $donnees['user_alliance'];
+	$neutralarray = array();
+	$friendarray = array();
+	$enemyarray = array();
 	$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
 
 	// Map content
diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl
index b39b2870..8a9e11ad 100644
--- a/Templates/Map/mapviewlarge.tpl
+++ b/Templates/Map/mapviewlarge.tpl
@@ -106,10 +106,6 @@ $query2 = "SELECT
 //echo $query2;
 $result2 = mysql_query($query2) or die(mysql_error());
 
-$targetalliance = array();
-$neutralarray = array();
-$friendarray = array();
-$enemyarray = array();
 $i=0;
 $i2=0;
 $yrow = 0;
@@ -181,6 +177,10 @@ $coorarray = array(
 );
 
 while ($donnees = mysql_fetch_assoc($result2)){
+	$targetalliance = $donnees['user_alliance'];
+	$neutralarray = array();
+	$friendarray = array();
+	$enemyarray = array();
 	$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $session->uid)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? (in_array($targetalliance,$friendarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : (in_array($targetalliance,$enemyarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : (in_array($targetalliance,$neutralarray)? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $session->alliance? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
 
 	// Map content
diff --git a/massmessage.php b/massmessage.php
index 5adca53f..26d9d56e 100644
--- a/massmessage.php
+++ b/massmessage.php
@@ -3,7 +3,7 @@
 #################################################################################
 ##              -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =-                 ##
 ## --------------------------------------------------------------------------- ##
-##  Filename       massmessage.php                                                 ##
+##  Filename       massmessage.php                                             ##
 ##  Developed by:  Dzoki                                                       ##
 ##  License:       TravianX Project                                            ##
 ##  Copyright:     TravianX (c) 2010-2011. All rights reserved.                ##
@@ -71,94 +71,8 @@ if (isset($_GET['send']) && isset($_GET['from']))
 }
 
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-	<head>
-		<title><?php echo SERVER_NAME; ?></title>
-        <link REL="shortcut icon" HREF="favicon.ico"/>
-        <style>
-        .fm {
-        border:1px solid #71D000;
-        font-size:8pt;
-        padding-bottom:2px;
-        padding-left:3px;
-        padding-top:2px;
-        }
-        .tbg {
-        background-color:#C0C0C0;
-        font-size:10pt;
-        text-align:center;
-        width:100%;
-        }
-        
-        
-        .uu1 {background-image: url(img/u2/u1.gif);}
-        .uu2 {background-image: url(img/u2/u2.gif);}
-        .uu3 {background-image: url(img/u2/u3.gif);}
-        .uu4 {background-image: url(img/u2/u4.gif);}
-        .uu5 {background-image: url(img/u2/u5.gif);}
-        .uu6 {background-image: url(img/u2/u6.gif);}
-        .uu7 {background-image: url(img/u2/u7.gif);}
-        .uu8 {background-image: url(img/u2/u8.gif);}
-        .uu9 {background-image: url(img/u2/u9.gif);}
-        .uu10 {background-image: url(img/u2/u10.gif);}
-        .uu11 {background-image: url(img/u2/u11.gif);}
-        .uu12 {background-image: url(img/u2/u12.gif);}
-        .uu13 {background-image: url(img/u2/u13.gif);}
-        .uu14 {background-image: url(img/u2/u14.gif);}
-        .uu15 {background-image: url(img/u2/u15.gif);}
-        .uu16 {background-image: url(img/u2/u16.gif);}
-        .uu17 {background-image: url(img/u2/u17.gif);}
-        .uu18 {background-image: url(img/u2/u18.gif);}
-        .uu19 {background-image: url(img/u2/u19.gif);}
-        .uu20 {background-image: url(img/u2/u20.gif);}
-        .uu21 {background-image: url(img/u2/u21.gif);}
-        .uu22 {background-image: url(img/u2/u22.gif);}
-        .uu23 {background-image: url(img/u2/u23.gif);}
-        .uu24 {background-image: url(img/u2/u24.gif);}
-        .uu25 {background-image: url(img/u2/u25.gif);}
-        .uu26 {background-image: url(img/u2/u26.gif);}
-        .uu27 {background-image: url(img/u2/u27.gif);}
-        .uu28 {background-image: url(img/u2/u28.gif);}
-        .uu29 {background-image: url(img/u2/u29.gif);}
-        .uu30 {background-image: url(img/u2/u30.gif);}
-	.uu1, .uu2, .uu3, .uu4, .uu5, .uu6, .uu7, .uu8, .uu9, .uu10, u11, .uu12, .uu13, .uu14, .uu15, .uu16, .uu17, .uu18, .uu19, .uu20, .uu21, .uu22, .uu23, .uu24, .uu25, .uu26, .uu27, .uu28, .uu29, .uu30
-	{
-	    height: 150px;
-	    width: 150px;
-	}
-	
-	div.messages div#message_container div#message_toolbarWindows div, div#text_container div#text_toolbarWindows div {
-	background:none repeat scroll 0 0 #EFEFEF;
-	border:1px solid #71D000;
-	/*display:none;*/
-	left:180px;
-	margin-top:5px;
-	max-width:240px;
-	padding:5px;
-	position:absolute;
-	}
-	.uu19 {width: 150px;}
-	.uu20 {width: 150px;}
-	.uu17 {width: 150px;}
-
-
-        </style>
-<script language="javascript" type="text/javascript">
-function smilie(text) {
-    document.myform.message.value += text;
-    }
-    </script>
-
-<script language="javascript">
-function toggleDisplay(e){
-    element = document.getElementById(e).style;
-    element.display == 'none' ? element.display = 'block' :
-    element.display='none';
-}
-</script>
     
-    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
 <head>
 	<title><?php echo SERVER_NAME ?></title>
@@ -185,6 +99,21 @@ function toggleDisplay(e){
 	<link href='".$session->gpack."lang/en/lang.css?e21d2' rel='stylesheet' type='text/css' />";
 	}
 	?>
+	
+	<script language="javascript" type="text/javascript">
+	function smilie(text) {
+		document.myform.message.value += text;
+	}
+    </script>
+
+	<script language="javascript">
+	function toggleDisplay(e){
+		element = document.getElementById(e).style;
+		element.display == 'none' ? element.display = 'block' :
+		element.display='none';
+	}
+	</script>
+	
 	<script type="text/javascript">
 
 		window.addEvent('domready', start);
@@ -324,4 +253,4 @@ function toggleDisplay(e){
 <div id="ce"></div>
 </body>
 </html>
-<?php mysql_close(); ?>
+<?php mysql_close(); ?>
\ No newline at end of file