diff --git a/src/_data/site.json b/src/_data/site.json
index a6eaaad630..496af96097 100644
--- a/src/_data/site.json
+++ b/src/_data/site.json
@@ -9,9 +9,9 @@
         "d2fe": "https://boards.greenhouse.io/flowfuse/jobs/5185319004"
     },
     "messaging": {
-        "tagLine": "Unlock Industrial Data<br /> Integrate Everything<br />Optimize Faster",
-        "subtitle": "Quickly build workflows, applications and integrations that optimize your operations with our low-code, open-source, end to end platform.",
+        "tagLine": "Unlock Industrial Data <br />Integrate Everything <br />Optimize Faster",
         "title": "Build workflows and integrations that optimize your industrial operations",
+        "subtitle": "Quickly build workflows, applications and integrations that optimize your operations with our low-code, open-source, end to end platform.",
         "keywords": "Node-RED, Application Development, IoT, IIoT, Low-Code, open source, Integration, Workflow, Automation, Data Processing, Data Integration, Data Transformation, Data Visualization, Industrial Automation, Industrial IoT, Industry 4.0"
     }
 }
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
index f4d3d6468a..84645b729b 100644
--- a/src/_includes/layouts/base.njk
+++ b/src/_includes/layouts/base.njk
@@ -4,7 +4,7 @@ meta:
   type: page
   site:
     name: FlowFuse
-    description: {{ messaging.title }}
+    description: {{ messaging.subtitle }}
     url: https://FlowFuse.com
     logo:
       src: https://flowfuse.com/handbook/images/logos/ff-logo--square--dark.png
@@ -62,8 +62,8 @@ eleventyComputed:
     <title>{{ title }} &#x2022; FlowFuse{% if page.url and page.url.match('\/handbook\/.+') %} Handbook{% endif %}{% if page.url and page.url.match('\/docs\/.+') %} Docs{% endif %}</title>
     {% else %}
     {% set extractedTitle = content | extractH1Content %}
-    {% if extractedTitle %}
-    <title>{{ extractedTitle }} &#x2022; FlowFuse{% if page.url and page.url.match('\/handbook\/.+') %} Handbook{% endif %}{% if page.url and page.url.match('\/docs\/.+') %} Docs{% endif %}</title>
+    {% if extractedTitle and page.url != '/' %}
+        <title>{{ extractedTitle }} &#x2022; FlowFuse{% if page.url and page.url.match('\/handbook\/.+') %} Handbook{% endif %}{% if page.url and page.url.match('\/docs\/.+') %} Docs{% endif %}</title>
     {% else %}
     <title>FlowFuse &#x2022; {{ site.messaging.title }}</title>
     {% endif %}