Circles grid refactor
compilation fixes