Moved map initialisation to MapView