Refactor, fix table not show in full.
Merge pull request #1 from viking4/develop

Refactor, fix table not show in full.