Collapsed the two header rows into one, added hidden headers where
appropriate and added labels to the "Comments" checkboxes.

Change-Id: Ia34e8022beab2f056ba08a56b31d1b35134ef75c
Signed-off-by: Jono Mingard <jonom@catalyst.net.nz>