Improve Group hierarchy and make users editable