diff --git a/license-credits.md b/license-credits.md
index 5067ac8..c680600 100644
--- a/license-credits.md
+++ b/license-credits.md
@@ -387,6 +387,212 @@ THIS SOFTWARE.
 
 -----
 
+The following software may be included in this product: htm. A copy of the source code may be downloaded from https://github.com/developit/htm.git. This software contains the following license and notice below:
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-----
+
 The following software may be included in this product: ieee754. A copy of the source code may be downloaded from git://github.com/feross/ieee754.git. This software contains the following license and notice below:
 
 Copyright 2008 Fair Oaks Labs, Inc.
@@ -1031,6 +1237,31 @@ THIS SOFTWARE.
 
 -----
 
+The following software may be included in this product: swiper. A copy of the source code may be downloaded from https://github.com/nolimits4web/Swiper.git. This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Vladimir Kharlampidi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: template7. A copy of the source code may be downloaded from https://github.com/nolimits4web/template7.git. This software contains the following license and notice below:
 
 The MIT License (MIT)
@@ -3013,7 +3244,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -----
 
-The following software may be included in this product: cordova-plugin-camera, cordova-plugin-device, cordova-plugin-geolocation, cordova-plugin-inappbrowser, cordova-plugin-splashscreen, cordova-plugin-statusbar, cordova-plugin-whitelist. A copy of the source code may be downloaded from https://github.com/apache/cordova-plugin-camera.git (cordova-plugin-camera), https://github.com/apache/cordova-plugin-device (cordova-plugin-device), https://github.com/apache/cordova-plugin-geolocation.git (cordova-plugin-geolocation), https://github.com/apache/cordova-plugin-inappbrowser.git (cordova-plugin-inappbrowser), https://github.com/apache/cordova-plugin-splashscreen.git (cordova-plugin-splashscreen), https://github.com/apache/cordova-plugin-statusbar (cordova-plugin-statusbar), https://github.com/apache/cordova-plugin-whitelist.git (cordova-plugin-whitelist). This software contains the following license and notice below:
+The following software may be included in this product: cordova-plugin-camera, cordova-plugin-device, cordova-plugin-geolocation, cordova-plugin-inappbrowser, cordova-plugin-splashscreen, cordova-plugin-statusbar. A copy of the source code may be downloaded from https://github.com/apache/cordova-plugin-camera.git (cordova-plugin-camera), https://github.com/apache/cordova-plugin-device (cordova-plugin-device), https://github.com/apache/cordova-plugin-geolocation.git (cordova-plugin-geolocation), https://github.com/apache/cordova-plugin-inappbrowser.git (cordova-plugin-inappbrowser), https://github.com/apache/cordova-plugin-splashscreen.git (cordova-plugin-splashscreen), https://github.com/apache/cordova-plugin-statusbar (cordova-plugin-statusbar). This software contains the following license and notice below:
 
 Apache License
                            Version 2.0, January 2004
diff --git a/www/assets/css/app.css b/www/assets/css/app.css
index 23b25da..336dddd 100644
--- a/www/assets/css/app.css
+++ b/www/assets/css/app.css
@@ -44,7 +44,7 @@ Framework7 and FontAwesome both have a .fab class
     background-color: rgba(255,255,255,0.5);
 }
 .popup {
-    background-color: rgba(255,255,255,0.95);
+    /* background-color: rgba(255,255,255,0.95); */
 }
 .theme-dark .list.transparent ul {
     background-color: rgba(0,0,0,0.65);
diff --git a/www/assets/js/account.js b/www/assets/js/account.js
index e9d8f7b..c69d4b8 100644
--- a/www/assets/js/account.js
+++ b/www/assets/js/account.js
@@ -246,7 +246,7 @@ $("#app").on("click", "#connectExistingAccountBtn", function () {
     }, "");
 });
 
