Formbuilder refactoring