Update formbuilder implementation and fix some bugs