-$("#app").on("popup:open", "#accountUpdatePopup", function () {
+$("body").on("popup:open", "#accountUpdatePopup", function () {
     app.input.checkEmptyState("#accountupdateform input#name");
     app.input.checkEmptyState("#accountupdateform input#email");
     app.input.checkEmptyState("#accountupdateform input#streetaddress");
diff --git a/www/assets/js/dropandsend.js b/www/assets/js/dropandsend.js
index 46af645..b8ed089 100644
--- a/www/assets/js/dropandsend.js
+++ b/www/assets/js/dropandsend.js
@@ -67,7 +67,7 @@ $("#app").on("click", "#pickupCodeManualEntryBtn", function () {
     }, "");
 });
 
-$("#app").on("popup:open", "#dasLocationMapPopup", function () {
+$("body").on("popup:open", "#dasLocationMapPopup", function () {
     if (mapboxgl.supported()) {
         if (dropboxMap == null) {
             var mapboxel = document.getElementById("mapbox-dropboxes");
@@ -137,7 +137,7 @@ $("#app").on("popup:open", "#dasLocationMapPopup", function () {
     }
 });
 
-$("#app").on("popup:open", "#dasHowItWorksPopup", function () {
+$("body").on("popup:open", "#dasHowItWorksPopup", function () {
     // Put user's account number in the instructions
     if (inStorage("phonenumber") && inStorage("accountkey")) {
         $("#dasHowItWorksAccountNumber").text(" (yours is " + getStorage("phonenumber") + ")");
diff --git a/www/assets/js/main.js b/www/assets/js/main.js
index 7c118f7..fa4cb88 100644
--- a/www/assets/js/main.js
+++ b/www/assets/js/main.js
@@ -22,14 +22,15 @@ var app = new Framework7({
     popover: {
         backdrop: true
     },
-    init: true,
+    init: false,
     initOnDeviceReady: false,
     routes: routes
 });
 
-var mainView = app.views.create('.view-main', {
+var mainView = app.views.create('#view-main', {
     url: "/",
-    animate: true
+    animate: true,
+    loadInitialPage: false
 });
 
 var router = mainView.router;
@@ -166,6 +167,8 @@ setAnimations();
 
 var setup = (inStorage("phonenumber") && inStorage("accountkey")) || inStorage("setupskipped");
 
+app.init();
+
 if (setup) {
     router.navigate("/home");
 } else {
diff --git a/www/assets/js/rates.js b/www/assets/js/rates.js
index b2ecd09..8d232be 100644
--- a/www/assets/js/rates.js
+++ b/www/assets/js/rates.js
@@ -126,9 +126,8 @@ function getRates() {
                     if (resp.hints.length == 0) {
                         resp.hints = false;
                     }
-                    router.navigate("/rateresult", {
-                        context: resp
-                    });
+                    $("#rateResultPopup").html(compiledPages.rateresult(resp));
+                    app.popup.open("#rateResultPopup");
                 } else {
                     app.dialog.alert(resp.message, "Error");
                 }
diff --git a/www/assets/js/track.js b/www/assets/js/track.js
index d789fb7..56dfea9 100644
--- a/www/assets/js/track.js
+++ b/www/assets/js/track.js
@@ -50,13 +50,13 @@ function openTrackingBarcodeScanner() {
     });
 }
 
-function trackOpenAsync(routeTo, routeFrom, resolve, reject) {
+function trackOpenAsync( {to, resolve, reject}) {
     app.dialog.preloader("Loading...");
 
     apirequest(
             SETTINGS.apis.track,
             {
-                code: routeTo.params.code,
+                code: to.params.code,
                 format: "json"
             },
             function (resp) {
@@ -104,9 +104,7 @@ function trackOpenAsync(routeTo, routeFrom, resolve, reject) {
                     }
 
                     resolve({
-                        templateUrl: "pages/trackresult.html",
-                    }, {
-                        context: context
+                        content: compiledPages.trackresult(context)
                     });
                 } else {
                     app.dialog.alert(resp.msg, "Error");
diff --git a/www/index.html b/www/index.html
index a05e730..1e6a3ac 100644
--- a/www/index.html
+++ b/www/index.html
@@ -2,60 +2,68 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<title>Loading...</title>
-<meta charset="UTF-8">
-<meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover, user-scalable=no">
-<link rel="icon" href="assets/images/icons/logo.svg" />
-<link rel="manifest" href="manifest.json">
-<link rel="stylesheet" href="node_modules/framework7/css/framework7.bundle.min.css" />
-<link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-pro/css/all.min.css" />
-<link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css" />
-<link rel="stylesheet" href="node_modules/maplibre-gl/dist/mapbox-gl.css">
-<link rel="stylesheet" href="assets/css/app.css" />
-<link rel="stylesheet" href="assets/css/home.css" />
-<link rel="stylesheet" href="assets/css/backdrop.css" />
-<link rel="stylesheet" href="assets/css/web-barcode.css" />
-<link rel="stylesheet" href="assets/fonts/roboto/Roboto.css" />
-<link rel="stylesheet" href="assets/css/tablet.css" />
+<head>
+    <title>Loading...</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="initial-scale=1, width=device-width, height=device-height, viewport-fit=cover, user-scalable=no">
+    <link rel="icon" href="assets/images/icons/logo.svg" />
+    <link rel="manifest" href="manifest.json">
+    <link rel="stylesheet" href="node_modules/framework7/framework7-bundle.min.css" />
+    <link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-pro/css/all.min.css" />
+    <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css" />
+    <link rel="stylesheet" href="node_modules/maplibre-gl/dist/mapbox-gl.css">
+    <link rel="stylesheet" href="assets/css/app.css" />
+    <link rel="stylesheet" href="assets/css/home.css" />
+    <link rel="stylesheet" href="assets/css/backdrop.css" />
+    <link rel="stylesheet" href="assets/css/web-barcode.css" />
+    <link rel="stylesheet" href="assets/fonts/roboto/Roboto.css" />
+    <link rel="stylesheet" href="assets/css/tablet.css" />
 
-<script src="cordova.js"></script>
-
-<div id="app" class="color-theme-green">
-
-    <div class="view view-main"></div>
-
-</div>
-
-<div id="web-barcode-ui" class="hidden">
-    <video id="barcode-viewer"></video>
-    <div class="text">
-        Scan a barcode with your camera.  Click or tap anywhere to cancel.
+    <script src="cordova.js"></script>
+</head>
+<body class="color-theme-green">
+    <div id="app" style="height: 100%;">
+        <div class="view view-main" id="view-main">
+            <div data-name="init" class="page">
+                <div class="page-content">
+                    ...
+                </div>
+            </div>
+        </div>
     </div>
-</div>
 
-<script src="node_modules/framework7/js/framework7.bundle.min.js"></script>
-<script src="node_modules/jquery/dist/jquery.min.js"></script>
-<script src="node_modules/jsbarcode/dist/JsBarcode.all.min.js"></script>
-<script src="node_modules/bwip-js/dist/bwip-js-min.js"></script>
-<script src="node_modules/maplibre-gl/dist/mapbox-gl.js"></script>
-<script src="node_modules/signature_pad/dist/signature_pad.umd.min.js"></script>
+    <div id="web-barcode-ui" class="hidden">
+        <video id="barcode-viewer"></video>
+        <div class="text">
+            Scan a barcode with your camera.  Click or tap anywhere to cancel.
+        </div>
+    </div>
 
-<script src="settings.js"></script>
+    <script src="node_modules/framework7/framework7-bundle.min.js"></script>
+    <script src="node_modules/template7/dist/template7.min.js"></script>
+    <script src="node_modules/jquery/dist/jquery.min.js"></script>
+    <script src="node_modules/jsbarcode/dist/JsBarcode.all.min.js"></script>
+    <script src="node_modules/bwip-js/dist/bwip-js-min.js"></script>
+    <script src="node_modules/maplibre-gl/dist/mapbox-gl.js"></script>
+    <script src="node_modules/signature_pad/dist/signature_pad.umd.min.js"></script>
 
-<script src="assets/js/storage.js"></script>
+    <script src="settings.js"></script>
 
-<script src="assets/js/platform.js"></script>
+    <script src="assets/js/storage.js"></script>
 
-<script src="assets/js/map_maplibre.js"></script>
-<script src="assets/js/MapControl.class.js"></script>
-<script src="assets/js/map.js"></script>
-<script src="assets/js/util.js"></script>
-<script src="assets/js/track.js"></script>
-<script src="assets/js/dropandsend.js"></script>
-<script src="assets/js/addresscode.js"></script>
-<script src="assets/js/rates.js"></script>
-<!-- <script src="assets/js/noticeslip.js"></script> -->
-<script src="assets/js/account.js"></script>
+    <script src="assets/js/platform.js"></script>
 
-<script src="routes.js"></script>
-<script src="assets/js/main.js"></script>
\ No newline at end of file
+    <script src="assets/js/map_maplibre.js"></script>
+    <script src="assets/js/MapControl.class.js"></script>
+    <script src="assets/js/map.js"></script>
+    <script src="assets/js/util.js"></script>
+    <script src="assets/js/track.js"></script>
+    <script src="assets/js/dropandsend.js"></script>
+    <script src="assets/js/addresscode.js"></script>
+    <script src="assets/js/rates.js"></script>
+    <!-- <script src="assets/js/noticeslip.js"></script> -->
+    <script src="assets/js/account.js"></script>
+
+    <script src="routes.js"></script>
+    <script src="assets/js/main.js"></script>
+</body>
\ No newline at end of file
diff --git a/www/package-lock.json b/www/package-lock.json
index f758bae..8c768f2 100644
--- a/www/package-lock.json
+++ b/www/package-lock.json
@@ -12,14 +12,14 @@
         "@fortawesome/fontawesome-pro": "^5.15.0",
         "@zxing/library": "^0.15.2",
         "bwip-js": "^2.0.6",
-        "framework7": "^5.5.1",
+        "framework7": "^6.3.5",
         "jquery": "^3.5.1",
         "jsbarcode": "^3.11.0",
         "maplibre-gl": "^1.13.0-rc.4",
         "material-design-icons": "^3.0.1",
-        "signature_pad": "^3.0.0-beta.4"
-      },
-      "devDependencies": {}
+        "signature_pad": "^3.0.0-beta.4",
+        "template7": "^1.4.2"
+      }
     },
     "node_modules/@fortawesome/fontawesome-pro": {
       "version": "5.15.0",
@@ -140,11 +140,11 @@
       "integrity": "sha1-s085HupNqPPpgjHizNjfnAQfFxs="
     },
     "node_modules/dom7": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
-      "integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",
+      "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
       "dependencies": {
-        "ssr-window": "^1.0.1"
+        "ssr-window": "^3.0.0-alpha.1"
       }
     },
     "node_modules/earcut": {
@@ -153,19 +153,21 @@
       "integrity": "sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ=="
     },
     "node_modules/framework7": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/framework7/-/framework7-5.5.1.tgz",
-      "integrity": "sha512-Ei+LYZtBf+6kmz9u5YcgXKEFQAK4CRm4lQiUO2zh2HNsxXBJFh3nJ+usybbDmxDL4FZO6/8xF9tO7c77n2X4/A==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/framework7/-/framework7-6.3.5.tgz",
+      "integrity": "sha512-zafVvrg/UToMYfltTuyXGkavSDwENincD3dgPhWhKGrATMp0nCnO/BzVoyYHgkdtYUNytCH9lCSO4G00z7u9Xw==",
       "hasInstallScript": true,
       "dependencies": {
-        "dom7": "^2.1.3",
-        "path-to-regexp": "^6.1.0",
-        "ssr-window": "^1.0.1",
-        "template7": "^1.4.2"
+        "dom7": "^3.0.0",
+        "htm": "^3.1.0",
+        "path-to-regexp": "^6.2.0",
+        "skeleton-elements": "^3.5.0",
+        "ssr-window": "^3.0.0",
+        "swiper": "^6.8.4"
       },
       "funding": {
         "type": "patreon",
-        "url": "https://www.patreon.com/vladimirkharlampidi"
+        "url": "https://www.patreon.com/framework7"
       }
     },
     "node_modules/geojson-vt": {
@@ -183,6 +185,11 @@
       "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
       "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
     },
+    "node_modules/htm": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz",
+      "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="
+    },
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -326,9 +333,9 @@
       "integrity": "sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E="
     },
     "node_modules/path-to-regexp": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
-      "integrity": "sha1-Cxj4i3oM4L+uaiWZDJCauG9RJCc="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz",
+      "integrity": "sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="
     },
     "node_modules/pbf": {
       "version": "3.2.1",
@@ -407,10 +414,15 @@
       "resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
       "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
     },
+    "node_modules/skeleton-elements": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/skeleton-elements/-/skeleton-elements-3.5.0.tgz",
+      "integrity": "sha512-KOU3wHGyCOtfMWLYF9wn2JzxM/l0Vu4miqqdoz9HeTfd1fwIsEePrcIrZ4+8wbg6yK82UPLLyH7fAZAwhQwZNw=="
+    },
     "node_modules/ssr-window": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
-      "integrity": "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
+      "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
@@ -428,10 +440,33 @@
         "kdbush": "^3.0.0"
       }
     },
+    "node_modules/swiper": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz",
+      "integrity": "sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==",
+      "funding": [
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/vladimirkharlampidi"
+        },
+        {
+          "type": "open_collective",
+          "url": "http://opencollective.com/swiper"
+        }
+      ],
+      "hasInstallScript": true,
+      "dependencies": {
+        "dom7": "^3.0.0",
+        "ssr-window": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 4.7.0"
+      }
+    },
     "node_modules/template7": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/template7/-/template7-1.4.2.tgz",
-      "integrity": "sha1-YvMpWTYeRV7Bce+e8z0pynEw4Ak=",
+      "integrity": "sha512-eoKnScBMDk7lyj7+iCzKbxGiSLLlQk0DNvmclyJuMCUKxy9JrFuAB+GD5iplF4WiQPtMdI06CHHks3avL22JXA==",
       "engines": {
         "node": ">= 0.10.0"
       }
@@ -572,11 +607,11 @@
       "integrity": "sha1-s085HupNqPPpgjHizNjfnAQfFxs="
     },
     "dom7": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.3.tgz",
-      "integrity": "sha512-QTxHHDox+M6ZFz1zHPAHZKI3JOHY5iY4i9BK2uctlggxKQwRhO3q3HHFq1BKsT25Bm/ySSj70K6Wk/G4bs9rMQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",
+      "integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
       "requires": {
-        "ssr-window": "^1.0.1"
+        "ssr-window": "^3.0.0-alpha.1"
       }
     },
     "earcut": {
@@ -585,14 +620,16 @@
       "integrity": "sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ=="
     },
     "framework7": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/framework7/-/framework7-5.5.1.tgz",
-      "integrity": "sha512-Ei+LYZtBf+6kmz9u5YcgXKEFQAK4CRm4lQiUO2zh2HNsxXBJFh3nJ+usybbDmxDL4FZO6/8xF9tO7c77n2X4/A==",
+      "version": "6.3.5",
+      "resolved": "https://registry.npmjs.org/framework7/-/framework7-6.3.5.tgz",
+      "integrity": "sha512-zafVvrg/UToMYfltTuyXGkavSDwENincD3dgPhWhKGrATMp0nCnO/BzVoyYHgkdtYUNytCH9lCSO4G00z7u9Xw==",
       "requires": {
-        "dom7": "^2.1.3",
-        "path-to-regexp": "^6.1.0",
-        "ssr-window": "^1.0.1",
-        "template7": "^1.4.2"
+        "dom7": "^3.0.0",
+        "htm": "^3.1.0",
+        "path-to-regexp": "^6.2.0",
+        "skeleton-elements": "^3.5.0",
+        "ssr-window": "^3.0.0",
+        "swiper": "^6.8.4"
       }
     },
     "geojson-vt": {
@@ -610,6 +647,11 @@
       "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz",
       "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA=="
     },
+    "htm": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz",
+      "integrity": "sha512-L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
@@ -681,9 +723,9 @@
       "integrity": "sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E="
     },
     "path-to-regexp": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz",
