diff --git a/templates/about.html b/templates/about.html
index a95187b..1e4a318 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -63,10 +63,10 @@
     <p>This software is dedicated to the memory of Tom G1PJB, SK, a friend and colleague who sadly passed away around the time I started writing it in Autumn 2025. I was looking forward to showing it to you when it was done.</p>
 </div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-about").addClass("active"); }); <!-- highlight active page in nav --></script>
 
diff --git a/templates/add_spot.html b/templates/add_spot.html
index ba4a4e1..0298cfe 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -69,10 +69,10 @@
 
 </div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/add-spot.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-add-spot").addClass("active"); }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index dc8cbac..a3cc9a4 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -168,10 +168,10 @@
 
 </div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/alerts.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-alerts").addClass("active"); }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index d66d2d3..3c94502 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -134,10 +134,10 @@
 
 </div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/spotsbandsandmap.js?v=5"></script>
 <script src="/js/bands.js?v=5"></script>
diff --git a/templates/map.html b/templates/map.html
index 974b76e..50055aa 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -152,10 +152,10 @@
 <script src="https://cdn.jsdelivr.net/npm/leaflet.geodesic"></script>
 <script src="https://cdn.jsdelivr.net/npm/@joergdietrich/leaflet.terminator@1.1.0/L.Terminator.min.js"></script>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/spotsbandsandmap.js?v=5"></script>
 <script src="/js/map.js?v=5"></script>
diff --git a/templates/spots.html b/templates/spots.html
index c6cfd37..15a6b6e 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -223,10 +223,10 @@
 
 </div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/spotsbandsandmap.js?v=5"></script>
 <script src="/js/spots.js?v=5"></script>
diff --git a/templates/status.html b/templates/status.html
index 56d5b5f..1f36f41 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -3,10 +3,10 @@
 
 <div id="status-container" class="row row-cols-1 row-cols-md-4 g-4 mt-4"></div>
 
-<script src="/js/ham-utils/utils.js?v=5"></script>
-<script src="/js/ham-utils/storage.js?v=5"></script>
-<script src="/js/ham-utils/ui.js?v=5"></script>
-<script src="/js/ham-utils/geo.js?v=5"></script>
+<script src="/js/tools/utils.js?v=5"></script>
+<script src="/js/tools/storage.js?v=5"></script>
+<script src="/js/tools/ui-ham.js?v=5"></script>
+<script src="/js/tools/geo.js?v=5"></script>
 <script src="/js/common.js?v=5"></script>
 <script src="/js/status.js?v=5"></script>
 <script>$(document).ready(function() { $("#nav-link-status").addClass("active"); }); <!-- highlight active page in nav --></script>
diff --git a/webassets/css/style.css b/webassets/css/style.css
index 334fa0a..9fd8dcc 100644
--- a/webassets/css/style.css
+++ b/webassets/css/style.css
@@ -224,6 +224,10 @@ div#map {
   filter: invert(100%) hue-rotate(180deg) brightness(95%) contrast(90%);
 }
 
+/* Make buttons overlaid on the map have a non-transparent fill so you can see the text better */
+.btn-outline-primary {
+    --bs-btn-bg: var(--bs-body-bg) !important;
+}
 
 
 /* BANDS PANEL */
diff --git a/webassets/js/ham-utils/geo.js b/webassets/js/tools/geo.js
similarity index 97%
rename from webassets/js/ham-utils/geo.js
rename to webassets/js/tools/geo.js
index 5c07794..01979ea 100644
--- a/webassets/js/ham-utils/geo.js
+++ b/webassets/js/tools/geo.js
@@ -1,3 +1,8 @@
+//
+// GEOGRAPHIC UTILITY FUNCTIONS
+// Great Circle calculation, Maidenhead grid calcs, etc.
+//
+
 // Calculate great circle bearing between two lat/lon points.
 function calcBearing(lat1, lon1, lat2, lon2) {
     lat1 *= Math.PI / 180;
diff --git a/webassets/js/ham-utils/storage.js b/webassets/js/tools/storage.js
similarity index 91%
rename from webassets/js/ham-utils/storage.js
rename to webassets/js/tools/storage.js
index 1f22890..3266f30 100644
--- a/webassets/js/ham-utils/storage.js
+++ b/webassets/js/tools/storage.js
@@ -1,3 +1,8 @@
+//
+// LOCAL STORAGE FUNCTIONS
+// Generic functions for saving the state of HTML inputs to local storage, and restoring them
+//
+
 let useLocalStorage = true;
 
 // Save settings to local storage. Suppressed if "use local storage" is false.
diff --git a/webassets/js/ham-utils/ui.js b/webassets/js/tools/ui-ham.js
similarity index 98%
rename from webassets/js/ham-utils/ui.js
rename to webassets/js/tools/ui-ham.js
index 4a558c0..58794d2 100644
--- a/webassets/js/ham-utils/ui.js
+++ b/webassets/js/tools/ui-ham.js
@@ -1,3 +1,8 @@
+//
+// USER INTERFACE FUNCTIONS (AMATEUR RADIO)
+// Functions providing colour schemes for ham radio bands, SIG icons etc.
+//
+
 const BAND_COLOR_SCHEMES = {
 	"PSK Reporter": {
 		"2200m": "#ff4500",
diff --git a/webassets/js/ham-utils/utils.js b/webassets/js/tools/utils.js
similarity index 89%
rename from webassets/js/ham-utils/utils.js
rename to webassets/js/tools/utils.js
index 92f3519..e42baf5 100644
--- a/webassets/js/ham-utils/utils.js
+++ b/webassets/js/tools/utils.js
@@ -1,3 +1,8 @@
+//
+// GENERAL UTILITY FUNCTIONS
+// String manipulation etc.
+//
+
 // Utility function to escape HTML characters from a string.
 function escapeHtml(str) {
     if (typeof str !== 'string') {