[Form Builder] Fixed user story issues