Improve HTML of templates according to Adam
Move recipient into table
Merge pull request #12 from ox-it/adam-changes

Improve HTML of templates according to Adam