diff --git a/www/assets/js/platform.js b/www/assets/js/platform.js
index 5a9ded8..88f4e9f 100644
--- a/www/assets/js/platform.js
+++ b/www/assets/js/platform.js
@@ -114,7 +114,7 @@ function initCordova() {
                     prompt: "Scan barcode",
                     resultDisplayDuration: 0,
                     disableSuccessBeep: false,
-                    formats: "QR_CODE,DATA_MATRIX,CODE_39,CODE_93,CODE_128,CODABAR,PDF_417,AZTEC"
+                    formats: "QR_CODE,DATA_MATRIX,CODE_39,CODE_93,CODE_128,CODABAR,PDF_417,AZTEC,MAXICODE"
                 }
         );
     }
diff --git a/www/pages/toolbox/trackinginfo.html b/www/pages/toolbox/trackinginfo.html
index 7765a70..65ea824 100644
--- a/www/pages/toolbox/trackinginfo.html
+++ b/www/pages/toolbox/trackinginfo.html
@@ -20,7 +20,6 @@
         <div class="list media-list no-hairlines tablet-inset no-margin-top">
             <ul>
                 <li class="item-divider">Information</li>
-
                 <li>
                     <div class="item-content">
                         <div class="item-inner">
@@ -38,7 +37,9 @@
                 <li>
                     <div class="item-content">
                         <div class="item-inner">
-                            <div class="item-text">Carrier: {{carrier.name}}{{#if service.name}} {{service.name}}{{/if}}</div>
+                            <div class="item-text">Tracking Code: {{code}}</div>
+                            <div class="item-text">Carrier: {{carrier.name}}</div>
+                            {{#if service.name}}<div class="item-text">Service: {{service.name}}</div>{{/if}}
                             <div class="item-text">From: {{addresses.from}}</div>
                             <div class="item-text">To: {{addresses.to}}</div>
                         </div>
@@ -48,7 +49,7 @@
                     <div class="item-content" style="background-color: white; display: flex; justify-content: center; padding-left: 1rem; padding-right: 1rem;">
                         <svg class="barcode"
                              jsbarcode-format="code128"
-                             jsbarcode-value="{{code}}"
+                             jsbarcode-value="{{#if barcode}}{{barcode}}{{else}}{{code}}{{/if}}"
                              jsbarcode-height="40"
                              jsbarcode-width="2">
                         </svg>