Update form demo, with better labels