diff --git a/templates/alerts.html b/templates/alerts.html
index 6aac4f3..b6d2202 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -2,14 +2,14 @@
 {% block content %}
 
 <div class="mt-3">
-    <div id="settingsButtonRow" class="row">
+    <div id="settingsButtonRow" class="row mb-3">
         <div class="col-auto me-auto pt-3">
             {% module Template("widgets/refresh-timer.html", web_ui_options=web_ui_options) %}
         </div>
         <div class="col-auto">
-            <p class="d-inline-flex gap-1">
+            <div class="d-inline-flex gap-1">
                 {% module Template("widgets/filters-display-buttons.html", web_ui_options=web_ui_options) %}
-            </p>
+            </div>
         </div>
     </div>
 
diff --git a/templates/bands.html b/templates/bands.html
index 6d8dd1d..3e02b88 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -2,14 +2,14 @@
 {% block content %}
 
 <div class="mt-3">
-    <div id="settingsButtonRow" class="row">
+    <div id="settingsButtonRow" class="row mb-3">
         <div class="col-auto me-auto pt-3">
             {% module Template("widgets/refresh-timer.html", web_ui_options=web_ui_options) %}
         </div>
         <div class="col-auto">
-            <p class="d-inline-flex gap-1">
+            <div class="d-inline-flex gap-1">
                 {% module Template("widgets/filters-display-buttons.html", web_ui_options=web_ui_options) %}
-            </p>
+            </div>
         </div>
     </div>
 
diff --git a/templates/map.html b/templates/map.html
index eebe69a..51d8531 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -3,12 +3,12 @@
 
 <div id="map">
     <div id="settingsButtonRowMap" class="mt-3 px-3" style="z-index: 1002; position: relative;">
-        <div class="row">
+        <div class="row mb-3">
             <div class="col-auto me-auto pt-3"></div>
             <div class="col-auto">
-                <p class="d-inline-flex gap-1">
+                <div class="d-inline-flex gap-1">
                     {% module Template("widgets/filters-display-buttons.html", web_ui_options=web_ui_options) %}
-                </p>
+                </div>
             </div>
         </div>
 
diff --git a/templates/spots.html b/templates/spots.html
index 8d0ec65..d8152ca 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -9,18 +9,18 @@
 </div>
 
 <div class="mt-3">
-    <div id="settingsButtonRow" class="row">
+    <div id="settingsButtonRow" class="row mb-3">
         <div class="col-4">
-            <p class="d-inline-flex gap-1">
+            <div class="d-inline-flex gap-2">
                 {% module Template("widgets/run-pause.html", web_ui_options=web_ui_options) %}
-                {% raw web_ui_options["support-button-html"] %}
-            </p>
+                <div class="d-inline-flex">{% raw web_ui_options["support-button-html"] %}</div>
+            </div>
         </div>
         <div class="col-8 text-end">
-            <p class="d-inline-flex gap-1">
+            <div class="d-inline-flex gap-2">
                 {% module Template("widgets/search.html", web_ui_options=web_ui_options) %}
                 {% module Template("widgets/filters-display-buttons.html", web_ui_options=web_ui_options) %}
-            </p>
+            </div>
         </div>
     </div>
 
diff --git a/templates/widgets/filters-display-buttons.html b/templates/widgets/filters-display-buttons.html
index 6447657..f960569 100644
--- a/templates/widgets/filters-display-buttons.html
+++ b/templates/widgets/filters-display-buttons.html
@@ -1,2 +1,4 @@
-<button id="filters-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleFiltersPanel();"><i class="fa-solid fa-filter"></i>&nbsp;Filters</button>
-<button id="display-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleDisplayPanel();"><i class="fa-solid fa-desktop"></i>&nbsp;Display</button>
\ No newline at end of file
+<div class="d-inline-flex gap-1">
+    <button id="filters-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleFiltersPanel();"><i class="fa-solid fa-filter"></i>&nbsp;Filters</button>
+    <button id="display-button" type="button" class="btn btn-outline-primary" data-bs-toggle="button" onclick="toggleDisplayPanel();"><i class="fa-solid fa-desktop"></i>&nbsp;Display</button>
+</div>
\ No newline at end of file
diff --git a/templates/widgets/refresh-timer.html b/templates/widgets/refresh-timer.html
index d7b9525..c6d2cdd 100644
--- a/templates/widgets/refresh-timer.html
+++ b/templates/widgets/refresh-timer.html
@@ -1 +1 @@
-<p id="timing-container">Loading...</p>
\ No newline at end of file
+<div id="timing-container">Loading...</div>
\ No newline at end of file