Add charset, replace <p> with <fieldset>