diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html
index bc7f0972e..4bca6a7e0 100644
--- a/searx/templates/default/base.html
+++ b/searx/templates/default/base.html
@@ -1,33 +1,34 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-    <meta charset="UTF-8" />
-    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
-    <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
-    <meta name="generator" content="searx/{{ searx_version }}">
-    <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
-    <title>{% block title %}{% endblock %}searx</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
-    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
-    {% block styles %}
-    {% endblock %}
-    {% block head %}
-    <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
-    {% endblock %}
-</head>
-<body>
-<div id="container">
-{% block content %}
-{% endblock %}
-{% if autocomplete %}
-<script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script>
-<script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script>
-{% endif %}
-<script type="text/javascript">
-        searx = {};
-        searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
-</script>
-<script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
-</div>
-</body>
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
+        <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
+        <meta name="generator" content="searx/{{ searx_version }}">
+        <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />
+        <title>{% block title %}{% endblock %}searx</title>
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />
+        <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" />
+        {% block styles %}
+        {% endblock %}
+        {% block meta %}{% endblock %}
+        {% block head %}
+        <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
+        {% endblock %}
+    </head>
+    <body>
+        <div id="container">
+            {% block content %}
+            {% endblock %}
+            {% if autocomplete %}
+            <script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script>
+            <script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script>
+            {% endif %}
+            <script type="text/javascript">
+                    searx = {};
+                    searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
+            </script>
+            <script src="{{ url_for('static', filename='js/searx.js') }}" ></script>
+        </div>
+    </body>
 </html>
diff --git a/searx/templates/default/categories.html b/searx/templates/default/categories.html
index 017898ea7..1c466781b 100644
--- a/searx/templates/default/categories.html
+++ b/searx/templates/default/categories.html
@@ -1,10 +1,10 @@
 <div id="categories">
     <div id="categories_container">
-{% for category in categories %}
+        {% for category in categories %}
         <div class="checkbox_container">
              <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} /><label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">{{ _(category) }}</label>
         </div>
-{% endfor %}
-    <div class="hidden">{{ _('Click on the magnifier to perform search') }}</div>
+        {% endfor %}
+        {% if display_tooltip %}<div class="hidden">{{ _('Click on the magnifier to perform search') }}</div>{% endif %}
     </div>
 </div>
diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html
index d3ff8f06d..1511cae06 100644
--- a/searx/templates/default/infobox.html
+++ b/searx/templates/default/infobox.html
@@ -1,44 +1,44 @@
 <div class="infobox">
-  <h2>{{ infobox.infobox }}</h2>
-  {% if infobox.img_src %}<img src="{{ infobox.img_src }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %}
-  <p>{{ infobox.entity }}</p>
-  <p>{{ infobox.content | safe }}</p>
-  {% if infobox.attributes %}
-  <div class="attributes">
-    <table>
-      {% for attribute in infobox.attributes %}
-      <tr><td>{{ attribute.label }}</td><td>{{ attribute.value }}</td></tr>
-      {% endfor %}
-    </table>
-  </div>
-  {% endif %}
+    <h2>{{ infobox.infobox }}</h2>
+    {% if infobox.img_src %}<img src="{{ infobox.img_src }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %}
+    <p>{{ infobox.entity }}</p>
+    <p>{{ infobox.content | safe }}</p>
+    {% if infobox.attributes %}
+    <div class="attributes">
+        <table>
+            {% for attribute in infobox.attributes %}
+            <tr><td>{{ attribute.label }}</td><td>{{ attribute.value }}</td></tr>
+            {% endfor %}
+        </table>
+    </div>
+    {% endif %}
 
-  {% if infobox.urls %}
-  <div class="urls">
-    <ul>
-      {% for url in infobox.urls %}
-      <li class="url"><a href="{{ url.url }}">{{ url.title }}</a></li>
-      {% endfor %}
-    </ul>
-  </div>
-  {% endif %}
+    {% if infobox.urls %}
+    <div class="urls">
+        <ul>
+            {% for url in infobox.urls %}
+            <li class="url"><a href="{{ url.url }}">{{ url.title }}</a></li>
+            {% endfor %}
+        </ul>
+    </div>
+    {% endif %}
 
