Merge "Fix table HTML"