Added changes to work with Groups and added UI items for Groups