Feature/group spacing