Some nav fixes
Added custom field support to Company and Company Contract