-  {% if infobox.relatedTopics %}
-  <div class="relatedTopics">
-      {% for topic in infobox.relatedTopics %}
-      <div>
-	<h3>{{ topic.name }}</h3>
-	{% for suggestion in topic.suggestions %}
-	<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
-            <input type="hidden" name="q" value="{{ suggestion }}">
-            <input type="submit" value="{{ suggestion }}" />
-        </form>
-	{% endfor %}
-      </div>
-      {% endfor %}
-  </div>
-  {% endif %}
+    {% if infobox.relatedTopics %}
+    <div class="relatedTopics">
+        {% for topic in infobox.relatedTopics %}
+        <div>
+            <h3>{{ topic.name }}</h3>
+            {% for suggestion in topic.suggestions %}
+            <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
+                <input type="hidden" name="q" value="{{ suggestion }}">
+                <input type="submit" value="{{ suggestion }}" />
+            </form>
+            {% endfor %}
+        </div>
+        {% endfor %}
+    </div>
+    {% endif %}
 
-  <br />
+    <br />
   
 </div>
diff --git a/searx/templates/default/preferences.html b/searx/templates/default/preferences.html
index 7d35de7c3..639877d47 100644
--- a/searx/templates/default/preferences.html
+++ b/searx/templates/default/preferences.html
@@ -7,9 +7,8 @@
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
     <fieldset>
         <legend>{{ _('Default categories') }}</legend>
-        <p>
+        {% set display_tooltip = false %}
         {% include 'default/categories.html' %}
-        </p>
     </fieldset>
     <fieldset>
         <legend>{{ _('Search language') }}</legend>
@@ -79,9 +78,9 @@
                 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</td>
                 <td>{{ _(categ) }}</td>
                 <td class="engine_checkbox">
-                    <input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
-                    <label class="allow" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
-                    <label class="deny" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                    <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
+                    <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                    <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
                 </td>
             </tr>
             {% endif %}
@@ -95,7 +94,7 @@
     </p>
 
     <input type="submit" value="{{ _('save') }}" />
-	<div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
+    <div class="right preferences_back"><a href="{{ url_for('index') }}">{{ _('back') }}</a></div>
     </form>    
 </div>
 {% endblock %}
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html
index 85882e56a..79b00d8de 100644
--- a/searx/templates/default/result_templates/default.html
+++ b/searx/templates/default/result_templates/default.html
@@ -1,6 +1,6 @@
 <div class="result {{ result.class }}">
     <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
