diff --git a/swh/web/ui/templates/browse.html b/swh/web/ui/templates/browse.html
index cf7f7e31..dafce151 100644
--- a/swh/web/ui/templates/browse.html
+++ b/swh/web/ui/templates/browse.html
@@ -1,63 +1,56 @@
 {% extends "layout.html" %}
 {% block title %}Browse{% endblock %}
 {% block content %}
 
 <div class="browse-panel panel panel-default">
   <div class="panel panel-body">
-
+    
     <ul class="nav nav-tabs" role="tablist">
       <li><a class="nav-link active" data-toggle="tab" href="#tab-content" role="tabpanel">Content</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-revision" role="tabpanel">Revision</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-origin" role="tabpanel">Origin</a></li>
       <li><a class="nav-link" data-toggle="tab" href="#tab-directory" role="tabpanel">Directory</a></li>
     </ul>
-
+    
     <div class="tab-content container-fluid">
       <!-- Content pane -->
       <div class="tab-pane active" id="tab-content" role="tabpanel">
-	<div class="row simple-desc container-fluid">
-	  You can refer to a content (i.e. a file that we have in our database) as its SHA1 or SHA256
-	  checksum. If you have files to input, you can drag and drop them below to have their hashes
-	  calculated and searched in SWH. Files with the same checksum will automatically be ignored.
-	</div>
-	<div class="row container-fluid">
-	  {% include 'includes/search-form.html' %}
-	</div>
+        <div class="row simple-desc container-fluid">
+          You can refer to a content (i.e. a file that we have in our database) as its SHA1 or SHA256
+          checksum. If you have files to input, you can drag and drop them below to have their hashes
+          calculated and searched in SWH. Files with the same checksum will automatically be ignored.
+        </div>
+        <div class="row container-fluid">
+          {% include 'includes/search-form.html' %}
+        </div>
       </div>
       
       <!-- Revision pane -->
       <div class="tab-pane" id="tab-revision" role="tabpanel">
-	{% include 'includes/home-revision.html' %}
+        {% include 'includes/home-revision.html' %}
       </div>
       
       <!-- Origin pane -->
       <div class="tab-pane" id="tab-origin" role="tabpanel">
-	{% include 'includes/home-origin.html' %}
+        {% include 'includes/home-origin.html' %}
       </div>
-
+      
       <!-- Directory pane -->
       <div class="tab-pane" id="tab-directory" role="tabpanel">
-	{% include 'includes/home-directory.html' %}
+        {% include 'includes/home-directory.html' %}
       </div>
     </div>
-
+    
   </div>
 </div>
 
 <script>
-  // Hash update on page load
-  var hash = window.location.hash;
+    // Hash update on page load
+    var hash = window.location.hash;
   hash && $('ul.nav a[href="' + hash + '"]').tab('show');
-  // Hash update on navbar click
-  $('.navbar a').click(function (e) {
-  var scrollmem = $('body').scrollTop();
-  window.location.hash = this.hash;
-  $('html,body').scrollTop(scrollmem);
-  $('ul.nav a[href="' + this.hash + '"]').tab('show');
-  });
   // Hash update on nav-tab click
   $('.nav-tabs a').click(function(e) {
-  window.location.hash = this.hash;
+      window.location.hash = this.hash;
   })
 </script>
 {% endblock %}
diff --git a/swh/web/ui/templates/home.html b/swh/web/ui/templates/home.html
index 564deee8..2f95f470 100644
--- a/swh/web/ui/templates/home.html
+++ b/swh/web/ui/templates/home.html
@@ -1,12 +1,12 @@
 {% extends "layout.html" %}
 {% block title %}Home{% endblock %}
 {% block content %}
 
 <ul>
-  <li><a href="/about">About</a></li>
+  <li><a href="{{ url_for('about') }}">About</a></li>
   <li><a href="https://www.softwareheritage.org">Main site</a></li>
-  <li><a href="/browse/">Browse</a></li>
-  <li><a href="/api/">API</a></li>
+  <li><a href="{{ url_for('browse') }}">Browse</a></li>
+  <li><a href="{{ url_for('browse_api_doc') }}">API</a></li>
 </ul>
 
 {% endblock %}
