demote <tr> to inside subtemplate
make whitespace more consistent
adjust whitespace
adjust whitespace