Added google map integration, continued to make small tweaks