-      "integrity": "sha1-Cxj4i3oM4L+uaiWZDJCauG9RJCc="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz",
+      "integrity": "sha512-f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="
     },
     "pbf": {
       "version": "3.2.1",
@@ -742,10 +784,15 @@
       "resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
       "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
     },
+    "skeleton-elements": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/skeleton-elements/-/skeleton-elements-3.5.0.tgz",
+      "integrity": "sha512-KOU3wHGyCOtfMWLYF9wn2JzxM/l0Vu4miqqdoz9HeTfd1fwIsEePrcIrZ4+8wbg6yK82UPLLyH7fAZAwhQwZNw=="
+    },
     "ssr-window": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz",
-      "integrity": "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
+      "integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
     },
     "string_decoder": {
       "version": "1.3.0",
@@ -763,10 +810,19 @@
         "kdbush": "^3.0.0"
       }
     },
+    "swiper": {
+      "version": "6.8.4",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz",
+      "integrity": "sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==",
+      "requires": {
+        "dom7": "^3.0.0",
+        "ssr-window": "^3.0.0"
+      }
+    },
     "template7": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/template7/-/template7-1.4.2.tgz",
-      "integrity": "sha1-YvMpWTYeRV7Bce+e8z0pynEw4Ak="
+      "integrity": "sha512-eoKnScBMDk7lyj7+iCzKbxGiSLLlQk0DNvmclyJuMCUKxy9JrFuAB+GD5iplF4WiQPtMdI06CHHks3avL22JXA=="
     },
     "text-encoding": {
       "version": "0.7.0",
diff --git a/www/package.json b/www/package.json
index 83c6eee..f6c06ec 100644
--- a/www/package.json
+++ b/www/package.json
@@ -7,12 +7,12 @@
     "@fortawesome/fontawesome-pro": "^5.15.0",
     "@zxing/library": "^0.15.2",
     "bwip-js": "^2.0.6",
-    "framework7": "^5.5.1",
+    "framework7": "^6.3.5",
     "jquery": "^3.5.1",
     "jsbarcode": "^3.11.0",
     "maplibre-gl": "^1.13.0-rc.4",
     "material-design-icons": "^3.0.1",
-    "signature_pad": "^3.0.0-beta.4"
-  },
-  "devDependencies": {}
+    "signature_pad": "^3.0.0-beta.4",
+    "template7": "^1.4.2"
+  }
 }
