diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl
index fb28ff62..189ca667 100644
--- a/Admin/Templates/village.tpl
+++ b/Admin/Templates/village.tpl
@@ -164,24 +164,44 @@ if(isset($id))
 					<td><img class="r1" src="../img/x.gif"> Lumber</td>
 					<td><center><?php echo floor($village['wood']); ?></center></td>
 					<td rowspan="3"><center><?php echo $village['maxstore'];?></center></td>
+<<<<<<< HEAD
 					<td><center><?php echo $production['wood'];?></td>
+=======
+					<td><center><?php echo $village->getProd("wood"); ?></td>
+					<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
+>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
 				</tr>
 				</tr>
 				<tr>
 					<td><img class="r2" src="../img/x.gif"> Clay</td>
 					<td><center><?php echo floor($village['clay']); ?></center></td>
+<<<<<<< HEAD
 					<td><center><?php echo $production['clay'];?></center></td>
+=======
+					<td><center><?php echo $village->getProd("clay"); ?></center></td>
+					<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
+>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
 				</tr>
 				<tr>
 					<td><img class="r3" src="../img/x.gif"> Iron</td>
 					<td><center><?php echo floor($village['iron']); ?></center></td>
+<<<<<<< HEAD
 					<td><center><?php echo $production['iron'];?></center></td>
+=======
+					<td><center><?php echo $village->getProd("iron"); ?></center></td>
+					<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
+>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
 				</tr>
 				<tr>
 					<td><img class="r4" src="../img/x.gif"> Crop</td>
 					<td><center><?php echo floor($village['crop']); ?></center></td>
 					<td><center><?php echo $village['maxcrop'];?></center></td>
+<<<<<<< HEAD
 					<td><center><?php echo $production['crop'];?></center></td>
+=======
+					<td><center><?php echo $village->getProd("crop"); ?></center></td>
+					<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
+>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
 				</tr>
 			</tbody>
 		</table>
@@ -415,4 +435,4 @@ else
 	include("404.tpl");
 }
 }
-?>
\ No newline at end of file
+?>
diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index 2f0da65b..eecb98d5 100644
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -84,16 +84,27 @@ class Session {
 				$_SESSION['checker'] = $generator->generateRandStr(3);
 				$_SESSION['mchecker'] = $generator->generateRandStr(5);
 				$_SESSION['qst'] = $database->getUserField($_SESSION['username'], "quest", 1);
-				if(!isset($_SESSION['wid'])) {
-					$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
-					$data = mysql_fetch_assoc($query);
-					$_SESSION['wid'] = $data['wref'];
-				} else
-					if($_SESSION['wid'] == '') {
-						$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
-						$data = mysql_fetch_assoc($query);
-						$_SESSION['wid'] = $data['wref'];
-					}
+                $result = mysql_query("SELECT village_select FROM `". TB_PREFIX."users` WHERE `username`='".$_SESSION['username']."'");
+                $dbarray = mysql_fetch_assoc($result);
+                $selected_village=$dbarray['village_select'];
+                if(!isset($_SESSION['wid'])) {
+                    if($selected_village!='') {
+                        $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
+                    }else{
+                        $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
+                    }
+                    $data = mysql_fetch_assoc($query);
+                    $_SESSION['wid'] = $data['wref'];
+                } else
+                    if($_SESSION['wid'] == '') {
+                        if($selected_village!='') {
+                            $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
+                        }else{
+                            $query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
+                        }
+                        $data = mysql_fetch_assoc($query);
+                        $_SESSION['wid'] = $data['wref'];
+                    }
 				$this->PopulateVar();
 
 				$logging->addLoginLog($this->uid, $_SERVER['REMOTE_ADDR']);
diff --git a/Templates/News/newsbox1.tpl b/Templates/News/newsbox1.tpl
index fbccac4f..e4da5822 100644
--- a/Templates/News/newsbox1.tpl
+++ b/Templates/News/newsbox1.tpl
@@ -1,4 +1,4 @@
-<h5><img src="img/en/t2/newsbox2.gif" alt="newsbox 2"></h5>
+<h5><img src="img/en/t2/newsbox1.gif" alt="newsbox 1"></h5>
 <?php
 
 $online = mysql_num_rows(mysql_query("SELECT * FROM " . TB_PREFIX . "users WHERE " . time() . "-timestamp < (60*10) AND tribe!=0 AND tribe!=4 AND tribe!=5"));
diff --git a/dorf1.php b/dorf1.php
index 76821715..c6d1bb63 100644
--- a/dorf1.php
+++ b/dorf1.php
@@ -15,7 +15,8 @@ if(isset($_GET['ok'])){
 $database->updateUserField($session->uid,'ok','0','1'); $_SESSION['ok'] = '0';
 }
 if(isset($_GET['newdid'])) {
-	$_SESSION['wid'] = $_GET['newdid'];
+    $_SESSION['wid'] = $_GET['newdid'];
+    $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);  
 	header("Location: ".$_SERVER['PHP_SELF']);
 }else{
 $building->procBuild($_GET);
diff --git a/dorf2.php b/dorf2.php
index e54ff3f9..22187304 100644
--- a/dorf2.php
+++ b/dorf2.php
@@ -12,7 +12,8 @@
 include("GameEngine/Village.php");
 $start = $generator->pageLoadTimeStart();
 if(isset($_GET['newdid'])) {
-	$_SESSION['wid'] = $_GET['newdid'];
+    $_SESSION['wid'] = $_GET['newdid'];
+    $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);  
 	header("Location: ".$_SERVER['PHP_SELF']);
 }else{
 $building->procBuild($_GET);
diff --git a/dorf3.php b/dorf3.php
index cc1e579c..178db277 100644
--- a/dorf3.php
+++ b/dorf3.php
@@ -14,7 +14,8 @@
 include("GameEngine/Village.php");
 $start = $generator->pageLoadTimeStart();
 if(isset($_GET['newdid'])) {
-	$_SESSION['wid'] = $_GET['newdid'];
+    $_SESSION['wid'] = $_GET['newdid'];
+    $database->query("UPDATE ".TB_PREFIX."users SET village_select=".$_GET['newdid']." WHERE id=".$session->uid);  
 	if(isset($_GET['s'])){
 	header("Location: ".$_SERVER['PHP_SELF']."?s=".$_GET['s']);
 	}else{
diff --git a/install/data/sql.sql b/install/data/sql.sql
index d6843aeb..aff65057 100644
--- a/install/data/sql.sql
+++ b/install/data/sql.sql
@@ -1500,6 +1500,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
   `friend18wait` int(11) unsigned NOT NULL,
   `friend19wait` int(11) unsigned NOT NULL,
   `maxevasion` mediumint(3) unsigned NOT NULL,
+  `village_select` bigint(20) yes NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;