new layout, add addition-info table
Merge remote-tracking branch 'origin/master'