Add gender and occupation fields to the main form