Added missing <header> elements in templates