Align table headers with column contents

If the contents of a column are right or center aligned, make the header
match.

Change-Id: I39832076d7622621307df087c6258e73181eb4cf