diff --git a/.github/workflows/deploy-frontend-dev.yml b/.github/workflows/deploy-frontend-dev.yml
index 93d8bd434..3f0eb402b 100644
--- a/.github/workflows/deploy-frontend-dev.yml
+++ b/.github/workflows/deploy-frontend-dev.yml
@@ -1,12 +1,9 @@
 name: DeployFrontendServerlessDev
 
 on:
-  workflow_run:
-    workflows: ["DeployBackendDev"]
-    types:
-      - completed
+  push:
     branches:
-      - "master"
+      - "change-schedule-meeting-flow"
 
 jobs:
   deploy-frontend-dev:
diff --git a/nuxt-frontend/components/contact/CalendlyIframe.vue b/nuxt-frontend/components/contact/CalendlyIframe.vue
index ad5293f15..e3593552c 100644
--- a/nuxt-frontend/components/contact/CalendlyIframe.vue
+++ b/nuxt-frontend/components/contact/CalendlyIframe.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full h-[550px] border-0 pt-5 md:h-screen">
+  <div class="w-full h-[550px] border-0 md:h-screen">
     <div v-if="isLoading" class="iframe-loader">
       <img
         :src="loader"
@@ -7,13 +7,13 @@
         alt="loader-image"
       />
     </div>
-    <iframe
-      class="h-screen w-full"
-      :src="calendlyUrl"
-      title="calendly"
-      v-on:load="isLoading = false"
-      v-show="!isLoading"
-    ></iframe>
+    <div v-if="!isLoading" class="h-28" id="calendly-embed-before"></div>
+    <div
+      id="calendly-embed"
+      class="h-[calc(100vh-7rem)] w-full"
+      :data-url="calendlyUrl"
+      style="min-width: 320px"
+    ></div>
   </div>
 </template>
 
@@ -29,5 +29,60 @@ export default {
       isLoading: true,
     };
   },
+  mounted() {
+    this.loadCalendlyWidget();
+    this.initializeCalendlyEventListeners();
+  },
+  beforeDestroy() {
+    window.removeEventListener("message", this.handleCalendlyEvent);
+  },
+  methods: {
+    loadCalendlyWidget() {
+      if (window.Calendly) {
+        this.initCalendlyWidget();
+      } else {
+        const script = document.createElement("script");
+        script.src = "https://assets.calendly.com/assets/external/widget.js";
+        script.async = true;
+        script.onload = this.initCalendlyWidget;
+        document.head.appendChild(script);
+      }
+    },
+    initCalendlyWidget() {
+      Calendly.initInlineWidget({
+        url: this.calendlyUrl,
+        parentElement: document.getElementById("calendly-embed"),
+      });
+    },
+    initializeCalendlyEventListeners() {
+      setTimeout(() => {
+        this.isLoading = false;
+      }, 1000);
+      window.addEventListener("message", this.handleCalendlyEvent);
+    },
+    handleCalendlyEvent(e) {
+      if (
+        e.data.event &&
+        e.data.event.indexOf("calendly") === 0 &&
+        e.data.event === "calendly.event_scheduled"
+      ) {
+        setTimeout(() => {
+          this.$emit("close");
+        }, 2000);
+      }
+    },
+  },
 };
 </script>
+
+<style scroped>
+@media (min-width: 650px) and (max-width: 1000px) {
+  #calendly-embed-before {
+    height: 4.5rem;
+  }
+
+  #calendly-embed {
+    height: calc(100vh - 4.5rem);
+  }
+}
+</style>
diff --git a/nuxt-frontend/components/contact/NewContactForm.vue b/nuxt-frontend/components/contact/NewContactForm.vue
index 4fa7a7c9c..df61684ef 100755
--- a/nuxt-frontend/components/contact/NewContactForm.vue
+++ b/nuxt-frontend/components/contact/NewContactForm.vue
@@ -219,8 +219,8 @@
 <script>
 import axios from "axios";
 import config from "@/config.js";
-import CalendlyIframe from "./CalendlyIframe.vue";
 import loaderImage from "@/assets/images/theme/small-loader.svg";
