Added a mapview
removed unused #define