Updated the Group Controller and improved UI