Moved the grouped/stacked control form into the flexbox.