A number of improvements with the group buttons