diff --git a/homepage/content/articles/0010-milestone-1.md b/homepage/content/articles/0010-milestone-1.md
index 167753d..94d17f7 100644
--- a/homepage/content/articles/0010-milestone-1.md
+++ b/homepage/content/articles/0010-milestone-1.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0010-milestone1.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Episode One — Laying the foundation for fair web analytics
+# Episode One — Laying the foundation for fair web analytics
 
 Milestone 1 is completed. This is what we've achieved in the last six weeks.
 
diff --git a/homepage/content/articles/0020-untold-roads.md b/homepage/content/articles/0020-untold-roads.md
index b63b7c0..e2730c7 100644
--- a/homepage/content/articles/0020-untold-roads.md
+++ b/homepage/content/articles/0020-untold-roads.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0020-untoldRoads.jpg
 author: Frederik Ring
 bottom_cta: blog
 
-## Untold roads to v1.0
+# Untold roads to v1.0
 
 After a lot of experimenting, taking detours and having unanticipated revelations while building the foundation for Offen over the last months, the state of the project is starting to settle, and we are eager to get ready for users to install our software, and use it for transparently collecting usage statistics for their websites and applications.
 
diff --git a/homepage/content/articles/0030-milestone-2.md b/homepage/content/articles/0030-milestone-2.md
index b8d3421..ab8e302 100644
--- a/homepage/content/articles/0030-milestone-2.md
+++ b/homepage/content/articles/0030-milestone-2.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0030-milestone-2.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Episode Two — Collecting data securely
+# Episode Two — Collecting data securely
 
 We finished milestone 2. Here is what we' ve been doing for the last 8 weeks.
 
diff --git a/homepage/content/articles/0040-test-offen-today.md b/homepage/content/articles/0040-test-offen-today.md
index c68a646..07b4851 100644
--- a/homepage/content/articles/0040-test-offen-today.md
+++ b/homepage/content/articles/0040-test-offen-today.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0040-test-offen-today.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Test Offen today
+# Test Offen today
 
 We’re excited to present our first version that is officially ready for testing.
 
diff --git a/homepage/content/articles/0050-milestone-3.md b/homepage/content/articles/0050-milestone-3.md
index ef9aea8..d97e2e2 100644
--- a/homepage/content/articles/0050-milestone-3.md
+++ b/homepage/content/articles/0050-milestone-3.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0050-milestone-3.jpg
 author: Frederik Ring
 bottom_cta: matomo
 
-## Episode Three — Displaying data
+# Episode Three — Displaying data
 
 In the middle of strange times Milestone 3 - "Displaying Data" - is done. This means we focused on how we aggregate and display the data Offen collects in a way that operators can use it to improve their services and users can understand what is being collected and what it means for their privacy.
 
diff --git a/homepage/content/articles/0060-milestone-4.md b/homepage/content/articles/0060-milestone-4.md
index c9841f8..9cf053c 100644
--- a/homepage/content/articles/0060-milestone-4.md
+++ b/homepage/content/articles/0060-milestone-4.md
@@ -9,7 +9,7 @@ image_caption: <a class="link b dim moon-gray" target="_blank" href="https://www
 author: Frederik Ring
 bottom_cta: blog
 
-## Episode Four — Managing data
+# Episode Four — Managing data
 
 Milestone 4 - "Managing data" - has been an important one for us. Finishing it means Offen is now close to being feature complete in the scope of our initial plans, and we can start transitioning into a Beta state, meaning we can finally offer a stable product for users to use in production environments.
 
diff --git a/homepage/content/articles/0070-budget.md b/homepage/content/articles/0070-budget.md
index 9415f1c..5898f34 100644
--- a/homepage/content/articles/0070-budget.md
+++ b/homepage/content/articles/0070-budget.md
@@ -9,7 +9,7 @@ author: Frederik Ring
 must_read: True
 bottom_cta: blog
 
-## Hosting Offen on a budget
+# Hosting Offen on a budget
 
 Using self hosted software like Offen when you're on a budget can seem daunting as you usually don't know too much about the performance requirements of the software you are planning to use beforehand. Once you do know, you might have locked in yourself already.
 
diff --git a/homepage/content/articles/0080-beta.md b/homepage/content/articles/0080-beta.md
index f2d47a6..3163ef3 100644
--- a/homepage/content/articles/0080-beta.md
+++ b/homepage/content/articles/0080-beta.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0080-beta.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Let's build a web that is privacy friendly and fair
+# Let's build a web that is privacy friendly and fair
 
 Terms such as 'privacy protection', 'privacy-first', 'privacy-focused' or 'privacy friendly' have been a major talking point for quite some time now.  
 The field of web analytics is no exception. Here these terms are used to describe *alternative, privacy-oriented approaches* and appear regularly in blog posts, readme files and tweets. Projects like Matomo, Simple Analytics, Plausible or GoatCounter use them very gladly and in large letters.
