impr(groups): align form layout with similar forms

Related to: CAM-3014