diff --git a/main.py b/main.py
index b099df6..35fe72b 100755
--- a/main.py
+++ b/main.py
@@ -182,6 +182,8 @@ def search_people() -> str:
 
 @app.route("/merge", methods=["GET", "POST"])
 def merge() -> str | Response:
+    assert app.config["ADMIN_MODE"]
+
     if flask.request.method == "POST":
         search_for = flask.request.form["q"]
 
@@ -407,6 +409,8 @@ def search_everything() -> str:
 
 @app.route("/person/<int:person_id>/delete", methods=["POST"])
 def delete_person(person_id: int) -> str | Response:
+    assert app.config["ADMIN_MODE"]
+
     item = model.Person.query.get(person_id)
 
     for cp in item.conferences_association:
diff --git a/templates/navbar.html b/templates/navbar.html
index c858ae0..eca8885 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,7 +1,9 @@
 <p>
   <form action="{{ url_for("search_people") }}">
-  <a href="{{ url_for("index") }}">home</a>
+  <a href="{{ url_for("index") }}">conferences</a>
+  {#
   | <a href="{{ url_for("events_page") }}">events</a>
+  #}
   | <a href="{{ url_for("top_speakers_page") }}">speakers</a>
 
       <input type="text" class="form-control" placeholder="speaker name" name="q" id="q">
diff --git a/templates/person.html b/templates/person.html
index 191eaad..d37ddde 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -21,8 +21,8 @@
 
 
   {% block content %}
-  <div class="container">
-    <div class="row">
+  <div>
+    <div>
 
   {% set photo = item.photo_filename() %}
   {% if photo %}
@@ -45,7 +45,7 @@
   {% endif %}
   </p>
 
-
+  {% if config.ADMIN_MODE %}
   {% set search_for = item.name + ' ' + " haswbstatement:P31=Q5" %}
   <p><a href="https://www.wikidata.org/w/index.php?search={{ search_for | urlencode }}&title=Special%3ASearch&ns0=1&ns120=1">Search for {{ item.name }} on Wikidata</a></p>
 
@@ -80,6 +80,7 @@
   <p>No similar names found on Wikidata</p>
   {% endif %}
   {% endif %}
+  {% endif %}
 
   {% set bio_source = item.bio_source() %}
   {% if bio_source %}
diff --git a/templates/search_people.html b/templates/search_people.html
index bb1572b..aabe7fe 100644
--- a/templates/search_people.html
+++ b/templates/search_people.html
@@ -17,9 +17,12 @@
     </form>
 
     <p>
-    Found {{ q.count() }} people matching '{{ search_for }}'
+    {% set count = q.count() %}
+    Found {{ count }} people matching '{{ search_for }}'
 
+    {% if config.ADMIN_MODE and count %}
     <a href="{{ url_for("merge", q=search_for) }}">merge</a>
+    {% endif %}
     </p>
 
 <ul>