implemented methods to make the table dynamic
Merge branch 'feature-table' into develop