FormBuilder refactor - Added Labels