Group UI first version
Resolved conflicts
GroupUI conflict resolved