FullScreenMapActivity refactoring