Fix colspan

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Updates

Signed-off-by: John McCutchan <john@johnmccutchan.com>