Refactor FormBuilder + assets management system