diff --git a/www/assets/js/list.js b/www/assets/js/list.js
index 306389a..09bd50c 100644
--- a/www/assets/js/list.js
+++ b/www/assets/js/list.js
@@ -12,7 +12,7 @@ $(".view-main").on("click", "#addresslist .package-list-item .deliver-btn", func
 
 // Open geo: url
 $(".view-main").on("click", "#addresslist .package-list-item .directions-btn", function () {
-    window.open($(this).attr("href"), "_blank");
+    window.open($(this).attr("href"), "_system");
 });
 
 $(".view-main").on("swipeout:delete", "#addresslist .package-list-item", function () {
@@ -135,7 +135,7 @@ function loadPackageList(sortType) {
                 + '  </div>'
                 + '</div>'
                 + '<div class="swipeout-actions-left">'
-                + '  <a href="#" class="color-green deliver-btn" data-packageid="' + sortedPackages[i].index + '">' + (delivered ? "<i class='fas fa-undo'></i>&nbsp; Mark Undelivered" : "<i class='fas fa-check'></i>&nbsp; Mark Delivered") + '</a>'
+                + '  <a href="#" class="color-green deliver-btn" data-packageid="' + sortedPackages[i].index + '">' + (delivered ? "<i class='fas fa-undo'></i>&nbsp; Undeliver" : "<i class='fas fa-check'></i>&nbsp; Deliver") + '</a>'
                 + '  <a href="geo:' + sortedPackages[i].value.coords[0] + ',' + sortedPackages[i].value.coords[1] + '" class="color-blue directions-btn"><i class="fas fa-route"></i>&nbsp; Directions</a>'
                 + '</div>'
                 + '<div class="swipeout-actions-right">'
diff --git a/www/assets/js/map.js b/www/assets/js/map.js
index 4a327ed..95b5dac 100644
--- a/www/assets/js/map.js
+++ b/www/assets/js/map.js
@@ -44,7 +44,7 @@ $("#app").on("click", "#package-info-sheet #package-info-toggle-status", functio
 });
 
 $("#app").on("click", "#package-info-sheet #package-info-get-directions", function () {
-    window.open($(this).attr("href"), "_blank");
+    window.open($(this).attr("href"), "_system");
 });
 
 function openPackageInfoSheet(package, refreshOnly) {