diff --git a/homepage/content/articles/0090-milestone-5.md b/homepage/content/articles/0090-milestone-5.md
index 70123cc..c57a53f 100644
--- a/homepage/content/articles/0090-milestone-5.md
+++ b/homepage/content/articles/0090-milestone-5.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0090-milestone-5.jpg
 author: Frederik Ring
 bottom_cta: blog
 
-## Episode Five — Resilience and documentation
+# Episode Five — Resilience and documentation
 
 Maybe the most exciting milestone in our current journey, Milestone 5 ends with Offen finally stripping off that `alpha` label we have been carrying around for quite a while now, and which admittedly might have scared away some potential users. The good thing about keeping it this long though is that we can feel pretty confident to release working software. We'll still defer the 1.0 for a while and start with `v0.1.0`, but from now on we really mean it: Install Offen in production, we are confident it'll be a good choice.
 
diff --git a/homepage/content/articles/0100-matomo.md b/homepage/content/articles/0100-matomo.md
index 2536591..c3eacad 100644
--- a/homepage/content/articles/0100-matomo.md
+++ b/homepage/content/articles/0100-matomo.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0100-Matomo.jpg
 author: Hendrik Niefeld
 bottom_cta: fair
 
-## Why Offen is a valid Matomo alternative
+# Why Offen is a valid Matomo alternative
 
 #### Matomo at a glance
 
diff --git a/homepage/content/articles/0110-milestone-6.md b/homepage/content/articles/0110-milestone-6.md
index 8f5fb56..4bb8fbf 100644
--- a/homepage/content/articles/0110-milestone-6.md
+++ b/homepage/content/articles/0110-milestone-6.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0110-milestone-6.jpg
 author: Frederik Ring
 bottom_cta: blog
 
