Improved map functionality

Hi Arnold,

I have worked on the maps part of the app. Can you please pull the changes I made to the project?

Thank you!
Nick