Added group boxes to make UI more consistent

Refs #10075