diff --git a/src/ui/QGCMapWidget.cc b/src/ui/QGCMapWidget.cc
index 52a1fc724e335b72de2cadd93b12ead781f9390d..22a0ae21d3b25a30c54eed1d543e139051b7024b 100644
--- a/src/ui/QGCMapWidget.cc
+++ b/src/ui/QGCMapWidget.cc
@@ -3,7 +3,7 @@
 #include "UASManager.h"
 
 QGCMapWidget::QGCMapWidget(QWidget *parent) :
-    mapcontrol::OPMapWidget(parent)
+        mapcontrol::OPMapWidget(parent)
 {
     //UAV = new mapcontrol::UAVItem();
     connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*)));
@@ -12,7 +12,7 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
         addUAS(uas);
     }
     UAV->setVisible(true);
-    UAV->setPos(40, 8);
+    UAV->setPos(0, 0);
     UAV->show();
 
 
@@ -20,56 +20,67 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
 
     internals::PointLatLng pos_lat_lon = internals::PointLatLng(0, 0);
 
-//        // **************
-//        // default home position
+    //        // **************
+    //        // default home position
 
-//        home_position.coord = pos_lat_lon;
-//        home_position.altitude = altitude;
-//        home_position.locked = false;
+    //        home_position.coord = pos_lat_lon;
+    //        home_position.altitude = altitude;
+    //        home_position.locked = false;
 
-//        // **************
-//        // default magic waypoint params
+    //        // **************
+    //        // default magic waypoint params
 
-//        magic_waypoint.map_wp_item = NULL;
-//        magic_waypoint.coord = home_position.coord;
-//        magic_waypoint.altitude = altitude;
-//        magic_waypoint.description = "Magic waypoint";
-//        magic_waypoint.locked = false;
-//        magic_waypoint.time_seconds = 0;
-//        magic_waypoint.hold_time_seconds = 0;
+    //        magic_waypoint.map_wp_item = NULL;
+    //        magic_waypoint.coord = home_position.coord;
+    //        magic_waypoint.altitude = altitude;
+    //        magic_waypoint.description = "Magic waypoint";
+    //        magic_waypoint.locked = false;
+    //        magic_waypoint.time_seconds = 0;
+    //        magic_waypoint.hold_time_seconds = 0;
 
-        const int safe_area_radius_list[] = {5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000};   // meters
+    const int safe_area_radius_list[] = {5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000};   // meters
 
-        const int uav_trail_time_list[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};                      // seconds
+    const int uav_trail_time_list[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};                      // seconds
 
-        const int uav_trail_distance_list[] = {1, 2, 5, 10, 20, 50, 100, 200, 500};             // meters
+    const int uav_trail_distance_list[] = {1, 2, 5, 10, 20, 50, 100, 200, 500};             // meters
 
-        SetMouseWheelZoomType(internals::MouseWheelZoomType::MousePositionWithoutCenter);	    // set how the mouse wheel zoom functions
-        SetFollowMouse(true);				    // we want a contiuous mouse position reading
+    SetMouseWheelZoomType(internals::MouseWheelZoomType::MousePositionWithoutCenter);	    // set how the mouse wheel zoom functions
+    SetFollowMouse(true);				    // we want a contiuous mouse position reading
 
-        SetShowHome(true);					    // display the HOME position on the map
-        SetShowUAV(true);					    // display the UAV position on the map
+    SetShowHome(true);					    // display the HOME position on the map
+    SetShowUAV(true);					    // display the UAV position on the map
 
-            Home->SetSafeArea(safe_area_radius_list[0]);                         // set radius (meters)
-        Home->SetShowSafeArea(true);                                         // show the safe area
+    Home->SetSafeArea(safe_area_radius_list[0]);                         // set radius (meters)
+    Home->SetShowSafeArea(true);                                         // show the safe area
 
-        UAV->SetTrailTime(uav_trail_time_list[0]);                           // seconds
-        UAV->SetTrailDistance(uav_trail_distance_list[1]);                   // meters
+    UAV->SetTrailTime(uav_trail_time_list[0]);                           // seconds
+    UAV->SetTrailDistance(uav_trail_distance_list[1]);                   // meters
 
-        //UAV->SetTrailType(UAVTrailType::ByTimeElapsed);
+    //UAV->SetTrailType(UAVTrailType::ByTimeElapsed);
     //  UAV->SetTrailType(UAVTrailType::ByDistance);
 
-        GPS->SetTrailTime(uav_trail_time_list[0]);                           // seconds
-        GPS->SetTrailDistance(uav_trail_distance_list[1]);                   // meters
+    GPS->SetTrailTime(uav_trail_time_list[0]);                           // seconds
+    GPS->SetTrailDistance(uav_trail_distance_list[1]);                   // meters
 
-        //GPS->SetTrailType(UAVTrailType::ByTimeElapsed);
+    //GPS->SetTrailType(UAVTrailType::ByTimeElapsed);
 
-        SetCurrentPosition(pos_lat_lon);         // set the map position
-        Home->SetCoord(pos_lat_lon);             // set the HOME position
-        UAV->SetUAVPos(pos_lat_lon, 0.0);        // set the UAV position
-        GPS->SetUAVPos(pos_lat_lon, 0.0);        // set the UAV position
+    SetCurrentPosition(pos_lat_lon);         // set the map position
+    Home->SetCoord(pos_lat_lon);             // set the HOME position
+    UAV->SetUAVPos(pos_lat_lon, 0.0);        // set the UAV position
+    GPS->SetUAVPos(pos_lat_lon, 0.0);        // set the UAV position
 
-        setFocus();
+    //SetUAVPos(pos_lat_lon, 0.0);        // set the UAV position
+
+    setFrameStyle(QFrame::NoFrame);      // no border frame
+    setBackgroundBrush(QBrush(Qt::black)); // tile background
+
+    setFocus();
+}
+
+QGCMapWidget::~QGCMapWidget()
+{
+    SetShowHome(false);	// doing this appears to stop the map lib crashing on exit
+    SetShowUAV(false);	//   "          "
 }
 
 /**
diff --git a/src/ui/QGCMapWidget.h b/src/ui/QGCMapWidget.h
index 75c67d217724be54e8305fcb74241c8a4e3e34cb..8d155df7ffca70f2d5ea1d9b1ae1a20b2b2b7d93 100644
--- a/src/ui/QGCMapWidget.h
+++ b/src/ui/QGCMapWidget.h
@@ -10,6 +10,7 @@ class QGCMapWidget : public mapcontrol::OPMapWidget
     Q_OBJECT
 public:
     explicit QGCMapWidget(QWidget *parent = 0);
+    ~QGCMapWidget();
 
 signals: