Adjusted header content and markup, fixes #321