Fixed Table Width Overflow Issues
Merge branch 'tablewidth'