diff --git a/developers.hbs b/developers.hbs
index aa8a768..7a22e82 100644
--- a/developers.hbs
+++ b/developers.hbs
@@ -26,6 +26,11 @@
       <a href="https://github.com/specklesystems" class="flex w-full h-full">
         <div class="block self-center w-full">
           <div class="text-3xl font-semibold text-blue-600">
+            <svg class="h-6 w-6 inline -mt-2" fill="currentColor"
+              viewBox="0 0 24 24" aria-hidden="true">
+              <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+                clip-rule="evenodd"></path>
+            </svg>
             Github →
           </div>
           <p class="dark:text-gray-300">Where our code
@@ -51,7 +56,8 @@
 </div>
 
 <div class="w-default my-10">
-  <h3 class="text-xl my-2 text-blue-600">We've got you covered:</h3>
+  <h3 class="text-xl my-2 text-blue-600">We've got you
+    covered:</h3>
 </div>
 
 <div class="w-default grid gap-5 md:grid-cols-2 lg:grid-cols-3">
diff --git a/index.hbs b/index.hbs
index 192cae8..2e3b064 100644
--- a/index.hbs
+++ b/index.hbs
@@ -16,4 +16,6 @@
 
 {{> cardCTA subHeadline="We're working round the clock to get V2 out - be the first to try it out:" }}
 
-{{> landing/blogPreview }}
\ No newline at end of file
+{{> landing/blogPreview }}
+
+{{> landing/newsletter }}
\ No newline at end of file
diff --git a/page-about.hbs b/page-about.hbs
index 0f6d837..549deda 100644
--- a/page-about.hbs
+++ b/page-about.hbs
@@ -1,36 +1,44 @@
 {{!< default}}
 
-<div class="absolute inset-0 pt-32 opacity-20 h-5/6">
+<div class="absolute inset-0 pt-32 opacity-10 h-5/6">
   {{> extras/super }}
 </div>
 
 <article class="relative">
 
