Circles grid refactor