-    {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
+    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a>
+    {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
     <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
 </div>
diff --git a/searx/templates/default/result_templates/images.html b/searx/templates/default/result_templates/images.html
index 4c6d59e01..9cb82ba51 100644
--- a/searx/templates/default/result_templates/images.html
+++ b/searx/templates/default/result_templates/images.html
@@ -1,6 +1,6 @@
 <div class="image_result">
     <p>
         <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}" /></a>
-        <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
+        <span class="url"><a href="{{ result.url }}" class="small_font">{{ _('original context') }}</a></span>
     </p>
 </div>
diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html
index d37c2f374..59885a58c 100644
--- a/searx/templates/default/result_templates/map.html
+++ b/searx/templates/default/result_templates/map.html
@@ -1,13 +1,13 @@
 <div class="result {{ result.class }}">
 
-  {% if "icon_"~result.engine~".ico" in favicons %}
+    {% if "icon_"~result.engine~".ico" in favicons %}
     <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
-  {% endif %}
+    {% endif %}
 
-  <div>
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
-	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-    <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
-  </div>
+    <div>
+        <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+        <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a>
+        {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
+        <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
+    </div>
 </div>
diff --git a/searx/templates/default/result_templates/torrent.html b/searx/templates/default/result_templates/torrent.html
index 4c79a0a39..6a71f9ac6 100644
--- a/searx/templates/default/result_templates/torrent.html
+++ b/searx/templates/default/result_templates/torrent.html
@@ -5,5 +5,9 @@
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     <p class="url">{{ result.pretty_url }}</p>
     {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
-    <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a> - <span class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</span></p>
+    <p>
+        {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} 
+        {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %} - 
+        <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span>
+    </p>
 </div>
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html
index 75f965c80..ef6a1f505 100644
--- a/searx/templates/default/result_templates/videos.html
+++ b/searx/templates/default/result_templates/videos.html
@@ -1,6 +1,6 @@
 <div class="result">
     <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-      {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-      <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
-      <p class="url">{{ result.url }}</p>
+    {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
+    <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
+    <p class="url">{{ result.url }}</p>
 </div>
diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html
index 822960593..c83bf5c5d 100644
--- a/searx/templates/default/results.html
+++ b/searx/templates/default/results.html
@@ -1,5 +1,6 @@
 {% extends "default/base.html" %}
 {% block title %}{{ q }} - {% endblock %}
+{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q }}" href="{{ url_for('index') }}?q={{ q|urlencode }}&amp;format=rss&amp;{% for category in selected_categories %}category_{{ category }}=1&amp;{% endfor %}pageno={{ pageno }}">{% endblock %}
 {% block content %}
 <div class="preferences_container right"><a href="{{ url_for('preferences') }}" id="preferences"><span>preferences</span></a></div>
 <div class="small search center">
@@ -39,12 +40,14 @@
     {% endif %}
 
     {% if suggestions %}
-    <div id="suggestions"><span>{{ _('Suggestions') }}</span>
+    <div id="suggestions"><span id="suggestions-title">{{ _('Suggestions') }} : </span>
+        {% set first = true %}
         {% for suggestion in suggestions %}
-        <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
+        {% if not first %} &bull; {% endif %}<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
             <input type="hidden" name="q" value="{{ suggestion }}">
-            <input type="submit" value="{{ suggestion }}" />
+            <input type="submit" class="suggestion" value="{{ suggestion }}" />
         </form>
+        {% set first = false %}
         {% endfor %}
     </div>
     {% endif %}
@@ -55,7 +58,7 @@
          {% include 'default/infobox.html' %}
       {% endfor %}
     </div>
-    {% endif %}    
+    {% endif %}
 
     {% for result in results %}
         {% if result['template'] %}
@@ -81,12 +84,12 @@
         {% endif %}
         <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
             <div class="right">
-            {% for category in selected_categories %}
-            <input type="hidden" name="category_{{ category }}" value="1"/>
-            {% endfor %}
-            <input type="hidden" name="q" value="{{ q }}" />
-            <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
-            <input type="submit" value="{{ _('next page') }} >>" />
+                {% for category in selected_categories %}
+                <input type="hidden" name="category_{{ category }}" value="1"/>
+                {% endfor %}
+                <input type="hidden" name="q" value="{{ q }}" />
+                <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+                <input type="submit" value="{{ _('next page') }} >>" />
             </div>
         </form>
 
diff --git a/searx/templates/default/search.html b/searx/templates/default/search.html
index 75cfa41d6..5a049a492 100644
--- a/searx/templates/default/search.html
+++ b/searx/templates/default/search.html
@@ -1,7 +1,8 @@
 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
-  <div id="search_wrapper">
-    <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/>
-    <input type="submit" value="search" id="search_submit" />
-  </div>
-  {% include 'default/categories.html' %}
+    <div id="search_wrapper">
+        <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" size="100" {% if q %}value="{{ q }}"{% endif %}/>
+        <input type="submit" value="search" id="search_submit" />
+    </div>
+    {% set display_tooltip = true %}
+    {% include 'default/categories.html' %}
 </form>
