table instead of form
Merge pull request #18 from myobie/patch-1

table instead of form
Small fixes