Added recursive quering for circle layout
correcting several issues in the circle layout