Minor changes Form-Builder before pull
Merged changes with local - Form Builder
Improvements to the form builder