added grouping of fields by row

Signed-off-by: Blessing Osakue <iyoworks@gmail.com>