One row header
Merge pull request #1436 from ppasq/templates

One row header