added gender and and city editing, corrected order of fields