BsGroupEditor - Groups Builder structure + fixes