Map layout bug fixed