RESOLVE #99

* RESOLVE #99 Swap location and company data placements