diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp
index 6d6230868..298b9a76f 100644
--- a/src/blackgui/components/simulatorcomponent.cpp
+++ b/src/blackgui/components/simulatorcomponent.cpp
@@ -29,6 +29,7 @@
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
+using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Simulation;
 using namespace BlackCore;
 using namespace BlackCore::Context;
@@ -105,24 +106,32 @@ namespace BlackGui
                 this->clear();
             }
 
-            CSimulatedAircraft ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
-            CAircraftSituation s = ownAircraft.getSituation();
-            CComSystem c1 = ownAircraft.getCom1System();
-            CComSystem c2 = ownAircraft.getCom2System();
+            const CSimulatedAircraft ownAircraft = sGui->getIContextOwnAircraft()->getOwnAircraft();
+            const CAircraftSituation s = ownAircraft.getSituation();
+            const CComSystem c1 = ownAircraft.getCom1System();
+            const CComSystem c2 = ownAircraft.getCom2System();
+            static const CIcon iconAlt(s.getAltitude().toIcon()); // minor performance improvement
+            static const CIcon iconLatLng(s.latitude().toIcon());
+            static const CIcon iconRadio(CIconList::iconByIndex(CIcons::StandardIconRadio16));
+            static const CIcon iconAttitude(CIconList::iconByIndex(CIcons::AviationAttitudeIndicator));
 
-            this->addOrUpdateLiveDataByName("latitude", s.latitude().toFormattedQString(), s.latitude().toIcon());
-            this->addOrUpdateLiveDataByName("longitude", s.longitude().toFormattedQString(), s.longitude().toIcon());
-            this->addOrUpdateLiveDataByName("altitude", s.getAltitude().toFormattedQString(), s.getAltitude().toIcon());
-            this->addOrUpdateLiveDataByName("pitch", s.getPitch().toFormattedQString(), CIcons::AviationAttitudeIndicator);
-            this->addOrUpdateLiveDataByName("bank", s.getBank().toFormattedQString(), CIcons::AviationAttitudeIndicator);
+            this->addOrUpdateLiveDataByName("latitude", s.latitude().toFormattedQString(), iconLatLng);
+            this->addOrUpdateLiveDataByName("longitude", s.longitude().toFormattedQString(), iconLatLng);
+            this->addOrUpdateLiveDataByName("altitude", s.getAltitude().valueRoundedWithUnit(CLengthUnit::ft(), 2), iconAlt);
+            if (s.hasGroundElevation())
+            {
+                this->addOrUpdateLiveDataByName("elevation", s.getGroundElevation().valueRoundedWithUnit(CLengthUnit::ft(), 2), iconAlt);
+            }
+            this->addOrUpdateLiveDataByName("pitch", s.getPitch().toFormattedQString(), iconAttitude);
+            this->addOrUpdateLiveDataByName("bank", s.getBank().toFormattedQString(), iconAttitude);
             this->addOrUpdateLiveDataByName("heading", s.getHeading().toFormattedQString(), s.getHeading().toIcon());
             this->addOrUpdateLiveDataByName("ground speed", s.getGroundSpeed().toFormattedQString(), s.getGroundSpeed().toIcon());
 
-            this->addOrUpdateLiveDataByName("COM1 active", c1.getFrequencyActive().toFormattedQString(), CIcons::StandardIconRadio16);
-            this->addOrUpdateLiveDataByName("COM2 active", c2.getFrequencyActive().toFormattedQString(), CIcons::StandardIconRadio16);
-            this->addOrUpdateLiveDataByName("COM1 standby", c1.getFrequencyStandby().toFormattedQString(), CIcons::StandardIconRadio16);
-            this->addOrUpdateLiveDataByName("COM2 standby", c2.getFrequencyStandby().toFormattedQString(), CIcons::StandardIconRadio16);
-            this->addOrUpdateLiveDataByName("Transponder", ownAircraft.getTransponderCodeFormatted(), CIcons::StandardIconRadio16);
+            this->addOrUpdateLiveDataByName("COM1 active", c1.getFrequencyActive().toFormattedQString(), iconRadio);
+            this->addOrUpdateLiveDataByName("COM2 active", c2.getFrequencyActive().toFormattedQString(), iconRadio);
+            this->addOrUpdateLiveDataByName("COM1 standby", c1.getFrequencyStandby().toFormattedQString(), iconRadio);
+            this->addOrUpdateLiveDataByName("COM2 standby", c2.getFrequencyStandby().toFormattedQString(), iconRadio);
+            this->addOrUpdateLiveDataByName("Transponder", ownAircraft.getTransponderCodeFormatted(), iconRadio);
         }
 
         void CSimulatorComponent::ps_onSimulatorStatusChanged(int status)
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index f407b5660..97ddc6565 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -25,7 +25,7 @@ namespace BlackMisc
     namespace Aviation
     {
         CAircraftSituation::CAircraftSituation()
-            : m_groundElevation({ 0, nullptr }, CAltitude::MeanSeaLevel) {}
+            : m_groundElevation( { 0, nullptr }, CAltitude::MeanSeaLevel) {}
 
         CAircraftSituation::CAircraftSituation(const CCoordinateGeodetic &position, const CHeading &heading, const CAngle &pitch, const CAngle &bank, const CSpeed &gs, const CAltitude &groundElevation)
             : m_position(position), m_heading(heading), m_pitch(pitch),
@@ -179,6 +179,11 @@ namespace BlackMisc
             return true;
         }
 
+        bool CAircraftSituation::hasGroundElevation() const
+        {
+            return !this->getGroundElevation().isNull();
+        }
+
         CLength CAircraftSituation::getHeightAboveGround() const
         {
             if (this->getAltitude().getReferenceDatum() == CAltitude::AboveGround)
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index cbc941670..b4c05ffad 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -113,6 +113,9 @@ namespace BlackMisc
             //! Elevation of the ground directly beneath
             const BlackMisc::Aviation::CAltitude &getGroundElevation() const { return this->m_groundElevation; }
 
+            //! Is ground elevation value available
+            bool hasGroundElevation() const;
+
             //! Elevation of the ground directly beneath
             void setGroundElevation(const BlackMisc::Aviation::CAltitude &elevation) { this->m_groundElevation = elevation; }