86 fix group buttons

This PR refactors group controls to make them easier to adapt to mobile