XLCLOUD-851 Application Form improvement