add row definition for variants add table header
fix width criterion
Merge remote-tracking branch 'upstream/master'