Modularize forms. Improve validation.