Added google maps and refactored map control flow