Fixed table width isses
Merge branch 'master', remote branch 'ethan/master'