More updates to Formbuilder