Merge pull request #57 from stulees/master

Modularization of the table in the widget