cleanup, subtlefication (group buttons still need borders