MB-6972:  prettify table layout

Change-Id: Id0e4dadaea2d3d8443e859217715b843d82889f0