diff --git a/templates/menu.html b/templates/menu.html
index 724f8b409..639b7eb4e 100644
--- a/templates/menu.html
+++ b/templates/menu.html
@@ -46,12 +46,24 @@
 {% if year %}
     <ul><li><a href="/years/{{current_year}}">{{ year }}</a></li></ul>
 {% endif %}
-<!--<li><a href="/guidebook/areas.htm">Areas</a></li>-->
+{% if settings.DEVSERVER %}
+<li><a href="https://expo.survex.com/kanboard/">Kanboard</a></li>
+{% else %}
+<li><a href="/kanboard/">Kanboard</a></li>
+{% endif %}
 <li><a href="/handbook/troggle/training/trogbegin.html">Troggle</a></li>
 
-<li><form name=P method=get action="/search" target="_top">
+<li><form name=P method=get 
+{% if settings.DEVSERVER %}
+action="https://expo.survex.com/search"
+{% else %}
+action="/search" 
+{% endif %}
+
+target="_top">
     <input id="omega-autofocus" type=search name=P size=8 autofocus>
     <input type=submit value="Search"></form></li>
+	
 {% if editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "editexpopage" path %}" class="editlink"><strong>Edit this page</strong></a></li>{% endif %}
 {% if cave_editable %}<li><a href="{% if local %}https://expo.survex.com{% endif %}{% url "edit_cave" cave.url_parent cave.slug %}" class="editlink"><strong>Edit this cave</strong></a></li>{% endif %}
 <li>  {% if settings.DEVSERVER %}<b style="color:red">RUNNING ON LOCALSERVER</b> <br>slug:{{ cave.slug }}<br>newslug:{{ cave.newslug }}<br>url:{{ cave.url }}{% endif %}