Fix bug with arena layout