Fix some table layout issues
Fixup some table issues