diff --git a/svgmap/src/components/map/Map.tsx b/svgmap/src/components/map/Map.tsx
index d078b67..15dd38e 100644
--- a/svgmap/src/components/map/Map.tsx
+++ b/svgmap/src/components/map/Map.tsx
@@ -22,7 +22,7 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
     Math.ceil((Math.max(props.width, props.height) * 2) / 256) + 2;
   const boardSize = nbTiles * 256;
 
-  const [shift, setShift] = useState({ x: 0, y: 0 });
+  const [shift, setShift] = useState({ x: -boardSize / 2, y: -boardSize / 2 });
   const [zoom, setZoom] = useState(1);
 
   const addShift = (deltaShift: { x: number; y: number }) => {
@@ -52,17 +52,17 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
 
   useEffect(() => {
     const firstVisibleTiles = {
-      x: Math.max(Math.floor(-shift.x / 256), 0),
-      y: Math.max(Math.floor(-shift.y / 256), 0),
+      x: Math.max(Math.floor(-shift.x / 256 / zoom), 0),
+      y: Math.max(Math.floor(-shift.y / 256 / zoom), 0),
     };
 
     const lastVisibleTiles = {
       x: Math.min(
-        Math.ceil(firstVisibleTiles.x + props.width / 256),
+        Math.ceil(firstVisibleTiles.x + props.width / 256 / zoom),
         nbTiles - 1
       ),
       y: Math.min(
-        Math.ceil(firstVisibleTiles.y + props.height / 256),
+        Math.ceil(firstVisibleTiles.y + props.height / 256 / zoom),
         nbTiles - 1
       ),
     };
@@ -83,6 +83,7 @@ const Map: react.FC<MapProperties> = (props: MapProperties) => {
           col >= firstVisibleTiles.x &&
           col <= lastVisibleTiles.x
         ) {
+          console.log(`Adding tile ${row}/${col}`);
           tileRow.push(
             <Tile
               key={key}
diff --git a/svgmap/src/components/map/Tile.tsx b/svgmap/src/components/map/Tile.tsx
index 2f6393e..06bf1a7 100644
--- a/svgmap/src/components/map/Tile.tsx
+++ b/svgmap/src/components/map/Tile.tsx
@@ -8,7 +8,7 @@ interface TileProperties {
 }
 
 const Tile: react.FC<TileProperties> = (props: TileProperties) => {
-  console.log(`Rendering <Tile/>`);
+//  console.log(`Rendering <Tile/>`);
   const g = useRef<SVGGElement>(null);
 
   const timeout = (ms: number) => {