Rethink FormBuilder elements #58