Enhancement : Toggle Add Group on Click, @blizzz have a look here.