-## Episode Six — Packaging and testing
+# Episode Six — Packaging and testing
 
 It feels a little surreal to write this, but: this post marks the end of Milestone 6, which is the last one defined in our initial product plan defining the scope of our support by the [NGI Zero PET initiative](https://nlnet.nl/thema/NGIZeroPET.html){: target="_blank"}.
 
diff --git a/homepage/content/articles/0120-opt-in-quality.md b/homepage/content/articles/0120-opt-in-quality.md
index 69395db..76af933 100644
--- a/homepage/content/articles/0120-opt-in-quality.md
+++ b/homepage/content/articles/0120-opt-in-quality.md
@@ -9,7 +9,7 @@ author: Hendrik Niefeld
 must_read: True
 bottom_cta: matomo
 
-## Opt-in for quality insights
+# Opt-in for quality insights
 
 ### Fair web analytics
 
diff --git a/homepage/content/articles/0130-performance.md b/homepage/content/articles/0130-performance.md
index c467f78..087de27 100644
--- a/homepage/content/articles/0130-performance.md
+++ b/homepage/content/articles/0130-performance.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0130-performance-awareness.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Episode Seven — Performance and Awareness
+# Episode Seven — Performance and Awareness
 
 Some time has passed after [NGI Zero PET Initiative](https://nlnet.nl/thema/NGIZeroPET.html){: target="_blank"} funding ended, we want to recap the results of our work with this blog post.
 
diff --git a/homepage/content/articles/0140-privacy-cookies.md b/homepage/content/articles/0140-privacy-cookies.md
index 1fb98f1..fda8c67 100644
--- a/homepage/content/articles/0140-privacy-cookies.md
+++ b/homepage/content/articles/0140-privacy-cookies.md
@@ -9,7 +9,7 @@ author: Frederik Ring
 must_read: True
 bottom_cta: quality
 
-## Privacy focus? Consider the cookie
+# Privacy focus? Consider the cookie
 
 Whoever [drafted the idea for HTTP cookies](https://tools.ietf.org/html/rfc2109){: target="_blank"} back in 1997 likely did not anticipate having created a technology that is as disputed, discussed and also disliked as it is today. A non-technical user of the internet might be under the impression that cookies are an utterly useless privacy disaster that bring you nothing but consent banners filled with dark patterns, and enable advertisers to track you on literally every website ever.
 
diff --git a/homepage/content/articles/0150-interfaces.md b/homepage/content/articles/0150-interfaces.md
index 37efb7a..92c9e58 100644
--- a/homepage/content/articles/0150-interfaces.md
+++ b/homepage/content/articles/0150-interfaces.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0150-interfaces.jpg
 author: Hendrik Niefeld
 bottom_cta: blog
 
-## Episode Eight — Improving interfaces
+# Episode Eight — Improving interfaces
 
 Like last year, we want to keep you updated on the current status of our project at regular intervals. So these are the highlights of our work over the last six weeks. With version v0.3.0 now officially out, we've added some great additions to our interfaces.
 
diff --git a/homepage/content/articles/0160-our-story-so-far.md b/homepage/content/articles/0160-our-story-so-far.md
index ce7e00d..3e2c508 100644
--- a/homepage/content/articles/0160-our-story-so-far.md
+++ b/homepage/content/articles/0160-our-story-so-far.md
@@ -8,7 +8,7 @@ image_url: /theme/images/offen-blog-0160-our-story-so-far.jpg
 author: Hendrik Niefeld
 bottom_cta: cookie
 
-## Our story so far
+# Our story so far
 
 Hi there. This is our story on how we develop fair and open source web analytics software. A note first. This story is not finished yet. We are just about to take the next major step. But more about that later.
 
diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md
index 9f8e7fb..ac5f2f8 100644
--- a/homepage/content/pages/about.md
+++ b/homepage/content/pages/about.md
@@ -3,7 +3,7 @@ description: Who we are, what we do, who supports us and how you can can get in
 slug: about
 bottom_cta: fair
 
-## About
+# About
 
 ### What is this thing called "my data" and why does seemingly everyone want to get hold of it?
 
diff --git a/homepage/content/pages/legal-privacy.md b/homepage/content/pages/legal-privacy.md
index 22024f6..5d09d6c 100644
--- a/homepage/content/pages/legal-privacy.md
+++ b/homepage/content/pages/legal-privacy.md
@@ -4,7 +4,7 @@ slug: legal-privacy
 exclude_from_sitemap: true
 bottom_cta: quality
 
-## Legal & Privacy
+# Legal & Privacy
 
 ### Website Analytics
 We use [Offen](https://offen.offen.dev/) for collecting usage data on this website and only access your usage data with your consent. Your data always remains yours. You can review and delete it at any time. Opt out again whenever you want.
diff --git a/homepage/content/pages/try-demo.md b/homepage/content/pages/try-demo.md
index 295d22a..8a614e0 100644
--- a/homepage/content/pages/try-demo.md
+++ b/homepage/content/pages/try-demo.md
@@ -4,7 +4,9 @@ slug: try-demo
 template: trydemo
 sitemap_priority: 0.1
 
-Offen always respects your data, which is why *we don't offer a live demo showing you data of real users.* However, it's really easy to get a demo that is populated with random usage data up and running on your system. If you get stuck or need help, [file an issue][gh-issues], [tweet (@hioffen)][twitter]{: target="_blank"} or [email][email].
+Offen always respects your data, which is why *we don't offer a live demo showing you data of real users.* However, it's really easy to get a demo that is populated with random usage data up and running on your system.
+
+If you get stuck or need help, [file an issue][gh-issues], [tweet (@hioffen)][twitter]{: target="_blank"} or [email][email].
 
 [gh-issues]: https://github.com/offen/offen/issues
 [twitter]: https://twitter.com/hioffen
diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css
index d8b4032..68e5529 100644
--- a/homepage/theme/static/css/fix.css
+++ b/homepage/theme/static/css/fix.css
@@ -295,11 +295,24 @@ span {
   display: table;
 }
 /* Custom media query - medium small - neutralize span line braks */
-@media only screen and (max-width: 34em) {
+@media only screen and (max-width: 40em) {
   p span {
     display: initial;
   }
 }
+.pitchMargin {
+	margin-right: 2rem;
+}
+@media only screen and (min-width: 25em) and (max-width: 30em) {
+  .pitchMargin {
+    margin-right: 3rem;
+  }
+}
+@media only screen and (min-width: 30em) {
+  .pitchMargin {
+    margin-right: 0;
+  }
+}
 em {
   background: linear-gradient(transparent 66%, #fde28c 66%);
   font-style: normal;
diff --git a/homepage/theme/templates/archives.html b/homepage/theme/templates/archives.html
index 2944d0c..25772bc 100644
--- a/homepage/theme/templates/archives.html
+++ b/homepage/theme/templates/archives.html
@@ -10,9 +10,9 @@
 {% block content %}
   <div class="mw8 center cclr-bg-white-responsive mt5-ns">
     <div class="dib gray bg-white ph3 ph5-ns pt5">
-      <h2 class="f2 normal lh-title ma0 mt4 mb3">
+      <h1 class="f2 normal lh-title ma0 mt3 mb3">
         Fair Analytics Blog
-      </h2>
+      </h1>
       <div class="w-75-l">
         <p class="ma0 mb5">
           Hi there. We are Frederik and Hendrik. Here we post about how we are building a fair and open web analytics tool and what we discovered along the way.
@@ -33,7 +33,7 @@
                   <h6 class="f5 lh-solid normal ma0 light-silver">
                     {{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }}
                   </h6>
-                    <h1 class="f3 normal lh-title mt3 ma0 mb3 light-silver">
+                    <h2 class="f3 normal lh-title mt3 ma0 mb3 light-silver">
                       {% if not article.must_read %}
                         <a href="/blog/{{ article.slug }}/" class="link b dim gray">{{ article.title }}</a>
                       {% else %}
@@ -41,7 +41,7 @@
                           <a href="/blog/{{ article.slug }}/" class="link b dim gray">{{ article.title }}</a>
                         </em>
                       {% endif %}
-                    </h1>
+                    </h2>
                   <p>
                     {{ article.description }} <a href="/blog/{{ article.slug }}/" class="link b dim gray">Read more</a>
                   </p>
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html
index 5bc9047..c76ad17 100644
--- a/homepage/theme/templates/base.html
+++ b/homepage/theme/templates/base.html
@@ -43,7 +43,9 @@
         <div class="nav-container">
           <div class="icon flex">
             <a class="link dim" href="/"><img src="/theme/images/offen-icon-white.svg" alt="Offen logo" width="37" height="40" class="logo"></a>
-            <a class="link dim" href="/"><p class="fLogo normal ma0 ml2 white">Offen</p></a>
+            <header>
+              <a class="link dim" href="/"><p class="fLogo normal ma0 ml2 white">Offen</p></a>
+            </header>
           </div>
           {% if not funnel %}
             <nav>
diff --git a/homepage/theme/templates/getstarted.html b/homepage/theme/templates/getstarted.html
index 77263ae..6a22dd2 100644
--- a/homepage/theme/templates/getstarted.html
+++ b/homepage/theme/templates/getstarted.html
@@ -3,13 +3,13 @@
 
 {% block content %}
 <div class="w-100 mt5-ns cclr-bg-white-dark">
-  <div class="mw7 center pt5 pb5 ph4 bg-white">
+  <div class="mw7 center pt5 pb5 ph4 gray bg-white">
 
     <div class="w-100 center tc">
 
-      <h2 class="f1-ns f2 normal ma0 mb4">
+      <h1 class="f2 normal ma0 mt3 mb4">
         Get started
-      </h2>
+      </h1>
       <div class="gray tl">
         {{ page.content }}
       </div>
diff --git a/homepage/theme/templates/index.html b/homepage/theme/templates/index.html
index d3c6858..928240d 100644
--- a/homepage/theme/templates/index.html
+++ b/homepage/theme/templates/index.html
@@ -4,7 +4,7 @@
 {% block content %}
   <div class="w-100 mt5-ns cclr-bg-yellow-mid">
     <div class="mw8 center">
-      <div class="flex justify-center pt4 ph4">
+      <div class="flex justify-center ph4">
         <div class="dn db-ns w-20 tr pr3 pb3">
           <img src="/theme/images/offen-icon-white.svg" alt="Offen logo" width="58" height="63">
         </div>
@@ -20,10 +20,10 @@
           <h1 class="f1-ns f2 normal lh-solid ma0 mb3">
             Fair web analytics
           </h1>
-          <p class="f3 ma0 mb4">
+          <p class="f3 lh-title ma0 mb4 pitchMargin">
             Let your users access their data. <span>Gain valuable insights at the same time. </span>Open, lightweight, self hosted and free.
           </p>
-          <div class="pb5 mb2">
+          <div class="pb5">
             <a class="b link dim ph4 pv2 dib b--solid bw2 cclr-brd-black-mid cclr-fnt-black-mid" href="#bg-explainer" rel="noopener">Learn more</a>
           </div>
         </div>
diff --git a/homepage/theme/templates/trydemo.html b/homepage/theme/templates/trydemo.html
index de1910e..7255a8d 100644
--- a/homepage/theme/templates/trydemo.html
+++ b/homepage/theme/templates/trydemo.html
@@ -3,13 +3,13 @@
 
 {% block content %}
 <div class="w-100 mt5-ns cclr-bg-white-dark">
-  <div class="mw7 center pt5 pb5 ph4 bg-white">
+  <div class="mw7 center pt5 pb5 ph4 gray bg-white">
 
     <div class="w-100 center">
 
-      <h2 class="f1-ns f2 normal tc ma0 mb4">
+      <h1 class="f2 normal tc ma0 mt3 mb4">
         Try demo
-      </h2>
+      </h1>
       <div class="gray">
         {{ page.content }}
       </div>