===================================================================
--- original.js
+++ change.js
@@ -359,10 +359,11 @@
 					}
 					// Render buildings
 					var building = cell.building;
 					if (building) {
-						building.asset.x = screenX + (building.cellW - 2) * tileSize; // Adjust for building size
-						building.asset.y = screenY + (building.cellH - 2) * tileSize; // Adjust for building size
+						//console.log("Building at ", x, y, " screen : ", screenX, screenY);
+						building.asset.x = screenX; // + (building.cellW - 2) * tileSize; // Adjust for building size
+						building.asset.y = screenY; // + (building.cellH - 2) * tileSize; // Adjust for building size
 						self.addChild(building.asset);
 					}
 				}
 			}
@@ -602,10 +603,10 @@
 		}
 		var elementDeltaX = 0;
 		var elementDeltaY = 0;
 		if (element.isBuilding) {
-			elementDeltaX = (element.cellW - 2) / 2 * 100;
-			elementDeltaY = (element.cellH - 2) / 2 * 100;
+			elementDeltaX = element.cellW / 2 * tileSize;
+			elementDeltaY = element.cellH / 2 * tileSize;
 			self.selectionCross.alpha = 1;
 			self.selectionCircle.alpha = 0;
 		}
 		if (element.isUnit) {
@@ -615,10 +616,13 @@
 			self.selectionCircle.alpha = 0.9;
 		}
 		var centerDeltaX = (gameMap.currentViewCenter.x - 15) * 100;
 		var centerDeltaY = (gameMap.currentViewCenter.y - 15) * 100;
-		self.x = element.x - centerDeltaX + elementDeltaX;
-		self.y = element.y - centerDeltaY + elementDeltaY;
+		var cellElt = worldCoordToScreenCell(element.x, element.y);
+		//self.x = element.x - centerDeltaX + elementDeltaX;
+		//self.y = element.y - centerDeltaY + elementDeltaY;
+		self.x = cellElt.wCellX + elementDeltaX;
+		self.y = cellElt.wCellY + elementDeltaY;
 		self.visible = true;
 	};
 	self.hide = function () {
 		console.log('SelectionMarker hidden');
@@ -1109,10 +1113,10 @@
 var getPlayerTint = function getPlayerTint(id) {
 	return player1.playerId === id ? player1.tint : player2.tint;
 };
 var gameIsRunning = false;
-var mapXSize = 50;
-var mapYSize = 40;
+var mapXSize = 20 * 2;
+var mapYSize = 21 * 2;
 var tileSize = 100;
 var mapHeight = game.height * 0.80;
 var viewSize = Math.ceil(Math.max(game.width, game.height) / 2 / 100);
 var viewPort = {
@@ -1123,8 +1127,13 @@
 	cellW: Math.floor(game.width / tileSize),
 	// ~20
 	cellH: Math.floor(mapHeight / tileSize) // ~21
 };
+// Init view port
+viewPort.wCellX = Math.max(0, Math.min(mapXSize - viewPort.cellW, viewPort.wCellX)); // + game.width/2));
+viewPort.wCellY = Math.max(0, Math.min(mapYSize - viewPort.cellH, viewPort.wCellY)); // + game.height/2));
+viewPort.wX = viewPort.wCellX * tileSize;
+viewPort.wY = viewPort.wCellY * tileSize;
 var dragSpeed = 0.15;
 var gameMap = new Map();
 var buildableRepository = new BuildableRepository();
 var unitRepository = new UnitRepository();
@@ -1172,9 +1181,9 @@
 	gameMap.init(mapXSize, mapYSize); // Initialize with a 20x20 grid
 	// Define a fixed rock ilot near the center left of the map
 	rockIlot1Center = {
 		x: Math.floor(mapXSize * 0.15),
-		y: Math.floor(mapYSize * 0.5)
+		y: Math.floor(mapYSize * 0.25)
 	};
 	console.log("rockIlot1Center : ", rockIlot1Center);
 	var rockIlot1Radius = 4;
 	for (var x = rockIlot1Center.x - rockIlot1Radius; x <= rockIlot1Center.x + rockIlot1Radius; x++) {
@@ -1659,10 +1668,10 @@
 	/*
 	var wCellCoords = getScreenToWorldCell(x, y);
 	var wCoordCoords = getScreenToWorldCoord(x, y);
 	if (game.mouseCoordsText) {
-	game.mouseCoordsText.setText("S:" + Math.floor(x) + ',' + Math.floor(y) 
-			+ '\r\n' + Math.floor(x / tileSize) + ',' + Math.floor(y / tileSize) + '\r\nW:' + Math.floor(wCellCoords.wCellX) + ',' + Math.floor(wCellCoords.wCellY) + '\r\n' + Math.floor(wCoordCoords.wX) + ',' + Math.floor(wCoordCoords.wY));
+	game.mouseCoordsText.setText("S:" + Math.floor(x) + ',' + Math.floor(y)
+	+ '\r\n' + Math.floor(x / tileSize) + ',' + Math.floor(y / tileSize) + '\r\nW:' + Math.floor(wCellCoords.wCellX) + ',' + Math.floor(wCellCoords.wCellY) + '\r\n' + Math.floor(wCoordCoords.wX) + ',' + Math.floor(wCoordCoords.wY));
 	}
 	*/
 	var wCell = screenCoordToWorldCell(x, y);
 	if (game.mouseCoordsText) {