Allow html in form texts, and some cleanup