Fix h2/h3 and move header into main element