Add option to rearrange all the buttons and group buttons