Fixed form and formatted HTML
Form changes and HTML formatting