+
 export default {
   data() {
     return {
@@ -244,16 +244,12 @@ export default {
       showProjectInfoValidationError: false,
       showReferenceValidationError: false,
       showInvestValidationError: false,
-      openCalendlyIframeModal: false,
       errorMessage: "Something went wrong on our side",
       showLoader: false,
       showErrorMessage: false,
       contactType: 1,
     };
   },
-  components: {
-    CalendlyIframe,
-  },
   inject: ["mixpanel"],
   mounted() {
     document.addEventListener("click", this.closePopUps);
@@ -307,13 +303,13 @@ export default {
               axios
                 .post(config.API_BASE + "/api/send-contact-mail", formData)
                 .then(() => {
-                  this.$router.push({
-                    path: "/thank-you",
-                  });
                   localStorage.setItem(
                     "client-name",
                     JSON.stringify(formData.name),
                   );
+                  this.$router.push({
+                    path: "/thank-you",
+                  });
                   this.resetForm();
                 })
                 .catch((err) => {
diff --git a/nuxt-frontend/components/contact/thank-you/BenefitSection.vue b/nuxt-frontend/components/contact/thank-you/BenefitSection.vue
index c95158cf6..cfa090248 100644
--- a/nuxt-frontend/components/contact/thank-you/BenefitSection.vue
+++ b/nuxt-frontend/components/contact/thank-you/BenefitSection.vue
@@ -3,8 +3,11 @@
     <p
       class="container text-center mobile-header-2 lg:desk-header-2 text-black-87 2xl:max-w-[67%] xll:max-w-[45%] 3xl:max-w-[28%] 2xl:mx-auto"
     >
-      Here are some of the things you will get by working with us that make us
-      special according to our past customers.
+      Why Canopas?
+    </p>
+    <p class="container text-center mt-2 lg:mt-6 text-black-4 lg:text-2xl">
+      Discover what makes us unique through the experiences of our satisfied
+      customers.
     </p>
     <div class="absolute w-full h-full lg:hidden">
       <img
diff --git a/nuxt-frontend/components/contact/thank-you/InformationPoints.vue b/nuxt-frontend/components/contact/thank-you/InformationPoints.vue
new file mode 100644
index 000000000..0cead874e
--- /dev/null
+++ b/nuxt-frontend/components/contact/thank-you/InformationPoints.vue
@@ -0,0 +1,49 @@
+<template>
+  <div class="container my-32 lg:my-44 flex flex-col gap-14">
+    <p
+      class="text-center mobile-header-3-semibold lg:desk-header-3 text-black-80"
+    >
+      We just want you to make an informed decision and we hope this information
+      might help you get a clear understanding of the exceptional customer
+      experiences we offer at
+      <span class="text-primary-1">Canopas.</span>
+    </p>
+    <div class="flex flex-col gap-7 lg:px-5">
+      <div class="flex gap-2 sm:gap-4 lg:gap-6">
+        <img
+          src="/images/clients/thank-you/finger-hand.svg"
+          alt="finger-hand-bullet"
+          class="h-fit"
+        />
+        <p
+          class="text-black-4 border-b-2 border-dashed border-black-4 sm:text-lg lg:text-2xl pb-3"
+        >
+          If you have any questions or concerns, don't hesitate to reach out to
+          me directly. I'm here to help and support you throughout the process.
+        </p>
+      </div>
+      <div class="flex gap-2 sm:gap-4 lg:gap-6">
+        <img
+          src="/images/clients/thank-you/finger-hand.svg"
+          alt="finger-hand-bullet"
+          class="h-fit"
+        />
+        <p
+          class="text-black-4 border-b-2 border-dashed border-black-4 sm:text-lg lg:text-2xl pb-3"
+        >
+          Thank you again for considering our company for your needs. We look
+          forward to the opportunity to work with you and build a long and
+          successful partnership.
+        </p>
+      </div>
+    </div>
+    <div class="flex items-end flex-col">
+      <p class="text-left sub-h1-semibold lg:desk-header-3">Thanks,</p>
+      <p
+        class="mt-0 sub-h1-regular lg:mobile-header-2-regular text-black-60 font-semibold"
+      >
+        Jimmy
+      </p>
+    </div>
+  </div>
+</template>
diff --git a/nuxt-frontend/components/contact/thank-you/LandingSection.vue b/nuxt-frontend/components/contact/thank-you/LandingSection.vue
index 88c516cd9..5c2573633 100644
--- a/nuxt-frontend/components/contact/thank-you/LandingSection.vue
+++ b/nuxt-frontend/components/contact/thank-you/LandingSection.vue
@@ -1,5 +1,5 @@
 <template>
-  <section>
+  <section class="flex flex-col gap-40">
     <div class="container flex flex-col mt-4 lg:mt-12">
       <p
         class="text-center sub-h4-regular lg:mobile-header-3-regular text-black-60"
@@ -28,20 +28,22 @@
         appreciate the fact that you chose my company.
       </p>
     </div>
-    <div
-      class="mt-16 lg:mt-48 flex flex-col bg-gradient-to-r from-orange-80 to-pink-80 py-12 xl:py-16 lg:container"
-    >
-      <div class="container py-12 xl:py-16">
-        <p class="text-center mobile-header-2 lg:desk-header-2 text-primary-1">
-          At Canopas, Our Vision is
+    <!-- <div class="bg-primary-1 py-5">
+        <p class="container text-center text-white text-xl font-semibold tracking-wider">
+          Thank you for booking a meeting with Canopas. Here's the details of your
+          meeting with Canopas.
+          <br />
+          Time - 9:00am - 9:30am, Wednesday, June 26, 2024 (India Standard Time)
         </p>
-        <p
-          class="mt-3 text-center sub-h3-medium lg:desk-header-3 text-black-87 xl:w-[84%] 2xl:w-[74%] xl:mx-auto"
-        >
-          "To put humanity and the world into a better position compared to what
-          it was prior to our existence in the world."
-        </p>
-      </div>
+    </div> -->
+    <div class="container">
+      <p class="text-center mobile-header-2 lg:desk-header-2">Our Vision</p>
+      <p
+        class="mt-3 text-center sub-h3-medium lg:desk-header-3 text-black-87 w-[68%] mx-auto"
+      >
+        "To put humanity and the world into a better position compared to what
+        it was prior to our existence in the world."
+      </p>
     </div>
   </section>
 </template>
diff --git a/nuxt-frontend/components/contact/thank-you/ScheduleMeeting.vue b/nuxt-frontend/components/contact/thank-you/ScheduleMeeting.vue
index 8f10f67a5..bfd392f4c 100644
--- a/nuxt-frontend/components/contact/thank-you/ScheduleMeeting.vue
+++ b/nuxt-frontend/components/contact/thank-you/ScheduleMeeting.vue
@@ -106,14 +106,14 @@
     <div v-if="openCalendlyIframeModal">
       <transition name="modal">
         <div
-          class="modal-mask fixed top-0 left-0 w-full h-full table mask z-[1] bg-[#00000080] z-[5]"
+          class="modal-mask fixed top-0 left-0 w-full h-full table mask bg-[#00000080] z-[5]"
         >
           <div
             class="flex mx-auto left-auto sm:mx-auto h-full login-modal modal-xl"
             role="document"
           >
             <div
-              class="relative flex flex-col w-full border-1 border-gray border-solid rounded-md rounded-3xl bg-white bg-clip-padding outline-0"
+              class="relative flex flex-col w-full border-1 border-gray border-solid rounded-md bg-white bg-clip-padding outline-0"
             >
               <div class="relative flex-auto">
                 <CalendlyIframe class="w-full h-screen overflow-hidden" />
diff --git a/nuxt-frontend/components/error404/index.vue b/nuxt-frontend/components/error404/index.vue
index 66649eb52..99654fc21 100644
--- a/nuxt-frontend/components/error404/index.vue
+++ b/nuxt-frontend/components/error404/index.vue
@@ -1,33 +1,29 @@
 <template>
-  <div>
-    <Header />
-    <div
-      class="container flex items-center justify-center flex-col my-0 mx-auto py-[150px] px-[5%] min-h-[50vh] xll:min-h-[79vh]"
-    >
-      <div class="flex flex-row my-0 mx-auto text-center">
-        <img :src="firstErrorLetter" alt="404" />
-        <img :src="middleErrorLetter" class="m-4 w-[6.5rem]" alt="404" />
-        <img :src="lastErrorLetter" alt="404" />
-      </div>
-      <h1 class="mt-8 text-center text-[1.4rem] leading-8">
-        The page you’re looking for was moved, renamed or might never existed.
-      </h1>
-      <router-link
-        class="my-16 gradient-border-btn flex flex-row items-center"
-        to="/"
-      >
-        <Icon
-          class="arrow w-6 h-6 fa text-[#f2709c] text-[2.1rem] mr-[5px]"
-          name="fa6-solid:arrow-left"
-          id="leftArrow"
-        />
-        <span class="text-center font-bold text-[1.1rem]"
-          >Back to Home page</span
-        >
-      </router-link>
+  <Header />
+  <div
+    class="container flex items-center justify-center flex-col my-0 mx-auto py-[150px] px-[5%] min-h-[50vh] xll:min-h-[79vh]"
+  >
+    <div class="flex flex-row my-0 mx-auto text-center">
+      <img :src="firstErrorLetter" alt="404" />
+      <img :src="middleErrorLetter" class="m-4 w-[6.5rem]" alt="404" />
+      <img :src="lastErrorLetter" alt="404" />
     </div>
-    <NewFooter />
+    <h1 class="mt-8 text-center text-[1.4rem] leading-8">
+      The page you’re looking for was moved, renamed or might never existed.
+    </h1>
+    <router-link
+      class="my-16 gradient-border-btn flex flex-row items-center"
+      to="/"
+    >
+      <Icon
+        class="arrow w-6 h-6 fa text-[#f2709c] text-[2.1rem] mr-[5px]"
+        name="fa6-solid:arrow-left"
+        id="leftArrow"
+      />
+      <span class="text-center font-bold text-[1.1rem]">Back to Home page</span>
+    </router-link>
   </div>
+  <NewFooter />
 </template>
 
 <script>
diff --git a/nuxt-frontend/components/home-new/ServiceSectionMobile.vue b/nuxt-frontend/components/home-new/ServiceSectionMobile.vue
index 3ab1475b4..e603ac137 100644
--- a/nuxt-frontend/components/home-new/ServiceSectionMobile.vue
+++ b/nuxt-frontend/components/home-new/ServiceSectionMobile.vue
@@ -67,7 +67,7 @@ export default {
         {
           title: "Mobile Development",
           content:
-            "Whether your goal is to acquire new users, improve your retention rate, or increase in-app sales, our team will guide you based on our decade-long experience. <span class='font-bold'>From native to hybrid, we've got you covered.</span>",
+            "Whether your goal is to acquire new users, improve your retention rate, or increase in-app sales, our team will guide you based on our decade-long experience. <span class='sub-h3-semibold'>From native to hybrid, we've got you covered.</span>",
           image: "/images/why/why-canopas-mobile-1.webp",
           bullet: "/images/why/why-canopas-dot-1.svg",
           url: "/mobile-app-development",
@@ -75,28 +75,28 @@ export default {
         {
           title: "Web Development",
           content:
-            "Whether you need help with websites, web apps, an admin panel, an analytical dashboard, or desktop apps, our engineers will develop <span class='font-bold'>scalable backend and front-end solutions.</span>",
+            "Whether you need help with websites, web apps, an admin panel, an analytical dashboard, or desktop apps, our engineers will develop <span class='sub-h3-semibold'>scalable backend and front-end solutions.</span>",
           image: "/images/why/why-canopas-mobile-2.webp",
           bullet: "/images/why/why-canopas-dot-2.svg",
         },
         {
           title: "Custom Software Development",
           content:
-            "<span class='font-bold'>Unlock your business growth with tailored solutions</span> for unique business needs, enabling scalability, seamless integration, competitive edge, long-term cost efficiency, and enhanced security.",
+            "<span class='sub-h3-semibold'>Unlock your business growth with tailored solutions</span> for unique business needs, enabling scalability, seamless integration, competitive edge, long-term cost efficiency, and enhanced security.",
           image: "/images/why/why-canopas-mobile-3.webp",
           bullet: "/images/why/why-canopas-dot-3.svg",
         },
         {
           title: "UI/UX Design",
           content:
-            "We design user-centered UI/UX followed by user testing. <span class='font-bold'>We make design decisions based on only one thing: Data.</span> Because it ensures our clients get value from our work.",
+            "We design user-centered UI/UX followed by user testing. <span class='sub-h3-semibold'>We make design decisions based on only one thing: Data.</span> Because it ensures our clients get value from our work.",
           image: "/images/why/why-canopas-mobile-4.webp",
           bullet: "/images/why/why-canopas-dot-1.svg",
         },
         {
           title: "Bug Fixing and Maintenance",
           content:
-            "Looking to fix bugs in your app? We've helped multiple clients fix bugs and later added new features to match their vision. Plus, <span class='font-bold'>We offer 6 months of FREE maintenance on our work.</span>",
+            "Looking to fix bugs in your app? We've helped multiple clients fix bugs and later added new features to match their vision. Plus, <span class='sub-h3-semibold'>We offer 6 months of FREE maintenance on our work.</span>",
           image: "/images/why/why-canopas-mobile-5.webp",
           bullet: "/images/why/why-canopas-dot-1.svg",
         },
diff --git a/nuxt-frontend/pages/author/[slug].vue b/nuxt-frontend/pages/author/[slug].vue
index ec18229ba..96e989ba1 100644
--- a/nuxt-frontend/pages/author/[slug].vue
+++ b/nuxt-frontend/pages/author/[slug].vue
@@ -4,7 +4,7 @@
     <section class="container min-h-[50vh]">
       <div
         v-if="status == config.NOT_FOUND"
-        class="h-1/2 flex text-[1.4rem] text-black-900 items-center justify-center"
+        class="h-[50vh] flex text-[1.4rem] text-black-900 items-center justify-center"
       >
         {{ config.POST_NOT_FOUND_MESSAGE }}
       </div>
diff --git a/nuxt-frontend/pages/tag/[slug].vue b/nuxt-frontend/pages/tag/[slug].vue
index 98c8b8a23..235eccaa3 100644
--- a/nuxt-frontend/pages/tag/[slug].vue
+++ b/nuxt-frontend/pages/tag/[slug].vue
@@ -3,7 +3,7 @@
     <Header />
     <div
       v-if="slug == '' || status == config.NOT_FOUND"
-      class="h-1/2 flex text-[1.4rem] text-black-900 items-center justify-center"
+      class="h-[50vh] flex text-[1.4rem] text-black-900 items-center justify-center"
     >
       {{ config.POST_NOT_FOUND_MESSAGE }}
     </div>
@@ -51,14 +51,18 @@ const resources = computed(() => store.items);
 const status = computed(() => store.status);
 let postLimit = 2;
 
-await useAsyncData("tags", () => store.loadTagBlogs(slug.value));
+await useAsyncData("tags", () =>
+  store.loadTagBlogs(config.SHOW_DRAFT_POSTS, slug.value),
+);
 
 if (status.value === config.SUCCESS) {
   posts.value = resources.value?.slice(0, postLimit);
 }
 
-const tagName = posts.value[0].tags.filter((tag) => tag.slug === slug.value)[0]
-  .name;
+const tagName =
+  posts.value.length > 0
+    ? posts.value[0].tags.filter((tag) => tag.slug === slug.value)[0].name
+    : "";
 
 const handleScroll = () => {
   if (
diff --git a/nuxt-frontend/pages/thank-you.vue b/nuxt-frontend/pages/thank-you.vue
index 491f20175..51db15504 100644
--- a/nuxt-frontend/pages/thank-you.vue
+++ b/nuxt-frontend/pages/thank-you.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="!isNotFound">
     <Header />
     <div>
       <LandingSection :name="clientName" />
@@ -8,10 +8,49 @@
         ref="benefits"
       />
       <HappyClientSection />
-      <ScheduleMeeting ref="meeting" />
+      <InformationPoints />
     </div>
     <NewFooter />
   </div>
+  <NotFound v-else />
+  <!-- Show Calendly Iframe -->
+  <div v-if="openCalendlyIframeModal">
+    <transition name="modal">
+      <div
+        class="modal-mask fixed top-0 left-0 w-full h-full table mask bg-[#00000080] z-[5]"
+      >
+        <div
+          class="flex mx-auto left-auto sm:mx-auto h-full login-modal modal-xl"
+          role="document"
+        >
+          <div
+            class="relative flex flex-col w-full border-1 border-gray border-solid rounded-md bg-white bg-clip-padding outline-0"
+          >
+            <div class="relative flex-auto">
+              <CalendlyIframe
+                class="w-full h-screen overflow-hidden"
+                @close="closeCalendlyIframeModal"
+              />
+
+              <button
+                type="button"
+                class="absolute right-2 md:right-5 top-[5.5rem] md:top-28 close modal-close-btn border-none text-pink-300 !bg-pink-100 rounded-full md:text-2xl h-7 w-7 md:h-10 md:w-10 !bg-opacity-80 font-bold focus:outline-none"
+                data-dismiss="modal"
+                aria-label="Close"
+              >
+                <span
+                  aria-hidden="true"
+                  @click="closeCalendlyIframeModal"
+                  class="h-6 w-full flex items-center justify-center"
+                  >&times;</span
+                >
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
+  </div>
 </template>
 
 <script setup>
@@ -19,14 +58,18 @@ import { defineAsyncComponent } from "vue";
 import config from "@/config.js";
 import Header from "@/components/partials/NewHeader.vue";
 import LandingSection from "@/components/contact/thank-you/LandingSection.vue";
-import BenefitSection from "@/components/contact/thank-you/BenefitSection.vue";
 import { elementInViewPort } from "@/utils.js";
+import CalendlyIframe from "@/components/contact/CalendlyIframe.vue";
+import NotFound from "@/components/error404/index.vue";
 
+const BenefitSection = defineAsyncComponent(
+  () => import("@/components/contact/thank-you/BenefitSection.vue"),
+);
 const HappyClientSection = defineAsyncComponent(
   () => import("@/components/contact/thank-you/HappyClient.vue"),
 );
-const ScheduleMeeting = defineAsyncComponent(
-  () => import("@/components/contact/thank-you/ScheduleMeeting.vue"),
+const InformationPoints = defineAsyncComponent(
+  () => import("@/components/contact/thank-you/InformationPoints.vue"),
 );
 const NewFooter = defineAsyncComponent(
   () => import("@/components/partials/NewFooter.vue"),
@@ -35,7 +78,6 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const benefits = ref(null);
-const meeting = ref(null);
 
 const seoData = config.CLIENT_THANKYOU_SEO_META_DATA;
 useSeoMeta({
@@ -51,21 +93,28 @@ let clientName = "";
 let event = "";
 let events = {
   benefits: "view_thankyou_benefits_section",
-  meeting: "view_thankyou_schedule_meeting_section",
 };
 
 let elements;
 
+let openCalendlyIframeModal = ref(false);
+let isNotFound = ref(false);
+
 onMounted(() => {
   elements = ref({
     benefits: benefits,
-    meeting: meeting,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_thankyou_page");
+  if (clientName != "") {
+    openCalendlyIframe();
+  }
 });
 
 onUnmounted(() => {
+  openCalendlyIframeModal.value = false;
+  localStorage.removeItem("client-name");
+  document.body.classList.remove("overflow-hidden");
   window.removeEventListener("scroll", sendEvent);
 });
 
@@ -74,12 +123,10 @@ onBeforeMount(() => {
   if (cName) {
     clientName = JSON.parse(cName);
   } else {
-    navigateTo({
-      name: "Error404Page",
-      params: { pathMatch: ["thank-you"] },
-    });
+    isNotFound.value = true;
   }
 });
+
 function sendEvent() {
   const newEvent = events[elementInViewPort(elements.value)];
   if (newEvent && event !== newEvent) {
@@ -87,4 +134,15 @@ function sendEvent() {
     $mixpanel.track(event);
   }
 }
+
+function openCalendlyIframe() {
+  openCalendlyIframeModal.value = true;
+  document.body.classList.add("overflow-hidden");
+  $mixpanel.track("tap_schedule_meeting");
+}
+
+function closeCalendlyIframeModal() {
+  openCalendlyIframeModal.value = false;
+  document.body.classList.remove("overflow-hidden");
+}
 </script>
diff --git a/nuxt-frontend/public/images/clients/thank-you/finger-hand.svg b/nuxt-frontend/public/images/clients/thank-you/finger-hand.svg
new file mode 100644
index 000000000..f80414b87
--- /dev/null
+++ b/nuxt-frontend/public/images/clients/thank-you/finger-hand.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="29" height="28" viewBox="0 0 29 28" fill="none">
+    <path d="M12.7258 7.32886C12.0422 6.33136 10.9105 5.83203 9.33201 5.83203C6.96367 5.83203 2.91534 8.73411 2.91534 11.3515L2.91534 18.0482C2.91534 20.609 5.16117 22.1654 6.96367 22.1654L14.5762 22.1654C15.0403 22.1654 15.4854 21.981 15.8136 21.6528C16.1418 21.3246 16.3262 20.8795 16.3262 20.4154L16.3262 20.4095C16.3262 19.9469 16.1424 19.5033 15.8153 19.1762C15.4882 18.8491 15.0446 18.6654 14.582 18.6654" stroke="black" stroke-opacity="0.6" stroke-width="2" stroke-linecap="round"/>
+    <path d="M11.4065 8.15234L23.3299 8.15234C23.5599 8.15242 23.7876 8.19787 24 8.28608C24.2124 8.37429 24.4054 8.50354 24.5678 8.66642C24.7301 8.8293 24.8588 9.02262 24.9464 9.2353C25.034 9.44797 25.0787 9.67584 25.0781 9.90584C25.0769 10.3714 24.891 10.8175 24.5613 11.1462C24.2316 11.475 23.785 11.6595 23.3194 11.6593L14.2375 11.6593" stroke="black" stroke-opacity="0.6" stroke-width="2" stroke-linecap="round"/>
+    <path d="M14.2324 11.6641L16.9071 11.6641C17.3657 11.6759 17.8015 11.8664 18.1217 12.1949C18.4419 12.5234 18.6211 12.9641 18.6211 13.4228C18.6211 13.8816 18.4419 14.3222 18.1217 14.6507C17.8015 14.9793 17.3657 15.1698 16.9071 15.1816L14.5784 15.1816" stroke="black" stroke-opacity="0.6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M14.582 15.1641L16.332 15.1641C16.7962 15.1641 17.2413 15.3484 17.5695 15.6766C17.8977 16.0048 18.082 16.4499 18.082 16.9141C18.082 17.3782 17.8977 17.8233 17.5695 18.1515C17.2413 18.4797 16.7962 18.6641 16.332 18.6641L14.582 18.6641" stroke="black" stroke-opacity="0.6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/nuxt-frontend/stores/author/index.js b/nuxt-frontend/stores/author/index.js
index 3e0323599..200cbe223 100644
--- a/nuxt-frontend/stores/author/index.js
+++ b/nuxt-frontend/stores/author/index.js
@@ -35,7 +35,7 @@ export const useAuthorListStore = defineStore("authors", {
           .get(url)
           .then((response) => {
             let posts = [];
-            response.data.posts.forEach((post) => {
+            response.data.posts?.forEach((post) => {
               posts.push(setPostFields(post));
             });
             this.items = posts;
diff --git a/nuxt-frontend/stores/tags/index.js b/nuxt-frontend/stores/tags/index.js
index cba48cd6f..888ab1fb0 100644
--- a/nuxt-frontend/stores/tags/index.js
+++ b/nuxt-frontend/stores/tags/index.js
@@ -13,13 +13,14 @@ export const useTagListStore = defineStore("tag-list", {
     };
   },
   actions: {
-    async loadTagBlogs(slug) {
+    async loadTagBlogs(showDrafts, slug) {
       return new Promise((resolve, reject) => {
         this.isLoading = true;
         this.error = null;
 
-        let url =
-          config.API_BASE + "/api/posts/tags/" + slug + "?is_published=true";
+        let published = showDrafts ? "is_published=false" : "is_published=true";
+
+        let url = config.API_BASE + "/api/posts/tags/" + slug + "?" + published;
 
         axios
           .get(url)