diff --git a/www/pages/account.html b/www/pages/account.html
index 3011f67..b8509d4 100644
--- a/www/pages/account.html
+++ b/www/pages/account.html
@@ -33,7 +33,7 @@
                         <div id="hasaccountbox" style="display: none;">
                             <div id="addPaymentMethodBox" style="display: none;">
                                 Add a credit or debit card to use Drop and Send. It'll be securely saved for future use.
-                                <div class="button hapticbtn button-fill margin" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card"></i> Add Card</div>
+                                <div class="button hapticbtn button-fill margin" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i>&nbsp;Add Card</div>
                                 <hr />
                             </div>
                             <div class="card-content-padding">
@@ -46,7 +46,7 @@
                                 <img id="loyaltyBarcodeImg" style="width: 90%; max-width: 300px; padding: 1.2em; background: white;" />
                             </div>
                             <div class="block">
-                                <div class="button hapticbtn popup-open button-outline" data-popup="#accountUpdatePopup"><i class="fas fa-edit"></i> Update account details</div>
+                                <div class="button hapticbtn popup-open button-outline" data-popup="#accountUpdatePopup"><i class="fas fa-edit fa-fw"></i>&nbsp;Update account details</div>
                             </div>
                             <div id="loyaltyErrorMessage"></div>
                             <div class="block margin-top">
@@ -64,8 +64,8 @@
                             <div class="block">
                                 Already have an account?
                                 <div class="button hapticbtn" id="connectExistingAccountBtn">
-                                    <span class="taptext">Tap</span>
-                                    <span class="clicktext">Click</span> here</div>
+                                    <span class="taptext">Tap here</span>
+                                    <span class="clicktext">Click here</span></div>
                                 to connect it.
                             </div>
 
@@ -119,7 +119,7 @@
                                 </ul>
                             </div>
                             <div class="card-content-padding">
-                                <div class="button hapticbtn button-fill" id="setupAccountBtn"><i class="far fa-plus"></i> Setup Account</div>
+                                <div class="button hapticbtn button-fill" id="setupAccountBtn"><i class="far fa-plus fa-fw"></i>&nbsp;Setup Account</div>
                             </div>
                         </div>
                     </div>
@@ -133,7 +133,7 @@
             <h3>Update Account</h3>
         </div>
         <div class="list no-hairlines">
