Refactored MapActivity and User