Redo circle layout code. Circles now center but not intersect
Remove dead code
Merge changes or something