Update template markup
Remove obsolete header style