[ADD] Extrabuttons for groups, [CHG] simplify if statement

Rebased w/ master