diff --git a/swh/web/ui/templates/includes/home-directory.html b/swh/web/ui/templates/includes/home-directory.html
index 4183b1cb..db41f713 100644
--- a/swh/web/ui/templates/includes/home-directory.html
+++ b/swh/web/ui/templates/includes/home-directory.html
@@ -1,111 +1,111 @@
 <div class="simple-search">
   <div class="row simple-desc container-fluid">
     Search a directory according to its SHA1 checksum
   </div>
   <form method="get" action="{{ url_for('search_directory') }}">
     <div class="row">
       <div class="col-md-6 required">
-	<label for="dir-sha1">Directory ID</label>
-	<div class="input-group">
-	  <input id="dir-sha1" class="form-control"
-		 type="text" placeholder="directory git SHA1"
-		 name="sha1_git" required="true"/>
-	  <span class="input-group-btn">
-	    <button class="btn btn-primary" type="submit">
-	      <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	    </button>
-	  </span>
-	  <a class="input-group-addon" data-toggle="collapse" href="#dir-dir-collapse">Options</a>
-	</div>
+        <label for="dir-sha1">Directory ID</label>
+        <div class="input-group">
+          <input id="dir-sha1" class="form-control"
+                 type="text" placeholder="directory git SHA1"
+                 name="sha1_git" required="true"/>
+          <span class="input-group-btn">
+            <button class="btn btn-primary" type="submit">
+              <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+            </button>
+          </span>
+          <a class="input-group-addon" data-toggle="collapse" href="#dir-dir-collapse">Options</a>
+        </div>
       </div>
       <div class="col-md-6">
-	<div id="dir-dir-collapse" class="collapse">
-	  <label for="dir-path-1">Path within directory</label>
-	  <input id="dir-path-1" class="optional form-control"
-		 type="text" placeholder="path" name="path/">
-	</div>
+        <div id="dir-dir-collapse" class="collapse">
+          <label for="dir-path-1">Path within directory</label>
+          <input id="dir-path-1" class="optional form-control"
+                 type="text" placeholder="path" name="path/">
+        </div>
       </div>
     </div>
   </form>
 </div>
 <hr/>
 <div class="text-center">
   <a data-toggle="collapse" href="#dir-advanced-search">Advanced search</a>
 </div>
 <div id="dir-advanced-search" data-toggle="collapse" class="collapse advanced-search">
   <div class="row advanced-desc container-fluid">
     You can also refer to a directory either:
     <ul>
       <li>
-	as a request for the content of a revision identified in absolute
-	terms by its git SHA1.
+        as a request for the content of a revision identified in absolute
+        terms by its git SHA1.
       </li>
       <li>
-	as a request for the content of a revision matching a
-	given time and place, with place the origin of the directory (and optionally its
-	branch name), and time a timestamp of when we collected it (or as close to the
-	timestamp as we can provide).
+        as a request for the content of a revision matching a
+        given time and place, with place the origin of the directory (and optionally its
+        branch name), and time a timestamp of when we collected it (or as close to the
+        timestamp as we can provide).
       </li>
     </ul>
     In all cases, you may also specify a path within the top-level directory to which you
     would like the results to be constrained.
   </div>
   <div>
     <form method="get" action="{{ url_for('search_directory') }}">
       <div class="forms-group row">
-	<div class="col-md-6 required">
-	  <label for="dir-rev-sha1">Revision ID</label>
-	  <div class="input-group">
-	    <input id="dir-rev-sha1" class="form-control"
-		   type="text" placeholder="revision git SHA1"
-		   name="sha1_git" required="true"/>
-	    <span class="input-group-btn">
-	      <button class="btn btn-primary" type="submit">
-		<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	      </button>
-	    </span>
-	    <a class="input-group-addon" data-toggle="collapse" href="#dir-rev-collapse">Options</a>
-	  </div>
-	</div>
-	<div class="col-md-6">
-	  <div id="dir-rev-collapse" class="collapse">
-	    <label for="dir-path-2">Path within directory</label>
-	    <input id="dir-path-2" class="optional form-control"
-		   type="text" placeholder="path" name="dir_path"/>
-	  </div>
-	</div>
+        <div class="col-md-6 required">
+          <label for="dir-rev-sha1">Revision ID</label>
+          <div class="input-group">
+            <input id="dir-rev-sha1" class="form-control"
+                   type="text" placeholder="revision git SHA1"
+                   name="sha1_git" required="true"/>
+            <span class="input-group-btn">
+              <button class="btn btn-primary" type="submit">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              </button>
+            </span>
+            <a class="input-group-addon" data-toggle="collapse" href="#dir-rev-collapse">Options</a>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div id="dir-rev-collapse" class="collapse">
+            <label for="dir-path-2">Path within directory</label>
+            <input id="dir-path-2" class="optional form-control"
+                   type="text" placeholder="path" name="dir_path"/>
+          </div>
+        </div>
       </div>
     </form>
     <form method="get" action="{{ url_for('search_directory') }}">
       <div class="form-groups row">
