diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 69c40415..66245428 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -265,19 +265,31 @@ class JobOrderController extends BaseController
 
         $params['outlets'] = [];
 
-        // format seconds into friendly time
+        // format duration and distance into friendly time
         foreach ($outlets as $outlet) {
+            // duration
             $seconds = $outlet['duration'];
 
             if (!empty($seconds) && $seconds > 0) {
                 $hours = floor($seconds / 3600);
-                $minutes = floor(($seconds / 60) % 60);
-                $seconds = $seconds % 60;
+                $minutes = ceil(($seconds / 60) % 60);
 
-                $outlet['duration'] = $hours . "hrs, " . $minutes . " mins, " . $seconds . " secs";
+                $outlet['duration'] = ($hours > 0 ? number_format($hours) . "hr" . ($hours > 1 ? "s" : '') . ($minutes > 0 ? ", " : '') : '') . ($minutes > 0 ? number_format($minutes) . " min" . ($minutes > 1 ? "s" : '') : '');
             } else {
                 $outlet['duration'] = false;
             }
+
+            // distance
+            $meters = $outlet['distance'];
+
+            if (!empty($meters) && $meters > 0) {
+                $kms = floor($meters / 1000);
+                $meters = ceil($meters % 1000);
+
+                $outlet['distance'] = ($kms > 0 ? number_format($kms) . "km" . ($meters > 0 ? ", " : '') : '') . ($meters > 0 ? number_format($meters) . " m" : '');
+            } else {
+                $outlet['distance'] = false;
+            }
                 
             $params['outlets'][] = $outlet;
         }
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 4607ee85..99377ea4 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -357,7 +357,7 @@
 															<td class="text-right">0.00</td>
 															<td class="text-right">0.00</td>
 															<td class="text-right">0</td>
-															<td class="text-right">{{ outlet.distance ? outlet.distance|number_format  ~ ' m' : '-' }}</td>
+															<td class="text-right">{{ outlet.distance ? outlet.distance : '-' }}</td>
 															<td class="text-right">{{ outlet.duration ? outlet.duration : '-' }}</td>
 														</tr>
 													{% endfor %}
@@ -797,9 +797,7 @@ $(function() {
 
 		if (id != selectedOutlet) {
 			// highlight this row, set outlet value
-			$("#outlets-table")
-				.find('.m-table__row--primary')
-				.removeClass('.m-table__row--primary');
+			$("#outlets-table").find('.m-table__row--primary').removeClass('m-table__row--primary');
 
 			$(this).addClass('m-table__row--primary');