-            <ul id="accountupdateform" style="background: transparent;">
+            <ul id="accountupdateform">
                 <li class="item-content item-input item-input-outline">
                     <div class="item-inner">
                         <div class="item-title item-floating-label">Name</div>
@@ -173,10 +173,10 @@
             </ul>
         </div>
         <div class="card-content-padding">
-            <div class="button hapticbtn button-outline" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card"></i> Add New Card</div>
+            <div class="button hapticbtn button-outline" onclick="openCheckoutWindowToSaveCard()"><i class="fas fa-credit-card fa-fw"></i>&nbsp;Add New Card</div>
         </div>
         <div class="card-content-padding">
-            <div class="button button-fill hapticbtn" id="updateAccountBtn"><i class="far fa-edit"></i> Update Account</div>
+            <div class="button button-fill hapticbtn" id="updateAccountBtn"><i class="far fa-edit fa-fw"></i>&nbsp;Update Account</div>
         </div>
         <div class="block text-align-center">
             <p><a class="button popup-close" href="#">Cancel</a></p>
diff --git a/www/pages/addresscode.html b/www/pages/addresscode.html
deleted file mode 100644
index 770b136..0000000
--- a/www/pages/addresscode.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<div class="page" data-name="addresscode">
-
-    <div class="navbar">
-        <div class="navbar-bg"></div>
-        <div class="navbar-inner">
-            <div class="left">
-                <a class="link back hapticbtn" href="#">
-                    <i class="icon icon-back"></i>
-                    <span class="if-not-md">Back</span>
-                </a>
-            </div>
-            <div class="title">Express Pickup</div>
-        </div>
-    </div>
-
-
-    <div class="page-content">
-        <div class="block">
-            Get a faster pickup and a discount by filling in your package's destination address here. We'll scan the code on your screen instead of typing in the address, saving everyone's time and eliminating typos!
-        </div>
-        <div class="row justify-content-center">
-            <div class="col-100 medium-90 xlarge-75 margin-horizontal">
-                <div class="card margin">
-                    <div class="card-content text-align-center padding-vertical">
-                        <div class="list">
-                            <ul id="addresscodeform">
-                                {{#each fields}}
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">{{label}}</div>
-                                        <div class="item-input-wrap">
-                                            <input type="text" id="{{id}}" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                {{/each}}
-                            </ul>
-                        </div>
-                        <div class="card-content-padding">
-                            <div class="button hapticbtn" onclick="getAddressQRCode()"><i class="far fa-qrcode"></i> Show Code</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="popup text-color-black" id="addresscode-popup">
-        <div class="block text-align-center">
-            <img id="addresscode-barcode" style="max-width: 90%;" />
-            <p>Present this code to the Helena Express agent.</p>
-            <p><a class="button popup-close hapticbtn" href="#">Close</a></p>
-        </div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/www/pages/credits.html b/www/pages/credits.html
index 2e7e276..a63ae2c 100644
--- a/www/pages/credits.html
+++ b/www/pages/credits.html
@@ -417,6 +417,212 @@ THIS SOFTWARE.
 
 -----
 
+The following software may be included in this product: htm. A copy of the source code may be downloaded from https://github.com/developit/htm.git. This software contains the following license and notice below:
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+-----
+
 The following software may be included in this product: ieee754. A copy of the source code may be downloaded from git://github.com/feross/ieee754.git. This software contains the following license and notice below:
 
 Copyright 2008 Fair Oaks Labs, Inc.
@@ -1061,6 +1267,31 @@ THIS SOFTWARE.
 
 -----
 
+The following software may be included in this product: swiper. A copy of the source code may be downloaded from https://github.com/nolimits4web/Swiper.git. This software contains the following license and notice below:
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Vladimir Kharlampidi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-----
+
 The following software may be included in this product: template7. A copy of the source code may be downloaded from https://github.com/nolimits4web/template7.git. This software contains the following license and notice below:
 
 The MIT License (MIT)
@@ -3043,7 +3274,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -----
 
-The following software may be included in this product: cordova-plugin-camera, cordova-plugin-device, cordova-plugin-geolocation, cordova-plugin-inappbrowser, cordova-plugin-splashscreen, cordova-plugin-statusbar, cordova-plugin-whitelist. A copy of the source code may be downloaded from https://github.com/apache/cordova-plugin-camera.git (cordova-plugin-camera), https://github.com/apache/cordova-plugin-device (cordova-plugin-device), https://github.com/apache/cordova-plugin-geolocation.git (cordova-plugin-geolocation), https://github.com/apache/cordova-plugin-inappbrowser.git (cordova-plugin-inappbrowser), https://github.com/apache/cordova-plugin-splashscreen.git (cordova-plugin-splashscreen), https://github.com/apache/cordova-plugin-statusbar (cordova-plugin-statusbar), https://github.com/apache/cordova-plugin-whitelist.git (cordova-plugin-whitelist). This software contains the following license and notice below:
+The following software may be included in this product: cordova-plugin-camera, cordova-plugin-device, cordova-plugin-geolocation, cordova-plugin-inappbrowser, cordova-plugin-splashscreen, cordova-plugin-statusbar. A copy of the source code may be downloaded from https://github.com/apache/cordova-plugin-camera.git (cordova-plugin-camera), https://github.com/apache/cordova-plugin-device (cordova-plugin-device), https://github.com/apache/cordova-plugin-geolocation.git (cordova-plugin-geolocation), https://github.com/apache/cordova-plugin-inappbrowser.git (cordova-plugin-inappbrowser), https://github.com/apache/cordova-plugin-splashscreen.git (cordova-plugin-splashscreen), https://github.com/apache/cordova-plugin-statusbar (cordova-plugin-statusbar). This software contains the following license and notice below:
 
 Apache License
                            Version 2.0, January 2004
diff --git a/www/pages/noticeslip.html b/www/pages/noticeslip.html
deleted file mode 100644
index 684c830..0000000
--- a/www/pages/noticeslip.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<div class="page" data-name="noticeslip">
-
-    <div class="navbar">
-        <div class="navbar-bg"></div>
-        <div class="navbar-inner">
-            <div class="left">
-                <a class="link back hapticbtn" href="#">
-                    <i class="icon icon-back"></i>
-                    <span class="if-not-md">Back</span>
-                </a>
-            </div>
-            <div class="title">Pick Up and Redeliver</div>
-        </div>
-    </div>
-
-
-    <div class="page-content">
-        <div class="row justify-content-center">
-            <div class="col-100 medium-90 xlarge-75 margin-horizontal">
-                <div class="card margin">
-                    <div class="card-content text-align-center">
-                        <div class="block padding-vertical-half">
-                            Missed a delivery? For a fee, we'll pick up your oversized or signature-required item from the Helena Post Office and deliver it to your front door, even if nobody's home to sign for it.
-                        </div>
-                        <div class="block padding-vertical-half">
-                            You just need to fill out this form, sign the back of the pink notice slip, and take a picture of it with this app. Information provided must match the information on the notice slip.
-                        </div>
-                        <div class="block padding-vertical-half">
-                            Your item will be delivered within one business day of submitting a request, excluding postal holidays. This service is not available for Restricted Delivery or Registered Mail.
-                        </div>
-                        <div class="list" id="noticeform">
-                            <ul>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">Recipient Name</div>
-                                        <div class="item-input-wrap">
-                                            <input type="text" id="name" placeholder="Jon Doe" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">Street Address</div>
-                                        <div class="item-input-wrap">
-                                            <input type="text" id="street" placeholder="1234 Example Rd, Apt 1A" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">ZIP Code</div>
-                                        <div class="item-input-wrap">
-                                            <input type="text" id="zip" placeholder="59602" inputmode="numeric" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">Phone Number</div>
-                                        <div class="item-input-wrap">
-                                            <input type="tel" id="phone" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">Email Address</div>
-                                        <div class="item-input-wrap">
-                                            <input type="email" id="email" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </div>
-                        <div class="block">
-                            Press the buttons to take a photo of the front and back of your signed notice slip.
-
-                            <div class="row" style="min-height: 100px;">
-                                <div class="col-50">
-                                    <div class="button button-outline margin hapticbtn" onclick="takeDocPhoto('front')"><i class="fas fa-camera"></i> Front</div>
-                                    <img src="assets/images/3849_front.png" id="noticefrontimg" style="max-width: 100%; max-height: 50vh;" />
-                                </div>
-                                <div class="col-50">
-                                    <div class="button button-outline margin hapticbtn" onclick="takeDocPhoto('back')"><i class="fas fa-camera"></i> Back</div>
-                                    <img src="assets/images/3849_back.png" id="noticebackimg" style="max-width: 100%; max-height: 50vh;" />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="block margin-vertical">
-                            By signing below, you authorize a Helena Express agent to sign for and take possession of your item from the Helena Post Office and to deliver it to the address entered above.
-                        </div>
-                        <div class="signature-wrapper">
-                            <img src="assets/images/signature-line.svg" />
-                            <canvas id="signaturecanvas"></canvas>
-                            <i class="fas fa-undo text-color-blue" id="signatureUndoBtn"></i>
-                            <i class="fas fa-trash text-color-red" id="signatureClearBtn"></i>
-                        </div>
-                        <div class="list" id="noticesignform">
-                            <ul>
-                                <li class="item-content item-input item-input-outline">
-                                    <div class="item-inner">
-                                        <div class="item-title item-floating-label">Your Name</div>
-                                        <div class="item-input-wrap">
-                                            <input type="text" id="signature" />
-                                            <span class="input-clear-button"></span>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </div>
-                        <div class="card-content-padding">
-                            <div class="button hapticbtn" onclick="noticeSlipPayAndFinish()"><i class="far fa-arrow-right"></i> Finish</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="popup" id="noticeslip-pay-popup">
-        <div class="block text-align-center">
-            <h2>Finish and pay</h2>
-            <h3>Total: $<span id="noticeslip-pay-amount"></span></h3>
-            <div id="noticeslip-stripe-elements">
-                <i class="fas fa-spin fa-spinner"></i> Loading secure card form...
-            </div>
-            <div id="noticeslip-card-errors" style="text-color-red"></div>
-            <br />
-            <br />
-            <div class="button hapticbtn" onclick="submitNoticeSlip()"><i class="far fa-arrow-right"></i> Pay and Submit</div>
-            <p><a class="button popup-close hapticbtn" href="#">Cancel</a></p>
-        </div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/www/pages/noticeslipsuccess.html b/www/pages/noticeslipsuccess.html
deleted file mode 100644
index 750138f..0000000
--- a/www/pages/noticeslipsuccess.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<div class="page" data-name="noticeslipsuccess">
-
-    <div class="navbar">
-        <div class="navbar-bg"></div>
-        <div class="navbar-inner">
-            <div class="left">
-                <a class="link hapticbtn" onclick="router.navigate('/home')">
-                    <i class="icon icon-back"></i>
-                    <span class="if-not-md">Back</span>
-                </a>
-            </div>
-            <div class="title">Pick Up and Redeliver</div>
-        </div>
-    </div>
-
-    <div class="page-content noselect">
-        <div class="row justify-content-center margin-top">
-            <div class="col-100 medium-90 xlarge-75 margin-horizontal">
-                <div class="card">
-                    <div class="card-content text-align-center padding-vertical">
-                        <h1><i class="fad fa-check-circle fa-4x text-color-green"></i></h1>
-                        <br />
-                        <h2>Request received!</h2>
-                        <p>Your item will be delivered within one business day.</p>
-                        <div class="button hapticbtn" onclick="router.navigate('/home')">Close</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/www/pages/rateresult.html b/www/pages/rateresult.html
index bbd23ef..f0db6b8 100644
--- a/www/pages/rateresult.html
+++ b/www/pages/rateresult.html
@@ -1,163 +1,160 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<!--
+This page is intended for loading into a popup.
+-->
 
-<div class="page" data-name="rateresult">
-
-    <div class="navbar">
-        <div class="navbar-bg"></div>
-        <div class="navbar-inner">
-            <div class="left">
-                <a class="link back hapticbtn" href="#">
-                    <i class="icon icon-back"></i>
-                    <span class="if-not-md">Back</span>
-                </a>
-            </div>
-            <div class="title">Rates</div>
+<div class="navbar">
+    <div class="navbar-bg"></div>
+    <div class="navbar-inner">
+        <div class="left">
+            <a class="link popup-close" href="#">
+                <i class="icon icon-back"></i>
+                <span class="if-not-md">Close</span>
+            </a>
         </div>
+        <div class="title">Available Rates</div>
     </div>
-
-
-    <div class="page-content">
-        <div class="row justify-content-center">
-            <div class="col-100 medium-60 large-50 xlarge-40">
-                <div class="list transparent no-hairlines tablet-inset elevation-tablet">
-                    <ul>
-                        <li class="item-divider">From:</li>
-                        {{#with from}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{street}}
+</div>
+<div style="overflow-y: auto; height: calc(99% - calc(var(--f7-navbar-height) + var(--f7-safe-area-top)));">
+    <div class="row justify-content-center">
+        <div class="col-100">
+            <div class="list transparent no-hairlines">
+                <ul>
+                    <li class="item-divider">From:</li>
+                    {{#with from}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{street}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{citystatezip}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    {{/with}}
+                    <li class="item-divider">To:</li>
+                    {{#with to}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{street}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{citystatezip}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    {{/with}}
+                    <li class="item-divider">Item:</li>
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{weight}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner">
+                                <div class="item-title" style="white-space: normal !important;">
+                                    {{size}}
+                                </div>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="item-divider">Rates:</li>
+                    {{#if rates}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner item-cell">
+                                <div class="item-row" style="font-weight: 500;">
+                                    <div class="item-cell">
+                                        Service
+                                    </div>
+                                    <div class="item-cell">
+                                        Delivery Estimate
+                                    </div>
+                                    <div class="item-cell">
+                                        Price
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{citystatezip}}
+                        </div>
+                    </li>
+                    {{#each rates}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner item-cell">
+                                <div class="item-row">
+                                    <div class="item-cell">
+                                        {{carrier}} {{service}}
+                                    </div>
+                                    <div class="item-cell">
+                                        {{date}}
+                                    </div>
+                                    <div class="item-cell">
+                                        ${{rate}}
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        {{/with}}
-                        <li class="item-divider">To:</li>
-                        {{#with to}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{street}}
+                        </div>
+                    </li>
+                    {{/each}}
+                    {{else}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner item-cell">
+                                <div class="item-row">
+                                    <div class="item-cell">
+                                        We could find no available shipping options based on the information you provided.
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{citystatezip}}
+                        </div>
+                    </li>
+                    {{/if}}
+                    {{#if hints}}
+                    <li class="item-divider">Tip{{#js_if "this.hints.length > 1"}}s{{/js_if}}:</li>
+                    {{#each hints}}
+                    <li>
+                        <div class="item-content">
+                            <div class="item-inner item-cell">
+                                <div class="item-row">
+                                    <div class="item-cell">
+                                        {{this}}
                                     </div>
                                 </div>
                             </div>
-                        </li>
-                        {{/with}}
-                        <li class="item-divider">Item:</li>
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{weight}}
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner">
-                                    <div class="item-title" style="white-space: normal !important;">
-                                        {{size}}
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        <li class="item-divider">Rates:</li>
-                        {{#if rates}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner item-cell">
-                                    <div class="item-row" style="font-weight: 500;">
-                                        <div class="item-cell">
-                                            Service
-                                        </div>
-                                        <div class="item-cell">
-                                            Delivery Estimate
-                                        </div>
-                                        <div class="item-cell">
-                                            Price
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        {{#each rates}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner item-cell">
-                                    <div class="item-row">
-                                        <div class="item-cell">
-                                            {{carrier}} {{service}}
-                                        </div>
-                                        <div class="item-cell">
-                                            {{date}}
-                                        </div>
-                                        <div class="item-cell">
-                                            ${{rate}}
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        {{/each}}
-                        {{else}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner item-cell">
-                                    <div class="item-row">
-                                        <div class="item-cell">
-                                            We could find no available shipping options based on the information you provided.
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        {{/if}}
-                        {{#if hints}}
-                        <li class="item-divider">Tip{{#js_if "this.hints.length > 1"}}s{{/js_if}}:</li>
-                        {{#each hints}}
-                        <li>
-                            <div class="item-content">
-                                <div class="item-inner item-cell">
-                                    <div class="item-row">
-                                        <div class="item-cell">
-                                            {{this}}
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </li>
-                        {{/each}}
-                        {{/if}}
-                    </ul>
-                </div>
+                        </div>
+                    </li>
+                    {{/each}}
+                    {{/if}}
+                </ul>
             </div>
         </div>
-        <div class="block">
-            Rates provided do not include pickup fees. This tool provides shipping cost <i>estimates</i>; actual prices, available service options, and delivery dates shown are not guaranteed to be actually available when you ship your item. Your item's contents may not be eligible for certain services.
-        </div>
     </div>
-
+    <div class="block">
+        Rates provided do not include pickup fees. This tool provides shipping cost <i>estimates</i>; actual prices, available service options, and delivery dates shown are not guaranteed to be actually available when you ship your item. Your item's contents may not be eligible for certain services.
+    </div>
 </div>
\ No newline at end of file
diff --git a/www/pages/rates.html b/www/pages/rates.html
index dfdc542..f1709f5 100644
--- a/www/pages/rates.html
+++ b/www/pages/rates.html
@@ -461,6 +461,8 @@
             </div>
         </div>
     </div>
-</div>
 
+    <div class="popup" id="rateResultPopup">
+        
+    </div>
 </div>
\ No newline at end of file
diff --git a/www/routes.js b/www/routes.js
index c75596d..134d32f 100644
--- a/www/routes.js
+++ b/www/routes.js
@@ -4,6 +4,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+var compiledPages = {};
+var pagesToCompile = [
+    "home",
+    "welcome",
+    "appointment",
+    "dropandsend",
+    "rateresult",
+    "account",
+    "trackresult",
+    "settings"
+];
+console.log("Compiling page templates...");
+for (var i = 0; i < pagesToCompile.length; i++) {
+    compiledPages[pagesToCompile[i]] = Template7.compile($.ajax({
+        type: "GET",
+        url: "./pages/" + pagesToCompile[i] + ".html",
+        async: false
+    }).responseText);
+}
+console.log("Compiled page templates.");
+
 var routes = [
     {
         path: '/welcome',
@@ -27,7 +48,7 @@ var routes = [
                 }
             }
         },
-        async: function (routeTo, routeFrom, resolve, reject) {
+        async: function ( { resolve, reject }) {
             // Show a nag message if no account is set up
             var accountsetup = (inStorage("accountkey") && inStorage("phonenumber")) || getStorage("hideaccountnag") == "true";
             // add escape hatch to regular website if running online
@@ -36,9 +57,7 @@ var routes = [
                 escapehatch = true;
             }
             resolve({
-                templateUrl: './pages/home.html'
-            }, {
-                context: {
+                content: compiledPages.home({
                     accountsetup: accountsetup,
                     escapehatch: escapehatch,
                     pages: [
@@ -59,44 +78,18 @@ var routes = [
                             href: "/account",
                             icon: "fad fa-user-circle",
                             text: "Manage your Helena Express account and check rewards points balance."
-                        },
-//                        {
-//                            title: "Track Package",
-//                            href: "/track",
-//                            icon: "fad fa-search",
-//                            text: "Find the latest location and updates about any shipment."
-//                        },
-//                        {
-//                            title: "Get Rates",
-//                            href: "/rates",
-//                            icon: "fad fa-calculator",
-//                            text: "Calculate postage and prices for your item."
-//                        },
-//                        {
-//                            title: "Express Pickup",
-//                            href: "/addresscode",
-//                            icon: "fal fa-qrcode",
-//                            text: "Get a faster pickup and a discount by pre-typing the destination address here."
-//                        },
-//                        {
-//                            title: "Pick Up and Redeliver",
-//                            href: "/noticeslip",
-//                            icon: "fad fa-sticky-note",
-//                            text: "Take a picture of your pink postal notice slip and we'll go get your missed delivery."
-//                        }
+                        }
                     ]
-                }
-            });
+                })
+            }, {});
         }
     },
     {
         path: '/appointment',
         name: 'appointment',
-        async: function (routeTo, routeFrom, resolve, reject) {
+        async: function ( { resolve, reject }) {
             resolve({
-                templateUrl: './pages/appointment.html'
-            }, {
-                context: {
+                content: compiledPages.appointment({
                     services: [
                         {
                             title: "Package Pickup",
@@ -111,23 +104,23 @@ var routes = [
                             serviceid: 21
                         }
                     ]
-                }
+                })
+            }, {
             });
         },
         routes: [
             {
                 path: "/:serviceId",
-                async: function (routeTo, routeFrom, resolve, reject) {
+                async: function ( { resolve, reject, to }) {
                     var url = SETTINGS.appointmenturl;
                     if ($("#app").hasClass("theme-dark")) {
                         url = SETTINGS.appointmenturl_darkmode;
                     }
                     resolve({
-                        templateUrl: './pages/appointment.html'
+                        content: compiledPages.appointment({
+                            url: url + "&service=" + to.params.serviceId
+                        })
                     }, {
-                        context: {
-                            url: url + "&service=" + routeTo.params.serviceId
-                        }
                     });
                 }
             }
@@ -136,7 +129,7 @@ var routes = [
     {
         path: '/dropandsend',
         name: 'dropandsend',
-        templateUrl: './pages/dropandsend.html',
+        content: compiledPages.dropandsend(),
         on: {
             pageBeforeIn: function () {
                 checkIfAccountGoodWithPaymentMethod(function (ok) {
@@ -175,63 +168,15 @@ var routes = [
             }
         }
     },
-    {
-        path: '/rateresult',
-        name: 'rateresult',
-        templateUrl: './pages/rateresult.html'
-    },
-    {
-        path: '/noticeslip',
-        url: './pages/noticeslip.html',
-        name: 'noticeslip',
-        on: {
-            pageAfterIn: function () {
-                initNoticeSlipForm();
-            }
-        }
-    },
-    {
-        path: '/noticeslip/success',
-        name: 'noticeslipsuccess',
-        templateUrl: './pages/noticeslipsuccess.html'
-    },
-    {
-        path: '/addresscode',
-        name: 'addresscode',
-        async: function (routeTo, routeFrom, resolve, reject) {
-            resolve({
-                templateUrl: './pages/addresscode.html'
-            }, {
-                context: {
-                    fields: [
-                        {label: "Name", id: "name"},
-                        {label: "Company", id: "company"},
-                        {label: "Street", id: "street1"},
-                        {label: "Street (line 2)", id: "street2"},
-                        {label: "City", id: "city"},
-                        {label: "State", id: "state"},
-                        {label: "ZIP", id: "zip"}
-                    ]
-                }
-            });
-        }
-    },
     {
         path: '/account',
         name: 'account',
-        templateUrl: './pages/account.html',
+        content: compiledPages.account(),
         on: {
             pageAfterIn: function () {
                 initAccountPage();
             }
-        },
-        routes: [
-            {
-                path: '/managepayment',
-                name: 'managepayment',
-                templateUrl: './pages/managepayment.html'
-            }
-        ]
+        }
     },
     {
         path: '/track/:code',
@@ -257,7 +202,7 @@ var routes = [
     {
         path: '/settings',
         name: 'settings',
-        async: function (routeTo, routeFrom, resolve, reject) {
+        async: function ( {resolve}) {
             var settings = [];
             settings.push(
                     {
@@ -298,19 +243,17 @@ var routes = [
                         link: true
                     });
             resolve({
-                templateUrl: './pages/settings.html'
-            }, {
-                context: {
+                content: compiledPages.settings({
                     page_title: "Settings",
                     settings: settings
-                }
+                })
             });
         },
         routes: [
             {
                 path: '/display',
                 name: 'settings',
-                async: function (routeTo, routeFrom, resolve, reject) {
+                async: function ({resolve}) {
                     var settings = [
                         {
                             setting: "apptheme",
@@ -366,12 +309,10 @@ var routes = [
                         }
                     ];
                     resolve({
-                        templateUrl: './pages/settings.html'
-                    }, {
-                        context: {
+                        content: compiledPages.settings({
                             page_title: "Display Settings",
                             settings: settings
-                        }
+                        })
                     });
                 }
             }