diff --git a/engine/function/users.php b/engine/function/users.php
index 4ca5a93..50ecbef 100644
--- a/engine/function/users.php
+++ b/engine/function/users.php
@@ -504,7 +504,7 @@ function get_guilds_list() {
 // Get array of player data related to a guild.
 function get_guild_players($gid) {
     $gid = (int)$gid; // Sanitizing the parameter id
-    if (config('TFSVersion') !== 'TFS_10') return mysql_select_multi("SELECT p.rank_id, p.name, p.level, p.vocation FROM players AS p LEFT JOIN guild_ranks AS gr ON gr.id = p.rank_id WHERE gr.guild_id ='$gid';");
+    if (config('TFSVersion') !== 'TFS_10') return mysql_select_multi("SELECT p.rank_id, p.name, p.level, p.vocation, p.online, gr.name AS `rank_name` FROM players AS p LEFT JOIN guild_ranks AS gr ON gr.id = p.rank_id WHERE gr.guild_id ='$gid' ORDER BY gr.id, p.name;");
     else return mysql_select_multi("SELECT p.id, p.name, p.level, p.vocation, gm.rank_id, gr.name AS `rank_name` FROM players AS p LEFT JOIN guild_membership AS gm ON gm.player_id = p.id LEFT JOIN guild_ranks AS gr ON gr.id = gm.rank_id WHERE gm.guild_id = '$gid' ORDER BY gm.rank_id, p.name");
 }
 
diff --git a/guilds.php b/guilds.php
index a687237..5ae903d 100644
--- a/guilds.php
+++ b/guilds.php
@@ -205,18 +205,12 @@ if (user_logged_in() === true) {
 				$onlinelist[] = $online['player_id'];
 			}
 		}
-
+		//data_dump($players, false, "Data");
 		foreach ($players as $player) {
 			if ($config['TFSVersion'] !== 'TFS_10') {
-				if ($isOtx) {
-					$chardata = mysql_select_single("SELECT `online` FROM `players` WHERE `name`='".$player['name']."' LIMIT 1;");
-				} else $chardata = user_character_data($player['id'], 'online');
+				$chardata['online'] = $player['online'];
 			} else $chardata['online'] = (in_array($player['id'], $onlinelist)) ? 1 : 0;
 			echo '<tr>';
-			if ($isOtx) {
-				$rankdata = mysql_select_single("SELECT `name` FROM `guild_ranks` WHERE `id`='".$player['rank_id']."' LIMIT 1;");
-				$player['rank_name'] = $rankdata['name'];
-			}
 			echo '<td>'. $player['rank_name'] .'</td>';
 			echo '<td><a href="characterprofile.php?name='. $player['name'] .'">'. $player['name'] .'</a></td>';
 			echo '<td>'. $player['level'] .'</td>';
@@ -776,40 +770,44 @@ if ($highest_access >= 2) {
 ?>
 <!-- end leader-->
 <?php
-if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') $wardata = get_guild_wars();
-else if ($config['TFSVersion'] == 'TFS_03') $wardata = get_guild_wars03();
-else die("Can't recognize TFS version. It has to be either TFS_02 or TFS_03. Correct this in config.php");
-$war_exist = false;
-if ($wardata !== false) {
-	foreach ($wardata as $wars) {
-		if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) $war_exist = true;
+if ($config['guildwar_enabled'] === true) {
+	if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') $wardata = get_guild_wars();
+	else if ($config['TFSVersion'] == 'TFS_03') $wardata = get_guild_wars03();
+	else die("Can't recognize TFS version. It has to be either TFS_02 or TFS_03. Correct this in config.php");
+	$war_exist = false;
+	if ($wardata !== false) {
+		foreach ($wardata as $wars) {
+			if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) $war_exist = true;
+		}
+	}
+	if ($war_exist) {
+		?>
+		<h2>War overview:</h2>
+		<table>
+			<tr class="yellow">
+				<td>Attacker:</td>
+				<td>Defender:</td>
+				<td>status:</td>
+				<td>started:</td>
+			</tr>
+				<?php
+				foreach ($wardata as $wars) {
+					if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) {
+						$url = url("guildwar.php?warid=". $wars['id']);
+						echo '<tr class="special" onclick="javascript:window.location.href=\'' . $url . '\'">';
+						echo '<td>'. $wars['name1'] .'</td>';
+						echo '<td>'. $wars['name2'] .'</td>';
+						echo '<td>'. $config['war_status'][$wars['status']] .'</td>';
+						echo '<td>'. getClock($wars['started'], true) .'</td>';
+						echo '</tr>';
+					}
+				}
+				?>
+		</table>
+		<?php 
 	}
 }
-if ($war_exist && $config['guildwar_enabled'] === true) {
 ?>
-<h2>War overview:</h2>
-<table>
-	<tr class="yellow">
-		<td>Attacker:</td>
-		<td>Defender:</td>
-		<td>status:</td>
-		<td>started:</td>
-	</tr>
-		<?php
-		foreach ($wardata as $wars) {
-			if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) {
-				$url = url("guildwar.php?warid=". $wars['id']);
-				echo '<tr class="special" onclick="javascript:window.location.href=\'' . $url . '\'">';
-				echo '<td>'. $wars['name1'] .'</td>';
-				echo '<td>'. $wars['name2'] .'</td>';
-				echo '<td>'. $config['war_status'][$wars['status']] .'</td>';
-				echo '<td>'. getClock($wars['started'], true) .'</td>';
-				echo '</tr>';
-			}
-		}
-		?>
-</table>
-<?php } ?>
 <!-- leave guild with character -->
 <?php
 $bool = false;