Refactoring to separate the activity from the Bike Map activities
Solving merge issues