Updated form generation to support labels