diff --git a/swh/web/ui/static/css/style.css b/swh/web/ui/static/css/style.css
index bc200b89..3aa8b503 100644
--- a/swh/web/ui/static/css/style.css
+++ b/swh/web/ui/static/css/style.css
@@ -1,66 +1,69 @@
 /*
 version:   0.1
 date:      21/09/15
 author:    swh
 email:     swh
 website:   softwareheritage.org
 version history: /style.css
 */
 
 body            { font-family: sans-serif; background: #eee; }
 a, h1, h2       { color: #377ba8; }
 h1, h2          { font-family: 'Georgia', serif; margin: 0; }
 h1              { border-bottom: 2px solid #eee; }
 h2              { font-size: 1.2em; }
 
 .page           { margin: 2em auto; width: 35em; border: 5px solid #ccc;
                   padding: 0.8em; background: white; }
 .entries        { list-style: none; margin: 0; padding: 0; }
 .entries li     { margin: 0.8em 1.2em; }
 .entries li h2  { margin-left: -1em; }
 .add-entry      { font-size: 0.9em; border-bottom: 1px solid #ccc; }
 .add-entry dl   { font-weight: bold; }
 .metanav        { text-align: right; font-size: 0.8em; padding: 0.3em;
                   margin-bottom: 1em; background: #fafafa; }
 .flash          { background: #cee5F5; padding: 0.5em;
                   border: 1px solid #aacbe2; }
 .error          { background: #f0d6d6; padding: 0.5em; }
 
 .file-found     { color: #23BA49; }
 .file-notfound  { color: #FF4747; }
 
-/* Bootstrap custom styling */
+/* Bootstrap custom styling to correctly render multiple 
+ * form-controls in an input-group: 
+ *                github.com/twbs/bootstrap/issues/12732 */
+
 .input-group-field {
     display: table-cell;
     vertical-align: middle;
     border-radius:4px;
     min-width:1%;
     white-space: nowrap;
 }
 
 .input-group-field .form-control {
     border-radius: inherit !important;
 }
 
 .input-group-field:not(:first-child):not(:last-child) {
     border-radius:0;
 }
 
 .input-group-field:not(:first-child):not(:last-child) .form-control {
     border-left-width: 0;
     border-right-width: 0;
 }
 
 .input-group-field:last-child {
     border-top-left-radius:0;
     border-bottom-left-radius:0;
 }
 
 .input-group > span:not(:last-child) > button {
    border-radius: 0;
 }
 
 .multi-input-group > .input-group-btn {
   vertical-align: bottom;
   padding: 0;
 }
\ No newline at end of file
diff --git a/swh/web/ui/templates/browse.html b/swh/web/ui/templates/browse.html
index dafce151..776a2b93 100644
--- a/swh/web/ui/templates/browse.html
+++ b/swh/web/ui/templates/browse.html
@@ -1,56 +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>
       
       <!-- Revision pane -->
       <div class="tab-pane" id="tab-revision" role="tabpanel">
         {% include 'includes/home-revision.html' %}
       </div>
       
       <!-- Origin pane -->
       <div class="tab-pane" id="tab-origin" role="tabpanel">
         {% include 'includes/home-origin.html' %}
       </div>
       
       <!-- Directory pane -->
       <div class="tab-pane" id="tab-directory" role="tabpanel">
         {% include 'includes/home-directory.html' %}
       </div>
     </div>
     
   </div>
 </div>
 
 <script>
     // Hash update on page load
     var hash = window.location.hash;
-  hash && $('ul.nav a[href="' + hash + '"]').tab('show');
-  // Hash update on nav-tab click
-  $('.nav-tabs a').click(function(e) {
-      window.location.hash = this.hash;
-  })
+    hash && $('ul.nav a[href="' + hash + '"]').tab('show');
+    // Hash update on nav-tab click
+    $('.nav-tabs a').click(function(e) {
+        window.location.hash = this.hash;
+    })
 </script>
 {% endblock %}
diff --git a/swh/web/ui/templates/home.html b/swh/web/ui/templates/home.html
deleted file mode 100644
index 2f95f470..00000000
--- a/swh/web/ui/templates/home.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "layout.html" %}
-{% block title %}Home{% endblock %}
-{% block content %}
-
-<ul>
-  <li><a href="{{ url_for('about') }}">About</a></li>
-  <li><a href="https://www.softwareheritage.org">Main site</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/layout.html b/swh/web/ui/templates/layout.html
index 20973938..1ae30e91 100644
--- a/swh/web/ui/templates/layout.html
+++ b/swh/web/ui/templates/layout.html
@@ -1,57 +1,61 @@
 <!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">
+	      <span class="sr-only">Toggle navigation menu</span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
             </button>
             <a class="navbar-brand" href="{{ url_for('homepage') }}">SWH Archive</a>
           </div>
           
-          <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <div class="collapse navbar-collapse" id="swh-navbar-collapse">
             <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>