Structured form elements.
Merged changes voldemortensen made with mine on form.