Change order of fields in new patient form

Addresses #77