Better markup, avoid headings everywhere and use paragraphs