Updated forms for the new ui builder