diff --git a/package.nw/gt_update.odt b/package.nw/gt_update.odt
index 0db049a..b5f7235 100644
Binary files a/package.nw/gt_update.odt and b/package.nw/gt_update.odt differ
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 67cfc98..fda6cd2 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -833,7 +833,8 @@ function toggleOffline()
 
     buttonSpotsBoxDiv.style.display = "inline-block";
     donateButton.style.display = "inline-block";
-    potaButton.style.display = "inline-block";
+
+    potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu) ? "inline-block" : "none";
 
     if (g_appSettings.gtShareEnable == true)
     {
@@ -10427,10 +10428,7 @@ function toggleGtShareEnable()
 
 function setGtShareButtons()
 {
-  if (
-    g_appSettings.gtShareEnable == true &&
-    g_mapSettings.offlineMode == false
-  )
+  if (g_appSettings.gtShareEnable == true && g_mapSettings.offlineMode == false)
   {
     if (g_appSettings.gtMsgEnable == true) { msgButton.style.display = "inline-block"; }
     else msgButton.style.display = "none";
@@ -12429,12 +12427,14 @@ function changeMapValues()
   g_mapSettings.loudness = brightnessValue.value;
 
   g_mapSettings.mapIndex = mapSelect.value;
-  if (
-    g_appSettings.gtFlagImgSrc > 0 &&
-    g_mapSettings.offlineMode == false &&
-    g_appSettings.gtShareEnable == true
-  ) { g_layerVectors.gtflags.setVisible(true); }
-  else g_layerVectors.gtflags.setVisible(false);
+  if (g_appSettings.gtFlagImgSrc > 0 && g_mapSettings.offlineMode == false && g_appSettings.gtShareEnable == true)
+  {
+    g_layerVectors.gtflags.setVisible(true);
+  }
+  else
+  {
+    g_layerVectors.gtflags.setVisible(false);
+  }
 
   saveMapSettings();
 
@@ -13044,6 +13044,7 @@ function startupButtonsAndInputs()
       donateButton.style.display = "none";
       pskReporterBandActivityDiv.style.display = "none";
       buttonSpotsBoxDiv.style.display = "none";
+      potaButton.style.display = "none";
     }
 
     setGtShareButtons();
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index 2589481..a384944 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -85,7 +85,7 @@ function gtConnectChat()
   {
     if (g_appSettings.gtShareEnable == true)
     {
-      var jsmesg = false;
+      let jsmesg = false;
       try
       {
         jsmesg = JSON.parse(evt.data);
diff --git a/package.nw/lib/pota.js b/package.nw/lib/pota.js
index 597f79e..f0bc6bc 100644
--- a/package.nw/lib/pota.js
+++ b/package.nw/lib/pota.js
@@ -65,7 +65,7 @@ function initPota()
 {
   potaEnabled.checked = (g_appSettings.potaEnabled == 1);
   potaMenu.checked = g_appSettings.potaShowMenu;
-  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu) ? "" : "none";
+  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu && g_mapSettings.offlineMode == false) ? "" : "none";
   potaImg.style.filter = g_appSettings.potaMapEnabled ? "" : "grayscale(1)";
 
   g_layerSources.pota.clear();
@@ -80,7 +80,7 @@ function initPota()
 function changePotaEnable()
 {
   g_appSettings.potaEnabled = (potaEnabled.checked == true) ? 1 : 0;
-  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu) ? "" : "none";
+  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu && g_mapSettings.offlineMode == false) ? "" : "none";
   if (!g_appSettings.potaEnabled)
   {
     g_layerSources.pota.clear();
@@ -98,7 +98,7 @@ function changePotaMenu()
 {
   g_appSettings.potaShowMenu = potaMenu.checked;
   
-  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu) ? "" : "none";
+  potaButton.style.display = (g_appSettings.potaEnabled == 1 && g_appSettings.potaShowMenu && g_mapSettings.offlineMode == false) ? "" : "none";
   potaImg.style.filter = g_appSettings.potaMapEnabled ? "" : "grayscale(1)";
   
   saveAppSettings();
diff --git a/package.nw/lib/roster/renderCompactRoster.js b/package.nw/lib/roster/renderCompactRoster.js
index 07f09e7..e3dfe2b 100644
--- a/package.nw/lib/roster/renderCompactRoster.js
+++ b/package.nw/lib/roster/renderCompactRoster.js
@@ -1,3 +1,4 @@
+// Because the County is clickable we do not allow the whole compact div to trigger an initiateQSO
 g_isCompactCounty = false;
 
 function renderCompactRosterHeaders()