New map layout and collisions