MB-6972:  prettify table layout more

Change-Id: Ib7cb31dce105b0f860564b574db6d9bfbe5e82a8