improve markup for groups: add vertical margins to avoid overlapping