Second Commit

Code refactored in MapActivity