-  <div class="w-default">
-    {{#post}}
+  {{> aboutHeader }}
 
-      <div class="page-about-content w-3/3 md:w-2/3 mt-12 text-gray-700 dark:text-gray-300 border-l-4 border-blue-500 pl-5">
-        <p class="text-2xl md:text-5xl">
-          Speckle is open source digital infrastructure for
-          the built environment. We handle interoperability
-          between software silos, real time collaboration,
-          data management, versioning and automation.
-        </p>
-        <div class="relative mt-12 rounded-2xl overflow-hidden flex col-span-1 transition hover:shadow-2xl p-5 py-10 bg-white dark:bg-gray-900">
-          <a href="/usecases" class="flex w-full h-full">
-            <div class="block self-center">
-              <div class="text-3xl font-semibold text-blue-600">
-                Use cases →
+  <div class="w-default">
+
+{{!--       <div class="w-default mt-20 my-0 grid grid-cols-1 lg:grid-cols-2 gap-10 mb-10 flex flex-col shadow-xl">
+        <div class="relative">
+          <h2 class="text-4xl pl-5 mb-5 font-bold text-blue-600 border-l-4 border-blue-500">What
+            is Speckle?</h2>
+          <p class=" pl-5 text-2xl text-gray-800 dark:text-gray-400">
+            <b>Speckle is open source digital
+              infrastructure
+              for
+              the built environment.</b> We handle
+            interoperability
+            between software silos, real time
+            collaboration,
+            data management, versioning and automation.
+          </p>
+          <div class="relative mt-4 rounded-2xl overflow-hidden flex col-span-1 transition hover:shadow-2xl p-5 py-5 ">
+            <a href="/usecases" class="flex w-full h-full">
+              <div class="block self-center">
+                <div class="text-xl font-semibold text-blue-600">
+                  Use cases →
+                </div>
               </div>
-              <p class="dark:text-gray-300">Interoperability
-                &
-                more: a few reasons why people use Speckle.</p>
-            </div>
-          </a>
+            </a>
+          </div>
         </div>
       </div>
 
-      <div class="page-about-content w-3/3 md:w-2/3 ml-auto mr-0 mt-12 text-gray-700 dark:text-gray-300 text-left border-r-4 border-blue-500 pr-5">
+      <div class="page-about-content w-3/3 md:w-2/3 ml-auto mr-0 mt-12 text-gray-700 dark:text-gray-300 text-left pr-5">
+         <h2 class="text-4xl pl-5 mb-5 font-bold text-blue-600 border-l-4 border-blue-500">What
+            is our mission?</h2>
         <p class="text-2xl md:text-4xl">
           Our mission is to revolutionise the AEC
           industry's
@@ -52,9 +60,8 @@
           </a>
         </div>
 
-      </div>
+      </div> --}}
 
-    {{/post}}
   </div>
 
   <div class="w-default mt-20 text-gray-700 dark:text-gray-300 text-center">
diff --git a/page-beta.hbs b/page-beta.hbs
index da86143..799c5c9 100644
--- a/page-beta.hbs
+++ b/page-beta.hbs
@@ -17,35 +17,13 @@
       </div>
     </header>
 
-    <div class="relative w-default mb-20 gap-4 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5">
-      {{> pricing }}
-    </div>
-
-    <div class="relative max-w-prose p-5 mx-auto mb-20 grid grid-cols-3 gap-4 bg-white dark:bg-gray-900 rounded-xl">
-      <div class="col-span-3 md:col-span-2">
-        <h2 class="font-bold text-xl mt-5 text-gray-700 dark:text-gray-200">
-          Self Hosting
-        </h2>
-        <p class="mb-5 mt-5 dark:text-gray-200">
-          Speckle is open source. You can always deploy it
-          on your own.
-        </p>
-      </div>
-      <div class="col-span-3 md:col-span-1 justify-center">
-        <a href="https://github.com/specklesystems" class="flex w-full h-full">
-          <div class="block self-center w-full text-center">
-            <div class="text-xl font-semibold text-blue-600 text-center">
-              Github →
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
+    {{> pricingWithPro }}
+    {{> pricing }}
 
     <header class="mb-10 mt-24 px-4 lg:px-8 relative sm:px-6 pb-10">
       <div class="mx-auto max-w-prose object-center justify-center">
         <h1>
-          <span class="font-extrabold leading-8 text-xl text-gray-700 tracking-tight mt-12 dark:text-gray-100 ">
+          <span class="font-extrabold leading-8 text-4xl text-gray-700 tracking-tight mt-12 dark:text-gray-100 ">
             Q&As:
           </span>
         </h1>
@@ -95,7 +73,12 @@
               implies we would be seeing very private
               details of your infrastructure - which you
               don't want us to do without a contract in
-              place.</p>
+              place.
+              <br>
+              <br>
+              If you want a support package for self-hosted versions,
+              don't hesitate to get in touch!
+            </p>
           </div>
 
           <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
@@ -110,7 +93,8 @@
           <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
             <h4 class="text-xl mb-4">
               <span class="text-blue-600 font-bold">Q:</span>
-              I'm a teacher/professor/academic/university, can I get a managed server?
+              I'm a teacher/professor/academic/university,
+              can I get a managed server?
             </h4>
             <p class="text-base">Absolutely. Just get in
               touch with us, and we'll discuss the best way
diff --git a/page-contact.hbs b/page-contact.hbs
index 2cc8b67..682a4aa 100644
--- a/page-contact.hbs
+++ b/page-contact.hbs
@@ -59,6 +59,17 @@
         </div>
       </div>
 
+       <div class="relative py-10 my-5 rounded-2xl overflow-hidden flex col-span-2">
+        <div class="relative block mx-auto self-center text-center ">
+
+            <div class="flex space-x-6 justify-center md:justify-start">
+              {{> extras/socialLinks }}
+            </div>
+        </div>
+      </div>
+
+      {{> landing/newsletter }}
+
 {{!--       <div class="relative py-10 my-5 rounded-2xl overflow-hidden flex col-span-2">
         <div class="relative block mx-auto self-center text-center">
 
diff --git a/page-getstarted.hbs b/page-getstarted.hbs
new file mode 100644
index 0000000..585c0f4
--- /dev/null
+++ b/page-getstarted.hbs
@@ -0,0 +1,143 @@
+{{!< default}}
+
+{{#post}}
+  {{> extras/patterns}}
+
+  <article class="relative">
+    <main class="w-default h-screen/3 flex flex-wrap content-center mt-24">
+      <div class="w-3/3">
+        <h1 class="text-4xl tracking-tight font-extrabold text-gray-900 dark:text-gray-100 sm:text-5xl md:text-6xl">
+          <span class="inline-block xl:inline text-gradient text-gradient bg-gradient-to-r from-blue-500 to-blue-700">
+            {{title}}
+          </span>
+        </h1>
+        <div class="post-body text-gray-500 text-base text-justify sm:text-lg md:text-xl md:max-w-6xl mt-10">
+          We are working round the clock to kick off
+          Speckle 2. If you are interested in participating
+          in our 2.0 beta launch programme, please register
+          below!
+        </div>
+      </div>
+    </main>
+
+    {{> pricingWithPro }}
+    {{!-- {{> pricing }} --}}
+
+    <header class="mb-10 mt-24 px-4 lg:px-8 relative sm:px-6 pb-10">
+      <div class="mx-auto max-w-prose object-center justify-center">
+        <h1>
+          <span class="font-extrabold leading-8 text-4xl text-gray-700 tracking-tight mt-12 dark:text-gray-100 ">
+            Q&As:
+          </span>
+        </h1>
+        <div class="leading-8 mx-auto max-w-prose mt-8">
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              Which is the best plan for me?
+            </h4>
+            <p class="text-base">
+              If you are a large enterprise or have special
+              data sovereignty
+              requirements for your project, the
+              Managed plan is best suited to cover your
+              needs. We support deploying Speckle on your
+              own infrastructure, or ours.
+              <br>
+              For everyday usage & just getting things
+              done, we recommend the Standard plan.
+            </p>
+          </div>
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              Can you deploy Speckle on Azure, AWS, or GCP?
+            </h4>
+            <p class="text-base">
+              Yes. As part of the Managed plan, we can
+              deploy Speckle for you on any cloud provider
+              your company might
+              be using.
+            </p>
+          </div>
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              Do you provide support for self-hosted
+              versions?
+            </h4>
+            <p class="text-base">Unfortunately we cannot do
+              so, for more reasons than one. First, it's
+              difficult to debug a setup without having
+              access to it. Second, to have access to it
+              implies we would be seeing very private
+              details of your infrastructure - which you
+              don't want us to do without a contract in
+              place.
+              <br>
+              <br>
+              If you want a support package for self-hosted
+              versions, <a class="text-blue-500 font-normal"
+                href="/contact">
+                don't hesitate to get in touch!</a>
+            </p>
+          </div>
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              Will the Standard plan always be free?
+            </h4>
+            <p class="text-base">Yes.
+            </p>
+          </div>
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              I'm a teacher/professor/academic/university,
+              can I get a managed server?
+            </h4>
+            <p class="text-base">Absolutely. Just get in
+              touch with us, and we'll discuss the best way
+              to go forward. <a class="text-blue-500 font-normal"
+                href="/contact">
+                Contact us.</a>
+            </p>
+          </div>
+
+          <div class="my-5 text-xl text-gray-700 dark:text-gray-200">
+            <h4 class="text-xl mb-4">
+              <span class="text-blue-600 font-bold">Q:</span>
+              What does "Speckle" stand for?
+            </h4>
+            <p class="text-base">
+              Only a few people know this. It's a closely
+              guarded secret, but if you find out - let us
+              know and we'll send you a sticker pack.
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <div class="max-w-prose mx-auto py-10 px-5 lg:px-0">
+
+        <div class="relative py-10 my-5 rounded-2xl overflow-hidden flex col-span-2 transition hover:shadow-2xl bg-white dark:bg-gray-900">
+          <div class="relative block mx-auto self-center text-center">
+            <a href="/contact" class="w-full h-full flex content-center">
+              <div class=" text-2xl font-semibold text-blue-600">
+                Still have questions? Contact us →
+              </div>
+            </a>
+          </div>
+        </div>
+      </div>
+
+    </header>
+
+  </article>
+
+{{/post}}
\ No newline at end of file
diff --git a/partials/aboutHeader.hbs b/partials/aboutHeader.hbs
new file mode 100644
index 0000000..220f26a
--- /dev/null
+++ b/partials/aboutHeader.hbs
@@ -0,0 +1,53 @@
+<main class="w-default flex flex-wrap content-center mt-36">
+  <div class="px-10">
+    <h1 class="text-4xl tracking-tight font-extrabold text-gray-900 dark:text-gray-100 sm:text-5xl md:text-6xl">
+
+      <span class="inline-block xl:inline text-gradient text-gradient bg-gradient-to-r from-blue-500 to-blue-700">
+        Our mission is to revolutionise the AEC
+        industry's digital performance - with open source.
+      </span>
+    </h1>
+    <p class="text-4xl text-justify text-gray-700 dark:text-gray-100 md:max-w-6xl mt-10">
+
+    </p>
+  </div>
+  <div class="w-default mt-20 my-0 grid grid-cols-1 md:grid-cols-2 gap-10 mb-10">
+    <div class="relative border-l-4 dark:border-gray-700">
+      <h2 class="text-xl pl-5 mb-5 font-bold text-blue-600">What
+        is Speckle?</h2>
+      <p class=" pl-5 text-base text-gray-800 dark:text-gray-400">
+        Speckle is a cloud based solution for the AEC industry that provides
+        honest interoperability, real time
+        collaboration, data management, versioning and automation.
+      </p>
+    </div>
+    <div class="grid md:grid-cols-1 gap-5 w-full -px-5">
+
+      <div class="relative h-16 md:h-16 lg:h-16 rounded-2xl overflow-hidden transition hover:shadow-2xl p-5 flex col-span-2 sm:col-span-1 bg-white dark:bg-gray-900 ">
+        <a href="/usecases" class="flex w-full h-full">
+          <div class="block self-center w-full">
+            <div class="text-xl font-semibold text-blue-600">
+              Usecases →
+            </div>
+          </div>
+        </a>
+      </div>
+
+      <div class="relative h-16 md:h-16 lg:h-16 rounded-2xl overflow-hidden transition hover:shadow-2xl p-5 flex col-span-2 sm:col-span-1 bg-white dark:bg-gray-900 ">
+        <a href="/developers" class="flex w-full h-full">
+          <div class="block self-center w-full">
+            <div class="text-xl font-semibold text-blue-600">
+              For Developers →
+            </div>
+          </div>
+        </a>
+      </div>
+
+    </div>
+
+  </div>
+
+  <div class="w-default my-10 ">
+
+  </div>
+</main>
\ No newline at end of file
diff --git a/partials/cardCTA.hbs b/partials/cardCTA.hbs
index b803f74..2f04bb7 100644
--- a/partials/cardCTA.hbs
+++ b/partials/cardCTA.hbs
@@ -18,7 +18,7 @@
           {{/if}}
         </p>
         <div class="rounded-xl shadow-xl mt-5">
-          <a href="/beta" class="flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 md:py-4 md:text-lg md:px-10">
+          <a href="/getstarted" class="flex items-center justify-center px-8 py-3 border border-transparent text-base font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 md:py-4 md:text-lg md:px-10">
             {{#if buttonText}}
               {{buttonText}}
             {{else}}
diff --git a/partials/extras/companyDetails.hbs b/partials/extras/companyDetails.hbs
index 9725d5d..6f042f7 100644
--- a/partials/extras/companyDetails.hbs
+++ b/partials/extras/companyDetails.hbs
@@ -5,6 +5,5 @@
 
 <div class="px-5 mb-20 mt-4 sm:px-10 md:mx-auto max-w-4xl text-xs dark:text-gray-200 text-center">
   Aec Systems Ltd is a private limited company registered
-  in England and Wales. Company No. 12403784. Address:
-  20-22 Wenlock Road, London, England, N1 7GU, UK
+  in England and Wales. Company No. 12403784.
 </div>
\ No newline at end of file
diff --git a/partials/extras/listItem.hbs b/partials/extras/listItem.hbs
index 150e3df..6593349 100644
--- a/partials/extras/listItem.hbs
+++ b/partials/extras/listItem.hbs
@@ -7,7 +7,7 @@
         stroke-width="2" d="M5 13l4 4L19 7" />
     </svg>
   </div>
-  <p class="text-base dark:text-gray-200 ml-3">
+  <p class="dark:text-gray-200 ml-3">
     {{ value }}
   </p>
 </li>
\ No newline at end of file
diff --git a/partials/extras/socialLinks.hbs b/partials/extras/socialLinks.hbs
new file mode 100644
index 0000000..ba5a1db
--- /dev/null
+++ b/partials/extras/socialLinks.hbs
@@ -0,0 +1,36 @@
+<a href="https://github.com/specklesystems"
+class="text-gray-800 transition dark:text-gray-200 hover:text-gray-500">
+  <span class="sr-only">GitHub</span>
+  <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
+    aria-hidden="true">
+    <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+      clip-rule="evenodd"></path>
+  </svg>
+</a>
+
+<a href="https://twitter.com/SpeckleSystems" class="text-gray-800 transition dark:text-gray-200 hover:text-gray-500">
+  <span class="sr-only">Twitter</span>
+  <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
+    aria-hidden="true">
+    <path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84"></path>
+  </svg>
+</a>
+
+
+<a href="https://www.linkedin.com/company/specklesystems"
+  class="text-gray-800 transition dark:text-gray-200 hover:text-gray-500">
+  <span class="sr-only">Linkedin</span>
+  <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
+    aria-hidden="true">
+    <path d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z" />
+  </svg>
+</a>
+
+<a href="https://www.instagram.com/specklesystems/" class="text-gray-800 transition dark:text-gray-200 hover:text-gray-500">
+  <span class="sr-only">Instagram</span>
+  <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
+    aria-hidden="true">
+    <path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z"
+      clip-rule="evenodd"></path>
+  </svg>
+</a>
\ No newline at end of file
diff --git a/partials/footer.hbs b/partials/footer.hbs
index 8cd2865..ee57c83 100644
--- a/partials/footer.hbs
+++ b/partials/footer.hbs
@@ -14,39 +14,14 @@
         {{@site.description}}
       </p>
       <div class="flex space-x-6 justify-center md:justify-start">
-
-        <a href="#" class="text-gray-800 dark:text-gray-200 hover:text-gray-500">
-          <span class="sr-only">Instagram</span>
-          <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
-            aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.315 2c2.43 0 2.784.013 3.808.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.772 1.153 4.902 4.902 0 011.153 1.772c.247.636.416 1.363.465 2.427.048 1.067.06 1.407.06 4.123v.08c0 2.643-.012 2.987-.06 4.043-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.153 1.772 4.902 4.902 0 01-1.772 1.153c-.636.247-1.363.416-2.427.465-1.067.048-1.407.06-4.123.06h-.08c-2.643 0-2.987-.012-4.043-.06-1.064-.049-1.791-.218-2.427-.465a4.902 4.902 0 01-1.772-1.153 4.902 4.902 0 01-1.153-1.772c-.247-.636-.416-1.363-.465-2.427-.047-1.024-.06-1.379-.06-3.808v-.63c0-2.43.013-2.784.06-3.808.049-1.064.218-1.791.465-2.427a4.902 4.902 0 011.153-1.772A4.902 4.902 0 015.45 2.525c.636-.247 1.363-.416 2.427-.465C8.901 2.013 9.256 2 11.685 2h.63zm-.081 1.802h-.468c-2.456 0-2.784.011-3.807.058-.975.045-1.504.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.353-.3.882-.344 1.857-.047 1.023-.058 1.351-.058 3.807v.468c0 2.456.011 2.784.058 3.807.045.975.207 1.504.344 1.857.182.466.399.8.748 1.15.35.35.683.566 1.15.748.353.137.882.3 1.857.344 1.054.048 1.37.058 4.041.058h.08c2.597 0 2.917-.01 3.96-.058.976-.045 1.505-.207 1.858-.344.466-.182.8-.398 1.15-.748.35-.35.566-.683.748-1.15.137-.353.3-.882.344-1.857.048-1.055.058-1.37.058-4.041v-.08c0-2.597-.01-2.917-.058-3.96-.045-.976-.207-1.505-.344-1.858a3.097 3.097 0 00-.748-1.15 3.098 3.098 0 00-1.15-.748c-.353-.137-.882-.3-1.857-.344-1.023-.047-1.351-.058-3.807-.058zM12 6.865a5.135 5.135 0 110 10.27 5.135 5.135 0 010-10.27zm0 1.802a3.333 3.333 0 100 6.666 3.333 3.333 0 000-6.666zm5.338-3.205a1.2 1.2 0 110 2.4 1.2 1.2 0 010-2.4z"
-              clip-rule="evenodd"></path>
-          </svg>
-        </a>
-
-        <a href="#" class="text-gray-800 dark:text-gray-200 hover:text-gray-500">
-          <span class="sr-only">Twitter</span>
-          <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
-            aria-hidden="true">
-            <path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84"></path>
-          </svg>
-        </a>
-
-        <a href="#" class="text-gray-800 dark:text-gray-200 hover:text-gray-500">
-          <span class="sr-only">GitHub</span>
-          <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
-            aria-hidden="true">
-            <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
-              clip-rule="evenodd"></path>
-          </svg>
-        </a>
-
+        {{> extras/socialLinks }}
       </div>
       <div class="mt-10">
-      {{> navbarCTA }}
+        {{> navbarCTA }}
       </div>
       <p class="text-gray-500 text-xs mt-10">
-        © Aec Systems
+        © Aec Systems. Speckle is a trademark of AEC Systems Ltd., registered
+        in the UK and in other countries.
       </p>
 
     </div>
diff --git a/partials/landing/blogPreview.hbs b/partials/landing/blogPreview.hbs
index 5283d31..fc32e36 100644
--- a/partials/landing/blogPreview.hbs
+++ b/partials/landing/blogPreview.hbs
@@ -3,15 +3,12 @@
     <div class="relative w-default container mx-auto pb-20 lg:pb-32">
       <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4 text-gray-500 dark:text-gray-600">
 
-        {{#foreach posts}}
-          {{> cardBlogSm }}
-        {{/foreach}}
 
         <div>
-          <div class="relative ">
-            <h2 class="text-2xl pl-5 mb-5 font-bold text-blue-600">Pressroom</h2>
+          <div class="relative border-l-4 dark:border-gray-700">
+            <h2 class="text-4xl pl-5 mb-5 font-bold text-blue-600">Blog</h2>
             <p class=" pl-5 text-lg text-gray-800 dark:text-gray-400">
-              Latest news from the Speckle Blog.
+              Latest news from Speckle.
             </p>
 
           </div>
@@ -26,6 +23,10 @@
           </div>
         </div>
 
+        {{#foreach posts}}
+          {{> cardBlogSm }}
+        {{/foreach}}
+
       </div>
     </div>
   </div>
diff --git a/partials/landing/features-wide.hbs b/partials/landing/features-wide.hbs
index f970753..ef9fbaa 100644
--- a/partials/landing/features-wide.hbs
+++ b/partials/landing/features-wide.hbs
@@ -7,7 +7,7 @@
       <p class=" pl-5 text-lg text-gray-800 dark:text-gray-400">
         We bring together everything that's needed to build
         modern workflows and apps that use geometry
-        and data - BIM -
+        and data - <b>BIM</b> -
         in a cloud environment. Speckle's
         products power collaborative interoperability,
         real-time data exchange,
diff --git a/partials/landing/newsletter.hbs b/partials/landing/newsletter.hbs
new file mode 100644
index 0000000..081d832
--- /dev/null
+++ b/partials/landing/newsletter.hbs
@@ -0,0 +1,7 @@
+<div class="relative w-default text-center pt-10 mb-10">
+  <h2 class="text-2xl pl-5 mb-5 text-gray-800 dark:text-gray-400"><span class="text-blue-600">Newsletter:</span> Subscribe to stay in touch with future updates!</h2>
+  <iframe class="mj-w-res-iframe" frameborder="0" scrolling="no"
+    marginheight="0" marginwidth="0" src="https://app.mailjet.com/widget/iframe/5q9H/Hvk"
+    width="100%"></iframe>
+</div>
+<script type="text/javascript" src="https://app.mailjet.com/statics/js/iframeResizer.min.js"></script>
\ No newline at end of file
diff --git a/partials/menus/learnMenu.hbs b/partials/menus/learnMenu.hbs
index 92e7953..62a97e4 100644
--- a/partials/menus/learnMenu.hbs
+++ b/partials/menus/learnMenu.hbs
@@ -1,5 +1,32 @@
-<a href="https://speckle.community" target="blank"
-  class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
+<a href="/blog" class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800 ring">
+  <div class="flex-shrink-0">
+    <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-gray-500 dark:text-white sm:h-12 sm:w-12">
+      <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg"
+        fill="none" viewBox="0 0 24 24" stroke="currentColor"
+        aria-hidden="true">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          stroke-width="2" d="M11 5.882V19.24a1.76 1.76 0 01-3.417.592l-2.147-6.15M18 13a3 3 0 100-6M5.436 13.683A4.001 4.001 0 017 6h1.832c4.1 0 7.625-1.234 9.168-3v14c-1.543-1.766-5.067-3-9.168-3H7a3.988 3.988 0 01-1.564-.317z" />
+      </svg>
+    </span>
+  </div>
+  <div class="flex items-center md:h-full lg:flex-col">
+    <div class="ml-4 md:flex-1 md:flex md:flex-col md:justify-between lg:ml-0 lg:mt-4">
+      <div>
+        <p class="text-base font-medium text-gray-900 dark:text-gray-50">
+          Blog
+        </p>
+        <p class="mt-1 text-sm text-gray-900 dark:text-gray-50">
+          Latest news, thoughts and geeky tech articles
+          from the team.
+        </p>
+      </div>
+      <p class="mt-2 text-sm font-medium text-blue-600 lg:mt-4">Read
+        More <span aria-hidden="true">→</span></p>
+    </div>
+  </div>
+</a>
+
+<a href="https://speckle.guide" target="blank" class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
   <div class="flex-shrink-0">
     <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-gray-500 dark:text-white sm:h-12 sm:w-12">
       <svg class="h-6 w-6" x-description="Heroicon name: chart-bar"
@@ -15,7 +42,7 @@
     <div class="ml-4 md:flex-1 md:flex md:flex-col md:justify-between lg:ml-0 lg:mt-4">
       <div>
         <p class="text-base font-bold text-gray-900 dark:text-gray-50">
-          speckle.guide
+          Docs
         </p>
         <p class="mt-1 text-sm font-normal  text-gray-900 dark:text-gray-50">
           Documentation and step-by-step guides on how to
@@ -28,8 +55,7 @@
   </div>
 </a>
 
-<a href="https://speckle.guide" target="blank"
-  class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
+<a href="https://speckle.community" target="blank" class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
   <div class="flex-shrink-0">
     <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-gray-500 dark:text-white sm:h-12 sm:w-12">
       <svg class="h-6 w-6" x-description="Heroicon name: chart-bar"
@@ -46,10 +72,11 @@
     <div class="ml-4 md:flex-1 md:flex md:flex-col md:justify-between lg:ml-0 lg:mt-4">
       <div>
         <p class="text-base font-bold text-gray-900 dark:text-gray-50">
-          speckle.community
+          Community
         </p>
         <p class="mt-1 text-sm font-normal text-gray-900 dark:text-gray-50">
-          Where specklers usually hang out. Q&As, Dev Help, Showcases, and more!
+          Where specklers usually hang out. Q&As, Dev Help,
+          Showcases, and more!
         </p>
       </div>
       <p class="mt-2 text-sm font-medium text-blue-600 lg:mt-4">Register
@@ -58,41 +85,14 @@
   </div>
 </a>
 
-<a href="/blog" class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
+<a href="https://github.com/specklesystems/speckle-server"
+  class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
   <div class="flex-shrink-0">
     <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-gray-500 dark:text-white sm:h-12 sm:w-12">
-      <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg"
-        fill="none" viewBox="0 0 24 24" stroke="currentColor"
+      <svg class="h-6 w-6" fill="currentColor" viewBox="0 0 24 24"
         aria-hidden="true">
-        <path stroke-linecap="round" stroke-linejoin="round"
-          stroke-width="2" d="M11 5.882V19.24a1.76 1.76 0 01-3.417.592l-2.147-6.15M18 13a3 3 0 100-6M5.436 13.683A4.001 4.001 0 017 6h1.832c4.1 0 7.625-1.234 9.168-3v14c-1.543-1.766-5.067-3-9.168-3H7a3.988 3.988 0 01-1.564-.317z" />
-      </svg>
-    </span>
-  </div>
-  <div class="flex items-center md:h-full lg:flex-col">
-    <div class="ml-4 md:flex-1 md:flex md:flex-col md:justify-between lg:ml-0 lg:mt-4">
-      <div>
-        <p class="text-base font-medium text-gray-900 dark:text-gray-50">
-          speckle blog
-        </p>
-        <p class="mt-1 text-sm text-gray-900 dark:text-gray-50">
-          Latest news, thoughts and geeky tech articles from the team.
-        </p>
-      </div>
-      <p class="mt-2 text-sm font-medium text-blue-600 lg:mt-4">Read
-        More <span aria-hidden="true">→</span></p>
-    </div>
-  </div>
-</a>
-
-<a href="/blog" class="-m-3 p-3 flex flex-col justify-between rounded-lg transition dark:bg-gray-950 hover:bg-blue-100 dark:hover:bg-gray-800">
-  <div class="flex-shrink-0">
-    <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-gray-500 dark:text-white sm:h-12 sm:w-12">
-      <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg"
-        fill="none" viewBox="0 0 24 24" stroke="currentColor"
-        aria-hidden="true">
-        <path stroke-linecap="round" stroke-linejoin="round"
-          stroke-width="2" d="M11 5.882V19.24a1.76 1.76 0 01-3.417.592l-2.147-6.15M18 13a3 3 0 100-6M5.436 13.683A4.001 4.001 0 017 6h1.832c4.1 0 7.625-1.234 9.168-3v14c-1.543-1.766-5.067-3-9.168-3H7a3.988 3.988 0 01-1.564-.317z" />
+        <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+          clip-rule="evenodd"></path>
       </svg>
     </span>
   </div>
diff --git a/partials/menus/tagDropdownMenu.hbs b/partials/menus/tagDropdownMenu.hbs
index c0a393a..8656871 100644
--- a/partials/menus/tagDropdownMenu.hbs
+++ b/partials/menus/tagDropdownMenu.hbs
@@ -10,18 +10,6 @@
       {{#get "tags" limit="all" filter="slug:{{tag}}"}}
         {{#foreach tags}}
           <div class="flex md:h-full lg:flex-col">
-            <div class="flex-shrink-0">
-              <span class="inline-flex items-center justify-center h-64 w-64 rounded-md text-white sm:h-12 sm:w-12">
-                <svg class="h-6 w-6" x-description="Heroicon name: chart-bar"
-                  xmlns="http://www.w3.org/2000/svg" fill="none"
-                  viewBox="0 0 24 24" stroke="currentColor"
-                  aria-hidden="true">
-                  <path stroke-linecap="round"
-                    stroke-linejoin="round" stroke-width="2"
-                    d="M5 3v4M3 5h4M6 17v4m-2-2h4m5-16l2.286 6.857L21 12l-5.714 2.143L13 21l-2.286-6.857L5 12l5.714-2.143L13 3z" />
-                </svg>
-              </span>
-            </div>
             <div class="ml-4 md:flex-1 md:flex md:flex-col md:justify-between lg:ml-0 lg:mt-4">
               <div>
                 <p class="text-2xl font-medium ">
diff --git a/partials/navbarCTA.hbs b/partials/navbarCTA.hbs
index 2eff98a..5586b54 100644
--- a/partials/navbarCTA.hbs
+++ b/partials/navbarCTA.hbs
@@ -1,3 +1,3 @@
-<a href="/beta" class="inline-flex w-full items-center justify-center px-4 py-2 border border-transparent transition rounded-md shadow-sm text-base font-medium text-white bg-blue-600 hover:bg-blue-700 hover:shadow-xl">
+<a href="/getstarted" class="inline-flex w-full items-center justify-center px-4 py-2 border border-transparent transition rounded-md shadow-sm text-base font-medium text-white bg-blue-600 hover:bg-blue-700 hover:shadow-xl">
   Join the beta
 </a>
\ No newline at end of file
diff --git a/partials/pricing.hbs b/partials/pricing.hbs
index 7ccbeb3..6631c9e 100644
--- a/partials/pricing.hbs
+++ b/partials/pricing.hbs
@@ -1,77 +1,119 @@
-<div class="bg-white p-10 col-span-1 lg:col-span-3 shadow-xl rounded-xl dark:bg-gray-900 relative ring dark:ring-blue-700">
-  <div>
-    <h3 class="bg-blue-100 font-semibold text-base text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
-      <span class="hidden md:inline-block mr-1">Speckle for</span> Teams & Individuals
-    </h3>
-    <h2 class="font-bold text-4xl mt-5 dark:text-gray-300">
-      Standard
-      <span class="font-medium text-base text-blue-600">Free</span>
-    </h2>
-    <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-300">
-      Our standard plan for individuals & teams.
-      Enjoy
-      Speckle without extra hassle.
-    </p>
-    <p class="mb-2  dark:text-gray-300">Interoperability:</p>
-    <ul class="space-y-2 ">
-      {{> extras/listItem value="Speckle Revit"}}
-      {{> extras/listItem value="Speckle Rhino"}}
-      {{> extras/listItem value="Speckle Dynamo"}}
-      {{> extras/listItem value="Speckle Grasshopper"}}
-      {{> extras/listItem value="And More "}}
-    </ul>
-    <p class="my-4  dark:text-gray-300">Features:</p>
-    <ul class="space-y-2 ">
-      {{> extras/listItem value="Unlimited streams"}}
-      {{> extras/listItem value="Unlimited versions"}}
-      {{> extras/listItem value="Web 3d viewer"}}
-      {{> extras/listItem value="API Access"}}
-      {{> extras/listItem value="App Registration"}}
-      {{> extras/listItem value="Community support"}}
-    </ul>
+
+{{!-- Plans  --}}
+
+<div class="relative w-default mb-20 gap-4 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5">
+
+  {{!-- Standard --}}
+
+  <div class="bg-white p-10 col-span-1 lg:col-span-3 shadow-xl rounded-xl dark:bg-gray-900 relative ring dark:ring-blue-700">
+    <div>
+      <h3 class="bg-blue-100 font-semibold text-base text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
+        <span class="hidden md:inline-block mr-1">Speckle
+          for</span> Teams & Individuals
+      </h3>
+      <h2 class="font-bold text-4xl mt-5 dark:text-gray-300">
+        Standard
+        <span class="font-medium text-base text-blue-600">Free</span>
+      </h2>
+      <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-300">
+        Our standard plan for individuals & teams.
+        Enjoy
+        Speckle without extra hassle, hosted and managed by
+        us.
+      </p>
+      <p class="mb-2  dark:text-gray-300">Interoperability:</p>
+      <ul class="space-y-2 ">
+        {{> extras/listItem value="Speckle Revit"}}
+        {{> extras/listItem value="Speckle Rhino"}}
+        {{> extras/listItem value="Speckle Dynamo"}}
+        {{> extras/listItem value="Speckle Grasshopper"}}
+        {{> extras/listItem value="And More "}}
+      </ul>
+      <p class="my-4  dark:text-gray-300">Features:</p>
+      <ul class="space-y-2 ">
+        {{> extras/listItem value="Unlimited streams"}}
+        {{> extras/listItem value="Unlimited versions"}}
+        {{> extras/listItem value="Web 3d viewer"}}
+        {{> extras/listItem value="API Access"}}
+        {{> extras/listItem value="App Registration"}}
+        {{> extras/listItem value="Community support"}}
+      </ul>
+    </div>
+    {{!-- <div class="h-16 absolute bottom-0 inset-x-0"> --}}
+    <div class="self-end mt-10 ">
+      <a href="https://forms.gle/oA64wPTjk7FprGf16">
+        <button class="w-full bg-blue-600 font-medium text-base text-white px-4 py-2 shadow-sm border-transparent rounded-md border hover:bg-blue-700 hover:shadow-xl transition">
+          Join the waiting list
+        </button>
+      </a>
+    </div>
   </div>
-  {{!-- <div class="h-16 absolute bottom-0 inset-x-0"> --}}
-  <div class="self-end mt-10 ">
-    <a href="https://forms.gle/oA64wPTjk7FprGf16">
+
+
+  {{!-- Managed --}}
+
+  <div class="bg-gray-50 dark:bg-gray-800 col-span-1 lg:col-span-2 p-10 flex-wrap rounded-xl flex relative">
+    <div class="w-full">
+      <h3 class="bg-blue-100 font-semibold text-base text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
+        <span class="hidden md:inline-block mr-1">Speckle
+          for</span> Enterprises
+      </h3>
+      <h2 class="font-bold text-4xl mt-5  dark:text-gray-200">
+        Managed
+      </h2>
+      <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-200">
+        Dedicated solutions for enterprises, large
+        teams or projects.
+      </p>
+      <ul class="font-bold space-y-2 ">
+        {{> extras/listItem value="Everyting in Standard"}}
+      </ul>
+      <p class="my-4  dark:text-gray-200">Deployment:</p>
+      <ul class="space-y-2 ">
+        {{> extras/listItem value="On premise, with your cloud infrastructure"}}
+        {{> extras/listItem value="On our managed cloud infrastructure"}}
+      </ul>
+      <p class="my-4  dark:text-gray-200">Extras:</p>
+      <ul class="space-y-2 ">
+        {{> extras/listItem value="Custom subdomain"}}
+        {{> extras/listItem value="Choice of locations"}}
+        {{> extras/listItem value="SSO (Single sign-on)"}}
+        {{> extras/listItem value="SLA (Service Level Agreement)"}}
+        {{> extras/listItem value="Dedicated Support"}}
+      </ul>
+    </div>
+    <div class="self-end mt-10 w-full">
       <button class="w-full bg-blue-600 font-medium text-base text-white px-4 py-2 shadow-sm border-transparent rounded-md border hover:bg-blue-700 hover:shadow-xl transition">
-        Join the waiting list
+        Contact Sales
       </button>
-    </a>
+    </div>
   </div>
 </div>
 
-<div class="bg-gray-50 dark:bg-gray-800 col-span-1 lg:col-span-2 p-10 flex-wrap rounded-xl flex relative">
-  <div class="w-full">
-    <h3 class="bg-blue-100 font-semibold text-base text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
-      <span class="hidden md:inline-block mr-1">Speckle for</span> Enterprises
-    </h3>
-    <h2 class="font-bold text-4xl mt-5  dark:text-gray-200">
-      Managed
+{{!-- Non-plans --}}
+
+<div class="relative max-w-prose p-5 mx-auto mb-20 pb-5 grid grid-cols-3 gap-4 bg-white dark:bg-gray-900 rounded-xl transition hover:shadow-xl">
+  <div class="col-span-3 md:col-span-2">
+    <h2 class="font-bold text-xl mt-5 text-gray-700 dark:text-gray-200">
+      Self Hosting
     </h2>
-    <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-200">
-      Dedicated solutions for enterprises, large
-      teams or projects.
+    <p class="mb-5 mt-5 dark:text-gray-200">
+      Speckle is open source. You can always deploy it
+      on your own.
     </p>
-    <ul class="font-bold space-y-2 ">
-      {{> extras/listItem value="Everyting in Standard"}}
-    </ul>
-    <p class="my-4  dark:text-gray-200">Deployment:</p>
-    <ul class="space-y-2 ">
-      {{> extras/listItem value="On premise, with your cloud infrastructure"}}
-      {{> extras/listItem value="On our managed cloud infrastructure"}}
-    </ul>
-    <p class="my-4  dark:text-gray-200">Extras:</p>
-    <ul class="space-y-2 ">
-      {{> extras/listItem value="Custom subdomain"}}
-      {{> extras/listItem value="Choice of locations"}}
-      {{> extras/listItem value="SSO (Single sign-on)"}}
-      {{> extras/listItem value="SLA (Service Level Agreement)"}}
-      {{> extras/listItem value="Dedicated Support"}}
-    </ul>
   </div>
-  <div class="self-end mt-10 w-full">
-    <button class="w-full bg-blue-600 font-medium text-base text-white px-4 py-2 shadow-sm border-transparent rounded-md border hover:bg-blue-700 hover:shadow-xl transition">
-      Contact Sales
-    </button>
+  <div class="col-span-3 md:col-span-1 justify-center">
+    <a href="https://github.com/specklesystems" class="flex w-full h-full">
+      <div class="block self-center w-full text-center">
+        <div class="text-xl font-semibold text-blue-600 text-center">
+          <svg class="h-6 w-6 inline -mt-2" fill="currentColor"
+            viewBox="0 0 24 24" aria-hidden="true">
+            <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+              clip-rule="evenodd"></path>
+          </svg>
+          Github →
+        </div>
+      </div>
+    </a>
   </div>
 </div>
\ No newline at end of file
diff --git a/partials/pricingWithPro.hbs b/partials/pricingWithPro.hbs
new file mode 100644
index 0000000..89dc1f5
--- /dev/null
+++ b/partials/pricingWithPro.hbs
@@ -0,0 +1,161 @@
+{{!-- Plans  --}}
+<div class="px-10 lg:px-4 xl:px-10 mx-auto max-w-screen-2xl">
+  <div class="mb-20 gap-4 grid-cols-1 grid lg:grid-cols-7 md:grid-cols-2 relative">
+
+    {{!-- Standard --}}
+
+    <div class="bg-white p-8 col-span-1 shadow-xl transition hover:shadow-2xl rounded-xl dark:bg-gray-900 dark:ring-blue-700 md:col-span-2 lg:col-span-3 relative ring hover:ring-4">
+      <div>
+        <h3 class="bg-blue-100 text-sm text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
+          Individuals & Teams
+        </h3>
+        <h2 class="font-bold text-4xl mt-5 dark:text-gray-300">
+          Standard
+          <span class="font-bold text-base text-blue-600">Free</span>
+        </h2>
+        <div class="text-base lg:text-sm xl:text-base">
+          <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-300">
+            Our standard plan for individuals & teams.
+            Enjoy
+            Speckle without extra hassle, hosted and
+            managed
+            by
+            us.
+          </p>
+          <p class="mb-2 dark:text-gray-300">Interoperability & Connectors:</p>
+          <ul class="space-y-2 ">
+            {{> extras/listItem value="Speckle Revit"}}
+            {{> extras/listItem value="Speckle Rhino"}}
+            {{> extras/listItem value="Speckle Dynamo"}}
+            {{> extras/listItem value="Speckle Grasshopper"}}
+            {{> extras/listItem value="And More "}}
+          </ul>
+          <p class="my-4 dark:text-gray-300">Features:</p>
+          <ul class="space-y-2 ">
+            {{> extras/listItem value="Unlimited streams"}}
+            {{> extras/listItem value="Unlimited versions"}}
+            {{> extras/listItem value="Web 3d viewer"}}
+            {{> extras/listItem value="API Access"}}
+            {{> extras/listItem value="App Registration"}}
+            {{> extras/listItem value="Community support"}}
+          </ul>
+        </div>
+      </div>
+      {{!-- <div class="h-16 absolute bottom-0 inset-x-0"> --}}
+      <div class="self-end mt-10 ">
+        <a href="https://forms.gle/oA64wPTjk7FprGf16">
+          <button class="bg-blue-600 font-medium text-base text-white w-full px-4 py-2 shadow-sm border-transparent rounded-md border hover:bg-blue-700 hover:shadow-xl transition">
+            Join the waiting list
+          </button>
+        </a>
+      </div>
+    </div>
+
+    <div class="p-8 col-span-1 rounded-xl lg:col-span-2 relative opacity-50 flex flex-col place-content-between">
+      <div class="w-2/2">
+        <h3 class="bg-blue-100 text-sm text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
+          Teams & Companies
+        </h3>
+        <h2 class="font-bold text-4xl mt-5 dark:text-gray-300">
+          Pro
+        </h2>
+        <div class="text-base lg:text-sm xl:text-base">
+          <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-300">
+            Everything you need to manage project lifecycle
+            &
+            delivery.
+          </p>
+          <ul class="font-bold space-y-2 ">
+            {{> extras/listItem value="Everyting in Standard"}}
+          </ul>
+          <p class="my-4 dark:text-gray-300">Advanced
+            Collaboration Features:</p>
+          <ul class="space-y-2 ">
+            {{> extras/listItem value="Issue Tracking"}}
+            {{> extras/listItem value="Teams"}}
+            {{> extras/listItem value="SLA (Service Level Agreement)"}}
+            {{> extras/listItem value="Priority Support"}}
+            {{> extras/listItem value="Free for universities & academics"}}
+            {{> extras/listItem value="& More!"}}
+          </ul>
+        </div>
+      </div>
+      {{!-- <div class="h-16 absolute bottom-0 inset-x-0"> --}}
+      <div class="self-end w-full mt-10 w-2/2">
+        <a>
+          <button class="bg-gray-500 font-medium text-base text-white w-full px-4 py-2 shadow-sm border-transparent rounded-md border ">
+            Launching in Q3 2021
+          </button>
+        </a>
+      </div>
+    </div>
+
+
+    {{!-- Managed --}}
+
+    <div class="bg-white dark:bg-gray-900 p-8 col-span-1 flex-wrap shadow-lg rounded-xl dark:bg-gray-800 flex lg:col-span-2 relative">
+      <div class="w-full ">
+        <h3 class="bg-blue-100 text-sm text-blue-600 tracking-wide uppercase px-4 py-1 rounded-full inline-flex">
+          Enterprises
+        </h3>
+        <h2 class="font-bold text-4xl mt-5 dark:text-gray-200">
+          Managed
+        </h2>
+        <div class="text-base lg:text-sm xl:text-base">
+          <p class="mb-5 mt-5 pt-5 border-t dark:border-gray-600 dark:text-gray-200">
+            Dedicated solutions for enterprises, large
+            teams or projects.
+          </p>
+          <ul class="font-bold space-y-2">
+            {{> extras/listItem value="Everyting in Pro"}}
+          </ul>
+          <p class="my-4 dark:text-gray-200">Deployment:</p>
+          <ul class="space-y-2">
+            {{> extras/listItem value="On premise, with your cloud infrastructure"}}
+            {{> extras/listItem value="On our managed cloud infrastructure"}}
+          </ul>
+          <p class="my-4 dark:text-gray-200">Extras:</p>
+          <ul class="space-y-2 ">
+            {{> extras/listItem value="Custom subdomain"}}
+            {{> extras/listItem value="Choice of locations"}}
+            {{> extras/listItem value="SSO (Single sign-on)"}}
+            {{> extras/listItem value="SLA (Service Level Agreement)"}}
+            {{> extras/listItem value="Dedicated Support"}}
+          </ul>
+        </div>
+      </div>
+      <div class="self-end w-full mt-10 ">
+        <button class="bg-blue-600 font-medium text-base text-white w-full px-4 py-2 shadow-sm border-transparent rounded-md border hover:bg-blue-700 hover:shadow-xl transition">
+          Contact Sales
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+{{!-- Non-plans --}}
+
+<div class="bg-white max-w-prose mb-20 mx-auto p-5 pb-5 gap-4 grid-cols-3 rounded-xl dark:bg-gray-900 grid hover:shadow-xl relative transition">
+  <div class="col-span-3 md:col-span-2">
+    <h2 class="font-bold text-gray-700 text-xl mt-5 dark:text-gray-200">
+      Self Hosting
+    </h2>
+    <p class="mb-5 mt-5 dark:text-gray-200">
+      Speckle is open source. You can always deploy it
+      on your own.
+    </p>
+  </div>
+  <div class="justify-center col-span-3 md:col-span-1">
+    <a href="https://github.com/specklesystems" class="h-full w-full flex">
+      <div class="text-center self-center w-full block">
+        <div class="font-semibold text-blue-600 text-center text-xl ">
+          <svg class="h-6 w-6 -mt-1 inline" fill="currentColor"
+            viewBox="0 0 24 24" aria-hidden="true">
+            <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+              clip-rule="evenodd"></path>
+          </svg>
+          Github →
+        </div>
+      </div>
+    </a>
+  </div>
+</div>
\ No newline at end of file