FormBuilder refactor - Added fields templates