Merge "Improve UX of grouping buttons." into main