moved x/y attributes to circle/text instead of g elements