Added question numbers to fields, fixed validation messages not showing