restore correct calculation of group delta, modify group layout to make sure group label gets enough room