Merge "Get rid of display:inline-block from outer table"