updating form-application to reorder new fields and make future plans field not required