Changed H2 style, moved template headers