-	<div class="col-md-6">
-	  <label for="dir-origin-id">Origin ID</label>
-	  <div class="input-group">
-	    <input id="dir-origin-id" class="form-control"
-		   type="text" placeholder="origin id"
-		   name="origin_id" required="true"/>
-	    <span class="input-group-btn">
-	      <button class="btn btn-primary" type="submit">
-		<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	      </button>
-	    </span>
-	    <a class="input-group-addon" data-toggle="collapse" href="#dir-origin-collapse">Options</a>
-	  </div>
-	</div>
-	<div class="col-md-6">
-	  <div id="dir-origin-collapse" class="collapse">
-	    <label for="dir-branchname">Branch name</label>
-	    <input id="dir-branchname" class="optional form-control"
-		   type="text" placeholder="refs/heads/master" name="branch_name"/>
-	    <label for="dir-timestamp">Timestamp</label>
-	    <input id="dir-timestamp" class="optional form-control"
-		   type="text" placeholder="timestamp" name="ts"/>
-	    <label for="dir-path-3">Path within the directory</label>
-	    <input id="dir-path-3" class="optional form-control"
-		   type="text" placeholder="path" name="path"/>
-	  </div>
-	</div>
+        <div class="col-md-6">
+          <label for="dir-origin-id">Origin ID</label>
+          <div class="input-group">
+            <input id="dir-origin-id" class="form-control"
+                   type="text" placeholder="origin id"
+                   name="origin_id" required="true"/>
+            <span class="input-group-btn">
+              <button class="btn btn-primary" type="submit">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              </button>
+            </span>
+            <a class="input-group-addon" data-toggle="collapse" href="#dir-origin-collapse">Options</a>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div id="dir-origin-collapse" class="collapse">
+            <label for="dir-branchname">Branch name</label>
+            <input id="dir-branchname" class="optional form-control"
+                   type="text" placeholder="refs/heads/master" name="branch_name"/>
+            <label for="dir-timestamp">Timestamp</label>
+            <input id="dir-timestamp" class="optional form-control"
+                   type="text" placeholder="timestamp" name="ts"/>
+            <label for="dir-path-3">Path within the directory</label>
+            <input id="dir-path-3" class="optional form-control"
+                   type="text" placeholder="path" name="path"/>
+          </div>
+        </div>
       </div>
     </form>
   </div>
 </div>
diff --git a/swh/web/ui/templates/includes/home-origin.html b/swh/web/ui/templates/includes/home-origin.html
index 8ca5db0a..7ff8a104 100644
--- a/swh/web/ui/templates/includes/home-origin.html
+++ b/swh/web/ui/templates/includes/home-origin.html
@@ -1,57 +1,57 @@
 <div class="simple-search">
   <div class="row simple-desc container-fluid">
     Search an origin according to its SWH ID
   </div>
   <form method="get" action="{{ url_for('search_directory') }}">
     <div class="row">
       <div class="col-md-12">
