8 files changed, 28 insertions, 15 deletions
diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
deleted file mode 100644
index a644761b6..000000000
--- a/searx/templates/oscar/about.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "oscar/base.html" %}
-{% block title %}{{ _('about') }} - {% endblock %}
-{% block content %}
-{{ help.about | safe }}
-{% include "__common__/aboutextend.html" ignore missing %}
-{% endblock %}
diff --git a/searx/templates/oscar/help.html b/searx/templates/oscar/help.html
new file mode 100644
index 000000000..bf311fb4a
--- /dev/null
+++ b/searx/templates/oscar/help.html
@@ -0,0 +1,12 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ page.title }} - {% endblock %}
+{% block content %}
+<ul class="nav nav-tabs">
+{% for name, page in all_pages %}
+  <li {% if name == page_filename %}class="active"{% endif %}>
+    <a href="{{name}}">{{page.title}}</a>
+  </li>
+{% endfor %}
+</ul>
+{{ page.content | safe }}
+{% endblock %}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
index 0eeb207a0..b1d344c11 100644
--- a/searx/templates/oscar/navbar.html
+++ b/searx/templates/oscar/navbar.html
@@ -3,7 +3,7 @@
         <a href="{{ url_for('index') }}">{{ instance_name }}</a>{{- "" -}}
     </span>{{- "" -}}
     <span class="{% if rtl %}pull-left{% else %}pull-right{% endif %}">{{- "" -}}
-        <a href="{{ url_for('about') }}">{{ _('about') }}</a>{{- "" -}}
+        <a href="{{ url_for('help_page', pagename='about') }}">{{ _('about') }}</a>{{- "" -}}
         <a href="{{ url_for('preferences') }}">{{ _('preferences') }}</a>{{- "" -}}
     </span>{{- "" -}}
 </div>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index f731a8fc1..71ee57a62 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -94,7 +94,7 @@
 <div>
 
     <h1>{{ _('Preferences') }}</h1>
-    <form method="post" action="{{ url_for('preferences') }}" id="search_form">
+    <form method="post" action="{{ url_for('preferences') }}" id="search_form" autocomplete="off">
 
         <!-- Nav tabs -->
         <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist">
diff --git a/searx/templates/simple/about.html b/searx/templates/simple/about.html
deleted file mode 100644
index f6a0a96a9..000000000
--- a/searx/templates/simple/about.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'simple/page_with_header.html' %}
-{% block content %}
-{{ help.about | safe }}
-{% include "__common__/aboutextend.html" ignore missing %}
-{% endblock %}
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index 33b7a2cbe..ffd648171 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -58,7 +58,7 @@
   </main>
   <footer>
     <p>
-    {{ _('Powered by') }} <a href="{{ url_for('about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
+    {{ _('Powered by') }} <a href="{{ url_for('help_page', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
         <a href="{{ searx_git_url }}">{{ _('Source code') }}</a> |
         <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a> |
         <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a> |
diff --git a/searx/templates/simple/help.html b/searx/templates/simple/help.html
new file mode 100644
index 000000000..5f571ae01
--- /dev/null
+++ b/searx/templates/simple/help.html
@@ -0,0 +1,12 @@
+{% extends 'simple/page_with_header.html' %}
+{% block title %}{{ page.title }} - {% endblock %}
+{% block content %}
+<ul class="tabs">
+{% for name, page in all_pages %}
+  <li>
+    <a href="{{name}}" {% if name == page_filename %}class="active"{% endif %}>{{page.title}}</a>
+  </li>
+{% endfor %}
+</ul>
+{{ page.content | safe }}
+{% endblock %}
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index b674d5d02..b47cbc774 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -98,7 +98,7 @@
 {% block content %}
 <h1>{{ _('Preferences') }}</h1>
 
-<form id="search_form" method="post" action="{{ url_for('preferences') }}">
+<form id="search_form" method="post" action="{{ url_for('preferences') }}" autocomplete="off">
 
 {{ tabs_open() }}