fix(template): Enhance headers layout

This enhances layout of headers and borders.