-	<label>Origin ID</label>
-	<div class="input-group">
-	  <input class="form-control" type="text" placeholder="directory git SHA1" name="sha1_git" required="true"/>
-	  <span class="input-group-btn">
-	    <button class="btn btn-primary" type="submit">
-	      <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	    </button>
-	  </span>
-	</div>
+        <label>Origin ID</label>
+        <div class="input-group">
+          <input class="form-control" type="text" placeholder="directory git SHA1" name="sha1_git" required="true"/>
+          <span class="input-group-btn">
+            <button class="btn btn-primary" type="submit">
+              <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+            </button>
+          </span>
+        </div>
       </div>
     </div>
   </form>
 </div>
 <hr/>
 <div class="text-center">
   <a data-toggle="collapse" href="#origin-advanced-search">Advanced search</a>
 </div>
 <div id="origin-advanced-search" data-toggle="collapse" class="collapse advanced-search">
   <div class="row advanced-desc container-fluid">
     You can also refer to a directory in a relative manner, as the combination of the type of origin (git, debian, tarball...)
     and the URL at which the origin is located.
   </div>
   <div>
     <form method="get" action="{{ url_for('search_origin') }}">
       <div class="forms-group row">
-	<div class="col-md-12">
-	  <div class="input-group multi-input-group">
-	    <label for="origin-type">Origin type</label>
-	    <input id="origin-type"
-		   class="form-control"
-		   type="text" placeholder="origin type"
-		   name="origin_type" required="true"/>
-	    <div class="input-group-field">
-	      <label for="origin-url">Origin URL</label>
-	      <input id="origin-url"
-		     class="form-control"
-		     type="text" placeholder="origin url"
-		     name="origin_url" required="true"/>
-	    </div>
-	    <span class="input-group-btn">
-	      <button id="origin-dummy-btn" class="btn btn-primary" type="submit">
-		<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	      </button>
-	    </span>
-	  </div>
-	</div>
+        <div class="col-md-12">
+          <div class="input-group multi-input-group">
+            <label for="origin-type">Origin type</label>
+            <input id="origin-type"
+                   class="form-control"
+                   type="text" placeholder="origin type"
+                   name="origin_type" required="true"/>
+            <div class="input-group-field">
+              <label for="origin-url">Origin URL</label>
+              <input id="origin-url"
+                     class="form-control"
+                     type="text" placeholder="origin url"
+                     name="origin_url" required="true"/>
+            </div>
+            <span class="input-group-btn">
+              <button id="origin-dummy-btn" class="btn btn-primary" type="submit">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              </button>
+            </span>
+          </div>
+        </div>
       </div>
     </form>
   </div>
 </div>
diff --git a/swh/web/ui/templates/includes/home-revision.html b/swh/web/ui/templates/includes/home-revision.html
index 043b1077..d5f09cb3 100644
--- a/swh/web/ui/templates/includes/home-revision.html
+++ b/swh/web/ui/templates/includes/home-revision.html
@@ -1,66 +1,66 @@
 <div class="simple-search">
   <div class="row simple-desc container-fluid">
     Search a revision according to its SHA1 identifier
   </div>
   <form method="get" action="{{ url_for('search_revision') }}">
     <div class="row">
       <div class="col-md-12">
-	<label for="rev-sha1">Revision SHA1</label>
-	<div class="input-group">
-	  <input id="rev-sha1" class="form-control"
-		 type="text" placeholder="git SHA1"
-		 name="sha1_git" required="true"/>
-	  <span class="input-group-btn">
-	    <button class="btn btn-primary" type="submit">
-	      <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	    </button>
-	  </span>
-	</div>
+        <label for="rev-sha1">Revision SHA1</label>
+        <div class="input-group">
+          <input id="rev-sha1" class="form-control"
+                 type="text" placeholder="git SHA1"
+                 name="sha1_git" required="true"/>
+          <span class="input-group-btn">
+            <button class="btn btn-primary" type="submit">
+              <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+            </button>
+          </span>
+        </div>
       </div>
     </div>
   </form>
 </div>
 <hr/> 
 <div class="text-center">
   <a data-toggle="collapse" href="#rev-advanced-search">Advanced search</a>
 </div>
 <div id="rev-advanced-search" data-toggle="collapse" class="collapse advanced-search">
   <div class="row advanced-desc container-fluid">
     You can also refer to a revision as an SWH time and place, time being a timestamp of when we
     collected it (or as close to the timestamp as we can provide), place being an origin, and
     optionally a branch name within the origin. See the origin section to search for origins in
     SWH and find out their identifier.
   </div>
   <div>
     <form method="get" action="{{ url_for('search_revision') }}">
       <div class="forms-group row">
