Partial fix of group edit layout