Change header button grouping