Fix table layout
Merge pull request #15 from pajcho/development

Fix table layout