diff --git a/www/assets/js/main.js b/www/assets/js/main.js
index fa4cb88..a815b08 100644
--- a/www/assets/js/main.js
+++ b/www/assets/js/main.js
@@ -100,7 +100,7 @@ router.on("routeChange", function (newRoute) {
 
 function setAppTheme(theme) {
     if (theme == "light") {
-        $("#app").removeClass("theme-dark");
+        $("body").removeClass("theme-dark");
         if (platform_type == "cordova" && typeof StatusBar !== 'undefined') {
             StatusBar.styleDefault();
             if (device.platform == "Android") {
@@ -110,7 +110,7 @@ function setAppTheme(theme) {
             }
         }
     } else if (theme == "dark") {
-        $("#app").addClass("theme-dark");
+        $("body").addClass("theme-dark");
         if (platform_type == "cordova" && typeof StatusBar !== 'undefined') {
             StatusBar.styleLightContent();
             StatusBar.backgroundColorByHexString("#000000");
diff --git a/www/assets/js/map_maplibre.js b/www/assets/js/map_maplibre.js
index 5c3cdf2..fbe37ca 100644
--- a/www/assets/js/map_maplibre.js
+++ b/www/assets/js/map_maplibre.js
@@ -7,7 +7,7 @@
 function maplibreMap(containerEl, interactive) {
 
     var theme = "liberty";
-    if ($("#app").hasClass("theme-dark")) {
+    if ($("body").hasClass("theme-dark")) {
         theme = "libertydark";
     }
 
diff --git a/www/pages/account.html b/www/pages/account.html
index b8509d4..189ec03 100644
--- a/www/pages/account.html
+++ b/www/pages/account.html
@@ -43,7 +43,7 @@
                             <div id="loyaltyBalanceBox" class="card-content-padding">
                                 <div>You have earned a total of</div>
                                 <h2 id="loyaltyCreditBalanceHeading">...</h2>
-                                <img id="loyaltyBarcodeImg" style="width: 90%; max-width: 300px; padding: 1.2em; background: white;" />
+                                <img id="loyaltyBarcodeImg" style="width: 90%; max-width: 300px; padding: 1.2em; background: white; display: none;" />
                             </div>
                             <div class="block">
                                 <div class="button hapticbtn popup-open button-outline" data-popup="#accountUpdatePopup"><i class="fas fa-edit fa-fw"></i>&nbsp;Update account details</div>
@@ -128,7 +128,7 @@
         </div>
     </div>
 
-    <div class="popup text-color-black" id="accountUpdatePopup">
+    <div class="popup" id="accountUpdatePopup">
         <div class="block">
             <h3>Update Account</h3>
         </div>
diff --git a/www/pages/rates.html b/www/pages/rates.html
index f1709f5..ed7ec43 100644
--- a/www/pages/rates.html
+++ b/www/pages/rates.html
@@ -455,7 +455,7 @@
                         </div>
                     </div>
                     <div class="card-content-padding">
-                        <div class="button hapticbtn button-fill" onclick="getRates()"><i class="far fa-calculator"></i> Get Rates</div>
+                        <div class="button hapticbtn button-fill" onclick="getRates()"><i class="far fa-calculator"></i>&nbsp;Get Rates</div>
                     </div>
                 </div>
             </div>
@@ -463,6 +463,6 @@
     </div>
 
     <div class="popup" id="rateResultPopup">
-        
+
     </div>
 </div>
\ No newline at end of file