Fix race condition
Fix variable name
Fix race condition
Correcting the map not loading upon reloading home.
Merge branch 'integrateMapController'