More group button fixes