Refactoring buttons from section to grouping