(refactor) Cirles contained in g elements
(feat) Add text to g element