-	<div class="col-md-6 required">
-	  <label>Revision Origin ID</label>
-	  <div class="input-group">
-	    <input class="form-control" type="text" placeholder="revision git SHA1" name="sha1_git" required="true"/>
-	    <span class="input-group-btn">
-	      <button class="btn btn-primary" type="submit">
-		<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
-	      </button>
-	    </span>
-	    <a class="input-group-addon" data-toggle="collapse" href="#rev-tandp-collapse">Options</a>
-	  </div>
-	</div>
-	<div class="col-md-6">
-	  <div id="rev-tandp-collapse" class="collapse">
-	    <label for="rev-branchname">Branch name</label>
-	    <input id="rev-branchname"
-		   class="optional form-control"
-		   type="text" placeholder="refs/heads/master"
-		   name="branch_name"/>
-	    <label for="rev-timestamp">Timestamp</label>
-	    <input id="rev-timestamp"
-		   class="optional form-control"
-		   type="text" placeholder="timestamp"
-		   name="ts"/>
-	  </div>
-	</div>
+        <div class="col-md-6 required">
+          <label>Revision Origin ID</label>
+          <div class="input-group">
+            <input class="form-control" type="text" placeholder="revision git SHA1" name="sha1_git" required="true"/>
+            <span class="input-group-btn">
+              <button class="btn btn-primary" type="submit">
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+              </button>
+            </span>
+            <a class="input-group-addon" data-toggle="collapse" href="#rev-tandp-collapse">Options</a>
+          </div>
+        </div>
+        <div class="col-md-6">
+          <div id="rev-tandp-collapse" class="collapse">
+            <label for="rev-branchname">Branch name</label>
+            <input id="rev-branchname"
+                   class="optional form-control"
+                   type="text" placeholder="refs/heads/master"
+                   name="branch_name"/>
+            <label for="rev-timestamp">Timestamp</label>
+            <input id="rev-timestamp"
+                   class="optional form-control"
+                   type="text" placeholder="timestamp"
+                   name="ts"/>
+          </div>
+        </div>
       </div>
     </form>
   </div>
 </div>
diff --git a/swh/web/ui/templates/includes/search-form.html b/swh/web/ui/templates/includes/search-form.html
index 51e0d7bf..de1c45b2 100644
--- a/swh/web/ui/templates/includes/search-form.html
+++ b/swh/web/ui/templates/includes/search-form.html
@@ -1,70 +1,70 @@
 <!-- The text-based SHA1 or SHA256 search -->
 <label for="text-hash-form">Search with SHA-1 or SHA-256:</label>
 <form id="text-hash-form"
       action="{{ url_for('search_content') }}"
       class="form"
       method="get">
   <br/>
   <div class="input-group">
     <input id="text-hash-input"
-	   type="text" class="form-control"
-	   name="q"
-	   placeholder="SHA-1 or SHA-256 checksum" />
+           type="text" class="form-control"
+           name="q"
+           placeholder="SHA-1 or SHA-256 checksum" />
     <span class="input-group-btn">
       <button id="text-hash-submit"
-	      class="btn btn-primary"
-	      type="submit">
-	Text search
+              class="btn btn-primary"
+              type="submit">
+        Text search
       </button>
     </span>
   </div>
 </form>
 
 <!-- The file-based drag&drop UI-->
 <label for="file-hash-form">Search with files</label>
 <form id="file-hash-form"
       action="{{ url_for('search_content') }}"
       class="text-center form"
       method="post"
       enctype="multipart/form-data">
   
   <!--Form input -->
   <input type="file"
-	 id="file-hash-input"
-	 class="form-control"
-	 multiple
-	 name="filename"
-	 value=""
-	 style="display:none"
-	 placeholder="File(s) to hash and search" />
+         id="file-hash-input"
+         class="form-control"
+         multiple
+         name="filename"
+         value=""
+         style="display:none"
+         placeholder="File(s) to hash and search" />
   <div id="file-drop" class="text-center" style="border: 1px dashed black">
     Drag and drop or click here to hash files and search for them.
     Your files will NOT be uploaded, hashing is done locally.
     Filesizes over 20Mb may be slow to process, use with care.
     <div id="filelist" class="row"></div>
   </div>
   
   <!-- Form buttons -->
   <div class="btn-group" style="margin-top: 10px">
     <button id="file-hash-submission" type="submit" class="btn btn-primary">
       <span class="glyphicon glyphicon-search" type="submit" aria-hidden="true"></span>
       Search
     </button>
     <button id="file-hash-clear" class="btn btn-primary">
       Clear
       <span class="glyphicon glyphicon-erase" aria-hidden="true"></span>
     </button>
   </div>
 </form>
 
 <!-- Required JS -->
