Change layout and add floodfill test.