[RR-22] Fixed table size bug.
Merge pull request #60 from HoldInArms/feature-new-design-and-fixes

[RR-22] Fixed table size bug.