diff --git a/opmap/mapwidget/trailitem.cpp b/opmap/mapwidget/trailitem.cpp
index 5f2f9b1..12d5615 100644
--- a/opmap/mapwidget/trailitem.cpp
+++ b/opmap/mapwidget/trailitem.cpp
@@ -33,7 +33,7 @@ TrailItem::TrailItem(internals::PointLatLng const & coord, int const & altitude,
     QString coord_str = " " + QString::number(coord.Lat(), 'f', 6) + "   " + QString::number(coord.Lng(), 'f', 6);
 
     setToolTip(QString(tr("Position:") + "%1\n" + tr("Altitude:") + "%2\n" + tr("Time:") + "%3").arg(coord_str).arg(QString::number(altitude)).arg(time.toString()));
-    this->setZValue(3);
+    this->setZValue(4);
 
 }
 
diff --git a/opmap/mapwidget/traillineitem.cpp b/opmap/mapwidget/traillineitem.cpp
index c7d7018..4b92ad6 100644
--- a/opmap/mapwidget/traillineitem.cpp
+++ b/opmap/mapwidget/traillineitem.cpp
@@ -35,7 +35,7 @@ TrailLineItem::TrailLineItem(internals::PointLatLng const & coord1, internals::P
     pen.setWidth(2);
     this->setPen(pen);
 
-    this->setZValue(3);
+    this->setZValue(4);
 
 }
 
diff --git a/opmap/mapwidget/waypointitem.cpp b/opmap/mapwidget/waypointitem.cpp
index c7567d8..8236958 100644
--- a/opmap/mapwidget/waypointitem.cpp
+++ b/opmap/mapwidget/waypointitem.cpp
@@ -391,21 +391,27 @@ void WayPointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
                 switch ((int32_t)property.param1) {
                 case 0:
                     _h.append(tr("hold\n"));
+                    _v = tr("");
                     break;
                 case -1:
                     _h.append(tr("cas\n"));
+                    _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
                     break;
                 case -2:
                     _h.append(tr("Vz\n"));
+                    _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
                     break;
                 case -3:
                     _h.append(tr("onAB\n"));
+                    _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
                     break;
                 case -4:
                     _h.append(tr("offAB\n"));
+                    _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
                     break;
                 default:
                     _h.append(tr("unknow\n"));
+                    _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
                     break;
                 }
             }
@@ -414,7 +420,6 @@ void WayPointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
                 _h.append(tr("\n"));
             }
 
-            _v = tr("Speed: %1m/s").arg(QString::number(property.param4,'f',0));
             _h.append(tr("Height: %1m\n%2").arg(QString::number(property.z,'f',0)).arg(_v));
             painter->drawText(QRectF(rect.x() + 2,rect.y()+2,rect.width() - 4,rect.height() - 4),Qt::AlignLeft | Qt::AlignVCenter,_h);
         }
diff --git a/opmap/mapwidget/waypointline.cpp b/opmap/mapwidget/waypointline.cpp
index 174c667..537eb44 100644
--- a/opmap/mapwidget/waypointline.cpp
+++ b/opmap/mapwidget/waypointline.cpp
@@ -38,11 +38,11 @@ WayPointLine::WayPointLine(WayPointItem *from, WayPointItem *to, MapGraphicItem
     connect(from, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
     connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
     if (myColor == Qt::green) {
-        this->setZValue(2);
+        this->setZValue(1);
     } else if (myColor == Qt::yellow) {
-        this->setZValue(2);
+        this->setZValue(1);
     } else if (myColor == Qt::red) {
-        this->setZValue(2);
+        this->setZValue(1);
     }
     connect(map, SIGNAL(childSetOpacity(qreal)), this, SLOT(setOpacitySlot(qreal)));
 
@@ -58,11 +58,11 @@ WayPointLine::WayPointLine(HomeItem *from, WayPointItem *to, MapGraphicItem *map
     connect(to, SIGNAL(localPositionChanged(QPointF, WayPointItem *)), this, SLOT(refreshLocations()));
     connect(to, SIGNAL(aboutToBeDeleted(WayPointItem *)), this, SLOT(waypointdeleted()));
     if (myColor == Qt::green) {
-        this->setZValue(2);
+        this->setZValue(1);
     } else if (myColor == Qt::yellow) {
-        this->setZValue(2);
+        this->setZValue(1);
     } else if (myColor == Qt::red) {
-        this->setZValue(2);
+        this->setZValue(1);
     }
     connect(map, SIGNAL(childSetOpacity(qreal)), this, SLOT(setOpacitySlot(qreal)));