Added <article> tags + Diverse small fixes