diff --git a/app.py b/app.py
index 6bdf9f8..3edfb3c 100755
--- a/app.py
+++ b/app.py
@@ -119,9 +119,9 @@ def set_url_args(**new_args):
 def init_profile():
     g.profiling = []
 
-@app.route("/")
-def index():
-    return render_template('index.html',
+@app.route("/browse")
+def browse_index():
+    return render_template('browse_index.html',
                            props=find_more_props,
                            username=get_username())
 
@@ -163,7 +163,11 @@ def property_query_page(property_id):
                            pid=pid,
                            rows=rows)
 
-@app.route('/random')
+@app.route('/')
+def start():
+    return random_painting()
+
+@app.route('/next')
 def random_painting():
     rows = wdqs.run_query_with_cache(painting_no_depicts_query)
     row = random.choice(rows)
diff --git a/templates/index.html b/templates/browse_index.html
similarity index 95%
rename from templates/index.html
rename to templates/browse_index.html
index ad55ff8..b30996d 100644
--- a/templates/index.html
+++ b/templates/browse_index.html
@@ -11,7 +11,9 @@
   {% endif %}
   </p>
 
+  {% if username %}
   <p>username: {{ username }}</p>
+  {% endif %}
 
   {% if not username %}
     <p>This tool must be connected with Wikidata to work.</p>
diff --git a/templates/item.html b/templates/item.html
index 1cc24bc..37d9cec 100644
--- a/templates/item.html
+++ b/templates/item.html
@@ -17,7 +17,9 @@
   <p>
   <a href="https://www.wikidata.org/wiki/{{ qid }}">view this painting on Wikidata</a>
   |
-  <a href="{{ url_for('random_painting') }}">open a random painting</a>
+  <a href="{{ url_for('random_painting') }}">switch to another painting</a>
+  |
+  <a href="{{ url_for('browse_index') }}">browse paintings</a>
   </p>
 
 
diff --git a/templates/property.html b/templates/property.html
index b3df277..d984c93 100644
--- a/templates/property.html
+++ b/templates/property.html
@@ -6,7 +6,7 @@
 <div class="m-3">
   <h1>{{ self.title() }}</h1>
 
-  <p><a href="{{ url_for('index') }}">back to index</a></p>
+  <p><a href="{{ url_for('browse_index') }}">back to index</a></p>
 
   <p>Sort order:
   {% if order == 'name' %}