Revised markup for forms.