Updated form with Gender Toggles