made mapview modular