Refactoring. Add new form elements.