Better Bulk Lead Importing

Currently, the bulk lead import feature does not quite work for us. When we get to the window to assign fields, there are no fields from the lead form, only fields from the company and contact records to assign. This results in a lead being built with only the sales/client contact populated, rather than all of the required fields on the lead form.