added table and form structure
template adjustment
Merge pull request #9 from joemariedimzon/master

Template enhancement