-{% for fname in ['lib/core.js', 'lib/lib-typedarrays.js', 'lib/sha256.js', 'js/search.js'] %}
+{% for fname in ['lib/core.js', 'lib/lib-typedarrays.js', 'lib/sha1.js', 'lib/sha256.js', 'js/search.js'] %}
 <script language="javascript" type="text/javascript" src="{{ url_for('static', filename=fname) }}"></script>
 {% endfor %}
 
 <!-- Script setup -->
 <script>
-  var sfc = new SearchFormController($('#text-hash-form'), $('#file-hash-form'), $('#search-message'));
+    var sfc = new SearchFormController($('#text-hash-form'), $('#file-hash-form'), $('#search-message'));
   sfc.setupTextForm($('#text-hash-input'));
   sfc.setupFileForm($('#file-drop'),$('#filelist'),$('#file-hash-input'),$('#file-hash-clear'));
 </script>
diff --git a/swh/web/ui/templates/layout.html b/swh/web/ui/templates/layout.html
index 5abcdecd..20973938 100644
--- a/swh/web/ui/templates/layout.html
+++ b/swh/web/ui/templates/layout.html
@@ -1,57 +1,57 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{% block title %}{% endblock %} - The Software Heritage Archive</title>
     <!-- BEGIN: bootstrap -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css" integrity="sha384-aUGj/X2zp5rLCbBxumKTCw2Z50WgIr1vs/PFN4praOTvYXWlVyh2UtNUU0KAUhAX" crossorigin="anonymous">
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-responsive.min.css') }}">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>
     <!-- END: bootstrap -->
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}" />
     <script>document.domain = "softwareheritage.org";</script>
   </head>
   <body>
     <div class="jumbotron">
       <div class="container">
-	<h1>{{ self.title() }}</h1>
-	<nav class="navbar navbar-default">
-	  <div class="navbar-header">
-	    <button type="button" class="navbar-toggle collapsed"
-		    data-toggle="collapse" data-target="#swh-navbar-collapse" aria-expanded="false">
-	    </button>
-	    <a class="navbar-brand" href="/">SWH Archive</a>
-	  </div>
-	  
-	  <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-	    <ul class="nav navbar-nav">
-	      <li><a href="https://www.softwareheritage.org">Main site</a></li>
-	      <li role="separator" class="divider"></li>
-	      <li><a href="/browse/">Browse</a></li>
-	      <li role="separator" class="divider"></li>
-	      <li><a href="/api/">API</a></li>
-	      <li role="separator" class="divider"></li>
-	      <li><a href="/about/">About</a></li>
-	    </ul>
-	  </div>
-	</nav>
+        <h1>{{ self.title() }}</h1>
+        <nav class="navbar navbar-default">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed"
+                    data-toggle="collapse" data-target="#swh-navbar-collapse" aria-expanded="false">
+            </button>
+            <a class="navbar-brand" href="{{ url_for('homepage') }}">SWH Archive</a>
+          </div>
+          
+          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul class="nav navbar-nav">
+              <li><a href="https://www.softwareheritage.org">Main site</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="{{ url_for('browse') }}">Browse</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="{{ url_for('browse_api_doc') }}">API</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="{{ url_for('about') }}">About</a></li>
+            </ul>
+          </div>
+        </nav>
       </div>
     </div>
     {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
     <div class="container messages">
       {% for category, message in messages %}
       <div class="alert alert-{{ category }}" role="alert">{{ message }}</div>
       {% endfor %}
     </div>
     {% endif %}
     {% endwith %}
     <div class="container content">
       {% block content %}{% endblock %}
     </div>
   </body>
 </html>