diff --git a/meshview/templates/base.html b/meshview/templates/base.html
index bd75266..fd03bfa 100644
--- a/meshview/templates/base.html
+++ b/meshview/templates/base.html
@@ -44,8 +44,8 @@
             {% if site_config["site"]["map"] == "True" %}<a href="/map">Map</a>&nbsp;-&nbsp;{% endif %}
             {% if site_config["site"]["stats"] == "True" %}<a href="/stats">Stats</a>&nbsp;-&nbsp;{% endif %}
             {% if site_config["site"]["top"] == "True" %}<a href="/top">Top Traffic</a>{% endif %}
-        </div><br>
-
+        </div>
+        {% include "search_form.html" %}
         {% block body %}
         {% endblock %}
     <br><div style="text-align:center">Visit <strong><a href="https://github.com/pablorevilla-meshtastic/meshview">Meshview</a></strong> on Github.</div><br>
diff --git a/meshview/templates/firehose.html b/meshview/templates/firehose.html
index b5f71a0..58490cb 100644
--- a/meshview/templates/firehose.html
+++ b/meshview/templates/firehose.html
@@ -25,7 +25,6 @@
 {% endblock %}
 
 {% block body %}
-
 <div class="container">
     <form class="d-flex align-items-center justify-content-between mb-2">
         {% set options = {
diff --git a/meshview/templates/net.html b/meshview/templates/net.html
index 5ed7498..4c5eeb7 100644
--- a/meshview/templates/net.html
+++ b/meshview/templates/net.html
@@ -17,8 +17,6 @@
 }
 
 {% endblock %}
-
-
 {% block body %}
 
     <div class="container" > {{ site_config["site"]["weekly_net_message"] }} <br><br>
diff --git a/meshview/templates/node.html b/meshview/templates/node.html
index 3c934b5..463d930 100644
--- a/meshview/templates/node.html
+++ b/meshview/templates/node.html
@@ -32,9 +32,6 @@
 {% endblock %}
 
 {% block body %}
-
-{% include "search_form.html" %}
-
 <div id="node" class="container text-center">
     <div class="container">
         <div class="row">
diff --git a/meshview/templates/search_form.html b/meshview/templates/search_form.html
index dc1d070..94cc99c 100644
--- a/meshview/templates/search_form.html
+++ b/meshview/templates/search_form.html
@@ -39,7 +39,6 @@
             >{{ name }}</option>
             {% endfor %}
         </select>
-        <input type="submit" class="col-2 m-2"/>
-        <input type="reset" class="col-2 m-2"/>
+        <input type="submit" value="Go to Node" class="col-2 m-2" />
     </div>
 </form>
diff --git a/meshview/templates/stats.html b/meshview/templates/stats.html
index 5ec57d5..feb25b9 100644
--- a/meshview/templates/stats.html
+++ b/meshview/templates/stats.html
@@ -52,7 +52,6 @@
 {% endblock %}
 
 {% block body %}
-
 <div class="main-container">
     <h2 class="main-header">Mesh Statistics</h2>