diff --git a/Main.qml b/Main.qml
index 9fe9c3d..b4ea68f 100644
--- a/Main.qml
+++ b/Main.qml
@@ -66,6 +66,36 @@ MainView {
         return result
     }
 
+    function formatDist(distance) {
+        if (runits == "miles"){
+            var mi
+            mi = distance * 0.62137 / 1000
+            distance = mi.toFixed(2) + "mi"
+        }
+        else if (runits == "kilometers"){
+            if (distance > 1000){
+                distance = distance / 1000
+                distance = distance.toFixed(2) + "km"
+            }
+            else
+                distance = distance + "m"
+        }
+        return distance
+    }
+
+    function formatSpeed(speed) {
+        if (runits == "miles"){
+            var mi
+            mi = speed * 0.62137 / 1000 * 3600
+            speed = mi.toFixed(2) + "mi/h"
+        }
+        else if (runits == "kilometers"){
+            speed = speed / 1000 * 3600
+            speed = speed.toFixed(2) + "km/h"
+        }
+        return speed
+    }
+
     ListModel {
         id: listModel
     }
@@ -392,6 +422,16 @@ MainView {
                                 console.warn("========================")
                                 //console.warn(pygpx.current_distance(gpxx))
                             }
+                            if (src.position.altitudeValid) {
+                                altlabel.text = formatDist(coord.altitude)
+                            } else {
+                                altlabel.text = "No data"
+                            }
+                            if (src.position.speedValid) {
+                                speedlabel.text = formatSpeed(src.position.speed)
+                            } else {
+                                speedlabel.text = "No data"
+                            }
                         }
                     }
                 }
@@ -536,13 +576,22 @@ MainView {
                         Column {
                             Label {
                                 text: "Time"
-                                //fontSize: "large"
+                                fontSize: "small"
                             }
                             Label {
                                 text: timestring
-                                fontSize: "x-large"
+                                fontSize: "large"
                                 //text: "00:00"
                             }
+                            Label {
+                                text: "Speed"
+                                fontSize: "small"
+                            }
+                            Label {
+                                id: speedlabel
+                                text: "No data"
+                                fontSize: "large"
+                            }
                         }
 
                         Button {
@@ -584,25 +633,27 @@ MainView {
                         Column {
                             Label {
                                 text: "Distance"
+                                fontSize: "small"
                             }
                             Label {
                                 id: distlabel
                                 text: "0"
-                                fontSize: "x-large"
+                                fontSize: "large"
+                            }
+                            Label {
+                                text: "Altitude"
+                                fontSize: "small"
+                            }
+                            Label {
+                                id: altlabel
+                                text: "No data"
+                                fontSize: "large"
                             }
                         }
 
                     }
                 }//Item (buttons)
 
-
-
-
-
-
-
-
-
             }//Bottom component page
 
         }//Page