cleanup
divided GroupItem into collapse\expand and item zones