diff --git a/README.md b/README.md
index eb5f38f6..45fa9f89 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,14 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/eikek0/docspell?color=steelblue&style=for-the-badge&logo=docker)](https://hub.docker.com/r/eikek0/docspell)
 [![Gitter chat](https://img.shields.io/gitter/room/eikek/docspell?style=for-the-badge&color=steelblue&logo=gitter)](https://gitter.im/eikek/docspell)
 
-# Docspell
+# Docspell - Document Management System (DMS)
 
-Docspell is a personal document organizer. You'll need a scanner to
-convert your papers into files. Docspell can then assist in organizing
-the resulting mess :wink:. It is targeted for home use, i.e. families
-and households and also for (smaller) groups/companies.
+Docspell is a personal document organizer. Or sometimes called a
+"Document Management System" (DMS). You'll need a scanner to convert
+your papers into files. Docspell can then assist in organizing the
+resulting mess :wink:. It can unify your files from scanners, emails
+and other sources. It is targeted for home use, i.e. families,
+households and also for smaller groups/companies.
 
 You can associate tags, set correspondends and lots of other
 predefined and custom metadata. If your documents are associated with
diff --git a/website/site/templates/index.html b/website/site/templates/index.html
index e29900eb..34d27d58 100644
--- a/website/site/templates/index.html
+++ b/website/site/templates/index.html
@@ -7,15 +7,16 @@
         <script type="application/javascript" src="js/bundle.js"></script>
     </head>
     <body id="app">
+
+        <script type="application/javascript">
+         var elmFlags = {
+             "version": "{{ config.extra.version }}"
+         };
+         var elmApp = Elm.Main.init({
+             node: document.getElementById("app"),
+             flags: elmFlags
+         });
+        </script>
+        {% include "fathom.html" %}
     </body>
-    <script type="application/javascript">
-     var elmFlags = {
-         "version": "{{ config.extra.version }}"
-     };
-     var elmApp = Elm.Main.init({
-         node: document.getElementById("app"),
-         flags: elmFlags
-     });
-    </script>
-    {% include "fathom.html" %}
 </html>
diff --git a/website/site/templates/meta.html b/website/site/templates/meta.html
index 10869d43..2d1ade52 100644
--- a/website/site/templates/meta.html
+++ b/website/site/templates/meta.html
@@ -1,8 +1,11 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="author" content="Eike Kettner">
-<meta name="description" content="Simple Document Organizer">
+<meta name="description" content="Docspell is a Document Management System (DMS), a system that asists in organizing your piles of documents, resulting from scanners, e-mails and other sources with miminal effort.">
+<meta name="keywords" content="document management system dms organizer ocr open source free scan pdf word doc archive gpl machine learning nlp auto tagging"/>
+<meta name="robots" content="index,follow"/>
 <meta name="image" property="og:image" content="/img/poster.png">
 <meta name="title" property="og:title" content="Docspell – Simple Document Organizer">
 <meta name="og:image" content="/img/poster.png">
diff --git a/website/site/templates/overview.html b/website/site/templates/overview.html
index 28f327f0..8436c4d5 100644
--- a/website/site/templates/overview.html
+++ b/website/site/templates/overview.html
@@ -63,8 +63,8 @@
 
 
         {% include "footer.html" %}
+        {% include "search-part.html" %}
+        {% include "fathom.html" %}
     </body>
-    {% include "search-part.html" %}
-    {% include "fathom.html" %}
 
 </html>
diff --git a/website/site/templates/page.html b/website/site/templates/page.html
index 09531b59..e2d4e037 100644
--- a/website/site/templates/page.html
+++ b/website/site/templates/page.html
@@ -98,7 +98,7 @@
         </section>
 
         {% include "footer.html" %}
+        {% include "search-part.html" %}
+        {% include "fathom.html" %}
     </body>
-    {% include "search-part.html" %}
-    {% include "fathom.html" %}
 </html>
diff --git a/website/site/templates/pages.html b/website/site/templates/pages.html
index 95c6bd66..88a81569 100644
--- a/website/site/templates/pages.html
+++ b/website/site/templates/pages.html
@@ -71,7 +71,7 @@
         </div>
 
         {% include "footer.html" %}
+        {% include "search-part.html" %}
+        {% include "fathom.html" %}
     </body>
-    {% include "search-part.html" %}
-    {% include "fathom.html" %}
 </html>
