diff --git a/Main.qml b/Main.qml
index 0deb955..9fe9c3d 100644
--- a/Main.qml
+++ b/Main.qml
@@ -56,6 +56,16 @@ MainView {
         screenSaverEnabled: !Qt.application.active
     }
 
+    function stopwatch(seconds) {
+        var totalNumberOfSeconds = seconds;
+        var hours = parseInt( totalNumberOfSeconds / 3600 );
+        var minutes = parseInt( (totalNumberOfSeconds - (hours * 3600)) / 60 );
+        var seconds = Math.floor((totalNumberOfSeconds - ((hours * 3600) + (minutes * 60))));
+        var hours2 = (hours == 0 ? "" : (hours < 10 ? "0" + hours +":" : hours+":"))
+        var result = hours2 + (minutes < 10 ? "0" + minutes : minutes) + ":" + (seconds  < 10 ? "0" + seconds : seconds);
+        return result
+    }
+
     ListModel {
         id: listModel
     }
@@ -70,6 +80,7 @@ MainView {
                 console.warn("STARTING GPX")
                 listModel.clear()
                 call('geepeeex.onetime_db_fix',[])
+                call('geepeeex.onetime_db_fix_again_cus_im_dumb',[])
                 get_units(result)
             }
             addImportPath(Qt.resolvedUrl('py/'))
@@ -87,9 +98,10 @@ MainView {
                 // Load the received data into the list model
                 listModel.clear()
                 for (var i=0; i<result.length; i++) {
-                    console.warn(runits)
+                    console.warn(runits);
                     if (runits == "miles"){
                         console.warn(result[i].distance)
+                        //console.warn(result[i].speed)
                         var mi
                         mi = result[i].distance * 0.62137
                         result[i].distance = "Distance: "+mi.toFixed(2) + "mi"
@@ -97,6 +109,8 @@ MainView {
                     else if (runits == "kilometers"){
                         result[i].distance = "Distance: "+result[i].distance + "km"
                     }
+                    var seconds = parseFloat(result[i].speed) * 60
+                    result[i].speed = "Time: " + stopwatch(seconds)
                     listModel.append(result[i]);
                 }
 
@@ -304,6 +318,8 @@ MainView {
                     iconName: "back"
                     onTriggered: {
                         PopupUtils.open(areyousure)
+                        am_running = false
+                        timer.stop()
                         console.log("Run custom back action")
                     }
                 }
@@ -329,16 +345,24 @@ MainView {
                             text: "Yes I'm sure"
                             color: UbuntuColors.green
                             onClicked: {
+                                timer.start()
+                                counter = 0
+                                pygpx.format_timer(0)
+                                timer.restart()
+                                timer.stop()
+                                am_running = false
                                 PopupUtils.close(areyousuredialog)
                                 stack.pop()
                             }
                         }
                         Button {
-                            id: noooooooo
+                            id: noooooooodb
                             text: "No"
                             color: UbuntuColors.red
                             onClicked: {
                                 PopupUtils.close(areyousuredialog)
+                                am_running = true
+                                timer.start()
                             }
                         }
                     }
@@ -444,9 +468,12 @@ MainView {
                                 day = d.toDateString();
                             }
                         }
+                        Row {
 
                         Button {
                             text: "Save Activity"
+                            height: units.gu(10)
+                            width: parent.width /2
                             color: UbuntuColors.green
                             onClicked: {
 
@@ -479,10 +506,17 @@ MainView {
                         }
                         Button {
                             text: "Cancel"
+                            height: units.gu(10)
+                            width: parent.width / 2
                             color: UbuntuColors.red
-                            onClicked: PopupUtils.close(dialogue)
+                            onClicked: {
+                                PopupUtils.close(dialogue)
+                                am_running = true
+                                timer.start()
+                            }
                         }
                     }
+                    }
                 }//Dialog component
 
                 Rectangle {
diff --git a/manifest.json b/manifest.json
index 62a3f34..73d3d32 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
             "desktop":  "app.desktop"
         }
     },
-    "version": "0.9",
+    "version": "0.10.1",
     "maintainer": "Chris Wayne <chris.wayne@canonical.com>",
     "framework" : "ubuntu-sdk-15.04"
 }
diff --git a/py/geepeeex.py b/py/geepeeex.py
index 3ec470a..32d39d7 100644
--- a/py/geepeeex.py
+++ b/py/geepeeex.py
@@ -79,7 +79,7 @@ def add_run(gpx, name,act_type,filename,polyline):
     print(max_speed)
     #print('%sStopped distance: %sm' % stopped_distance)
     maxspeed = 'Max speed: {:.2f}km/h'.format(max_speed * 60. ** 2 / 1000. if max_speed else 0)
-    duration = 'Duration: {:.2f}min'.format(gpx.get_duration() / 60)
+    duration = '{:.2f}'.format(gpx.get_duration() / 60)
 
     print("-------------------------")
     print(name)
@@ -162,6 +162,29 @@ def onetime_db_fix():
     else:
         print("db already fixed")
 
+def onetime_db_fix_again_cus_im_dumb():
+    os.makedirs(filebase, exist_ok=True)
+    filename = "%s/%s" % (filebase,".dbfixed2")
+    if not os.path.exists(filename):
+        print("Fixing db again")
+        conn = sqlite3.connect('%s/activities.db' % filebase)
+        numonly = re.compile("(\d*\.\d*)")
+        cursor = conn.cursor()
+        a=get_runs()
+        sql="UPDATE activities SET speed=? WHERE id=?"
+        for i in a:
+            print(i["speed"])
+            b=numonly.search(i["speed"])
+            cursor.execute(sql, (b.group(0), i["id"]))
+            
+        conn.commit()
+        conn.close()
+        dotfile=open(filename, "w")
+        dotfile.write("db fixed")
+        dotfile.close
+    else:
+        print("db already fixed")
+
 def rm_run(run):
     conn = sqlite3.connect('%s/activities.db' % filebase)
     cursor = conn.cursor()
@@ -209,4 +232,5 @@ def stopwatchery(secs):
     else:
         hr = str(hr)+":"
     print(hr + mins+":"+sec)
-    return hr + mins+":"+sec
\ No newline at end of file
+    return hr + mins+":"+sec
+