Merge pull request #58 from HoldInArms/feature-new-design-and-fixes

Feature new design and fixes
[RR-22] Fixed table size bug.