Refactor View Controller loading calls + make sure merchant map can recorver from loading error
Merge