Add improvement for advanced form demo